Won't seek while transitioning period if track is only video or audio…

…, using logger
Dash-Industry-Forum · Jun 8, 2018 · c18e23b · c18e23b
1 parent 41bf7c6
commit c18e23b
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 10 deletions.
diff --git a/src/streaming/SourceBufferSink.js b/src/streaming/SourceBufferSink.js
@@ -129,7 +129,7 @@ function SourceBufferSink(mediaSource, mediaInfo, onAppendedCallback, oldBuffer)
         try {
             return buffer.buffered;
         } catch (e) {
-            log('getAllBufferRanges exception: ' + e.message);
+            logger.error('getAllBufferRanges exception: ' + e.message);
             return null;
         }
     }
@@ -298,7 +298,7 @@ function SourceBufferSink(mediaSource, mediaInfo, onAppendedCallback, oldBuffer)
     }
 
     function errHandler() {
-        log('SourceBufferSink error', mediaInfo.type);
+        logger.error('SourceBufferSink error', mediaInfo.type);
     }
 
 

diff --git a/src/streaming/Stream.js b/src/streaming/Stream.js
@@ -505,7 +505,7 @@ function Stream(config) {
         if (streamProcessors.length === 0) {
             let msg = 'No streams to play.';
             errHandler.manifestError(msg, 'nostreams', manifestModel.getValue());
-            log(msg);
+            logger.debug(msg);
         } else {
             checkIfInitializationCompleted();
         }

diff --git a/src/streaming/controllers/PlaybackController.js b/src/streaming/controllers/PlaybackController.js
@@ -634,10 +634,8 @@ function PlaybackController() {
                     ranges = bufferedRange[streamInfo.id].video;
                 }
                 if (checkTimeInRanges(earliestTime, ranges)) {
-                    if (!isSeeking()) {
-                        if (!compatibleWithPreviousStream) {
-                            seek(earliestTime, true);
-                        }
+                    if (!isSeeking() && !compatibleWithPreviousStream) {
+                        seek(earliestTime, true);
                     }
                     commonEarliestTime[streamInfo.id].started = true;
                 }
@@ -646,7 +644,7 @@ function PlaybackController() {
             //current stream has only audio or only video content
             if (commonEarliestTime[streamInfo.id][type]) {
                 earliestTime = commonEarliestTime[streamInfo.id][type] > initialStartTime ? commonEarliestTime[streamInfo.id][type] : initialStartTime;
-                if (!isSeeking()) {
+                if (!isSeeking() && !compatibleWithPreviousStream) {
                     seek(earliestTime);
                 }
                 commonEarliestTime[streamInfo.id].started = true;

diff --git a/src/streaming/controllers/StreamController.js b/src/streaming/controllers/StreamController.js
@@ -292,7 +292,7 @@ function StreamController() {
                 logger.debug('[toggleEndPeriodTimer] start-up of timer to notify PLAYBACK_ENDED event. It will be triggered in ' + delayPlaybackEnded + ' milliseconds');
                 playbackEndedTimerId = setTimeout(function () {eventBus.trigger(Events.PLAYBACK_ENDED);}, delayPlaybackEnded);
                 const preloadDelay = delayPlaybackEnded < 2000 ? delayPlaybackEnded / 4 : delayPlaybackEnded - 2000;
-                log('[StreamController][toggleEndPeriodTimer] Going to fire preload in ' + preloadDelay);
+                logger.info('[StreamController][toggleEndPeriodTimer] Going to fire preload in ' + preloadDelay);
                 setTimeout(onStreamCanLoadNext,  preloadDelay);
             }
         }
@@ -319,7 +319,7 @@ function StreamController() {
             const newStream = getNextStream();
             compatible = activeStream.isCompatibleWithStream(newStream);
             if (compatible) {
-                log('[StreamController][onStreamCanLoadNext] Preloading next stream');
+                logger.info('[StreamController][onStreamCanLoadNext] Preloading next stream');
                 activeStream.stopEventController();
                 activeStream.deactivate(true);
                 newStream.preload(mediaSource, buffers);