diff --git a/src/streaming/StreamProcessor.js b/src/streaming/StreamProcessor.js index de21c92c9d..09062a8de6 100644 --- a/src/streaming/StreamProcessor.js +++ b/src/streaming/StreamProcessor.js @@ -626,43 +626,6 @@ function StreamProcessor(config) { return liveStartTime; } - // function setLiveEdgeSeekTarget() { - // if (!liveEdgeFinder) return; - - // const currentRepresentationInfo = getRepresentationInfo(); - // const liveEdge = liveEdgeFinder.getLiveEdge(currentRepresentationInfo); - // const request = findRequestForLiveEdge(liveEdge, currentRepresentationInfo); - - // if (request) { - // // When low latency mode is selected but browser doesn't support fetch - // // start at the beginning of the segment to avoid consuming the whole buffer - // if (settings.get().streaming.lowLatencyEnabled) { - // const liveStartTime = request.duration < mediaPlayerModel.getLiveDelay() ? request.startTime : request.startTime + request.duration - mediaPlayerModel.getLiveDelay(); - // playbackController.setLiveStartTime(liveStartTime); - // } else { - // playbackController.setLiveStartTime(request.startTime); - // } - // } - - // const seekTarget = playbackController.getStreamStartTime(false, liveEdge); - // bufferController.setSeekStartTime(seekTarget); - // scheduleController.setCurrentRepresentation(currentRepresentationInfo); - // scheduleController.setSeekTarget(seekTarget); - // scheduleController.start(); - - // // For multi periods stream, if the startTime is beyond current period then seek to corresponding period (see StreamController::onPlaybackSeeking) - // if (seekTarget > (currentRepresentationInfo.mediaInfo.streamInfo.start + currentRepresentationInfo.mediaInfo.streamInfo.duration)) { - // playbackController.seek(seekTarget); - // } - - // dashMetrics.updateManifestUpdateInfo({ - // currentTime: seekTarget, - // presentationStartTime: liveEdge, - // latency: liveEdge - seekTarget, - // clientTimeOffset: timelineConverter.getClientTimeOffset() - // }); - // } - function findRequestForLiveEdge(liveEdge, currentRepresentationInfo) { try { let request = null; diff --git a/src/streaming/controllers/PlaybackController.js b/src/streaming/controllers/PlaybackController.js index 31b1f2aa5a..42736b742f 100644 --- a/src/streaming/controllers/PlaybackController.js +++ b/src/streaming/controllers/PlaybackController.js @@ -369,52 +369,6 @@ function PlaybackController() { return start; } - /** - * @param {boolean} ignoreStartOffset - ignore URL fragment start offset if true - * @param {number} liveEdge - liveEdge value - * @returns {number} object - * @memberof PlaybackController# - */ - // function getStreamStartTime(ignoreStartOffset, liveEdge) { - // let presentationStartTime; - // let startTimeOffset = NaN; - - // if (!ignoreStartOffset) { - // const uriParameters = getStartTimeFromUriParameters(); - // if (uriParameters) { - // startTimeOffset = !isNaN(uriParameters.fragS) ? uriParameters.fragS : uriParameters.fragT; - // } else { - // startTimeOffset = 0; - // } - // } else { - // startTimeOffset = streamInfo ? streamInfo.start : startTimeOffset; - // } - - // if (isDynamic) { - // if (!isNaN(startTimeOffset) && streamInfo) { - // presentationStartTime = startTimeOffset - (streamInfo.manifestInfo.availableFrom.getTime() / 1000); - - // if (presentationStartTime > liveStartTime || - // presentationStartTime < (!isNaN(liveEdge) ? (liveEdge - streamInfo.manifestInfo.DVRWindowSize) : NaN)) { - // presentationStartTime = null; - // } - // } - // presentationStartTime = presentationStartTime || liveStartTime; - - // } else { - // if (streamInfo) { - // if (!isNaN(startTimeOffset) && startTimeOffset < Math.max(streamInfo.manifestInfo.duration, streamInfo.duration) && startTimeOffset >= 0) { - // presentationStartTime = startTimeOffset; - // } else { - // let currentEarliestTime = earliestTime[streamInfo.id]; //set by ready bufferStart after first onBytesAppended - // presentationStartTime = currentEarliestTime !== undefined ? Math.max(currentEarliestTime.audio !== undefined ? currentEarliestTime.audio : 0, currentEarliestTime.video !== undefined ? currentEarliestTime.video : 0, streamInfo.start) : streamInfo.start; - // } - // } - // } - - // return presentationStartTime; - // } - function getActualPresentationTime(currentTime) { const DVRMetrics = dashMetrics.getCurrentDVRInfo(); const DVRWindow = DVRMetrics ? DVRMetrics.range : null; @@ -808,7 +762,6 @@ function PlaybackController() { initialize: initialize, setConfig: setConfig, getStartTimeFromUriParameters: getStartTimeFromUriParameters, - // getStreamStartTime: getStreamStartTime, getTimeToStreamEnd: getTimeToStreamEnd, getTime: getTime, getNormalizedTime: getNormalizedTime,