Merge pull request #101 from bbc/update-default-threhodl

Video frames not advancing updates

Author: ryanmccartney

src/core/Settings.js

@@ -111,7 +111,7 @@ import Events from './events/Events';
  *                setStallState: true,
  *                videoFramesNotAdvancing: {
  *                   enabled: false
- *                   thresholdInSeconds: 2,
+ *                   thresholdInSeconds: 5,
  *                },
  *                avoidCurrentTimeRangePruning: false,
  *                useChangeTypeForTrackSwitch: true,
@@ -359,7 +359,7 @@ import Events from './events/Events';
  * @property {module:Settings~SyntheticStallSettings} [syntheticStallEvents]
  * Specified if we fire manual stall events once the stall threshold is reached
  * 
- * @property {number} [videoFramesNotAdvancing={enabled:false,thresholdInSeconds:2}]
+ * @property {number} [videoFramesNotAdvancing={enabled:false,thresholdInSeconds:5}]
  * Controls a mechanism for handling situations where the player is playing but stops advancing its total frame count to handle https://issues.chromium.org/issues/41243192. 
  * 
  * The 'enabled' property signifies whether we attempt to handle the bug should it occur by seeking to the current time.
@@ -1001,7 +1001,7 @@ function Settings() {
                 setStallState: true,
                 videoFramesNotAdvancing: {
                     enabled: false,
-                    thresholdInSeconds: 2
+                    thresholdInSeconds: 5
                 },
                 avoidCurrentTimeRangePruning: false,
                 useChangeTypeForTrackSwitch: true,

src/streaming/controllers/StreamController.js

@@ -811,10 +811,11 @@ function StreamController() {
             && !videoModel.isPaused()
             && !videoModel.isStalled()
             && videoModel.getReadyState() >= Constants.VIDEO_ELEMENT_READY_STATES.HAVE_ENOUGH_DATA
-            && playbackQuality.totalVideoFrames > 0 // Handles devices (some tvs), where Video Quality API, totalVideoFrames always returns 0
-            && playbackQuality.totalVideoFrames !== playbackQuality.droppedVideoFrames // Handles devices (some tvs), where Video Quality API, totalVideoFrames always equals the number of dropped frames
-            && playbackQuality.totalVideoFrames <= totalVideoFramesAtLastPlaybackProgress // Total frames should advance with time progression, if not something is wrong
-    
+            && playbackQuality.totalVideoFrames > 0 // Handles devices (some TVs), where Video Quality API, totalVideoFrames always returns 0.
+            && playbackQuality.totalVideoFrames < 2147483647 //Handles devices (some WebKit TVs), where Video Quality API, totalVideoFrames can return the max value of a 32 bit signed integer becuase the implementation uses totalVideoFrames = mediaTime * framerate.
+            && playbackQuality.totalVideoFrames !== playbackQuality.droppedVideoFrames // Handles devices (some TVs), where Video Quality API, totalVideoFrames always equals the number of dropped frames.
+            && playbackQuality.totalVideoFrames === totalVideoFramesAtLastPlaybackProgress // Total frames should advance with time progression, if not something is wrong. On some some WebKit TVs the total video frames is reset if the decoder is reinitialised.
+
         if(isVideoFramesNotAdvancing){
             if((timeAtLastPlaybackProgress + settings.get().streaming.buffer.videoFramesNotAdvancing.thresholdInSeconds < event.time) && !videoFramesNotAdvancingTriggered){
                 eventBus.trigger(Events.PLAYBACK_FROZEN,{cause:'Frames have stopped advancing, Chromium bug #41243192', totalVideoFrames: playbackQuality.totalVideoFrames, time: event.time });