Merge pull request #2 from bbc/bugfix-240

Fix Dash-Industry-Forum/dash.js Dash-Industry-Forum#240
bbc · Jun 15, 2015 · 3cc0f7c · 3cc0f7c
2 parents f866bef + 87eac97
commit 3cc0f7c
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 9 deletions.
diff --git a/build/test/js/streaming/AbrControllerSpec.js b/build/test/js/streaming/AbrControllerSpec.js
@@ -74,7 +74,6 @@ describe("AbrController", function () {
 
         match = expectedBitrates.filter(function(val, idx/*, arr*/) {
             item = actualBitrates[idx];
-
             return (item && (item.qualityIndex === idx) && (item.bitrate === val) && (item.mediaType === dummyMediaInfo.type));
         });
 

diff --git a/build/test/js/streaming/FragmentModelSpec.js b/build/test/js/streaming/FragmentModelSpec.js
@@ -43,8 +43,8 @@ describe("FragmentModel", function () {
         });
 
         it("should detect duplicated requests", function () {
-            expect(fragmentModel.isFragmentLoadedOrPending(initRequest)).toBeTruthy();
-            expect(fragmentModel.isFragmentLoadedOrPending(mediaRequest)).toBeTruthy();
+            expect(fragmentModel.isFragmentLoadedOrPendingAndNotDiscarded(initRequest)).toBeTruthy();
+            expect(fragmentModel.isFragmentLoadedOrPendingAndNotDiscarded(mediaRequest)).toBeTruthy();
         });
 
         it("should return pending requests", function () {

diff --git a/build/test/js/utils/ObjectsHelper.js b/build/test/js/utils/ObjectsHelper.js
@@ -32,7 +32,7 @@
 				getMediaInfo: function() {
 					return {bitrateList:[]};
 				}
-            }
+            };
         },
 
         setup = function() {

diff --git a/src/streaming/controllers/AbrController.js b/src/streaming/controllers/AbrController.js
@@ -309,7 +309,7 @@ MediaPlayer.dependencies.AbrController = function () {
          */
         getQualityForBitrate: function(mediaInfo, bitrate) {
             var bitrateList = this.getBitrateList(mediaInfo),
-                ln = bitrateList.length,
+                ln = bitrateList ? bitrateList.length : 0,
                 bitrateInfo;
 
             for (var i = 0; i < ln; i +=1) {

diff --git a/src/streaming/models/FragmentModel.js b/src/streaming/models/FragmentModel.js
@@ -179,6 +179,8 @@ MediaPlayer.dependencies.FragmentModel = function () {
         notify: undefined,
         subscribe: undefined,
         unsubscribe: undefined,
+        videoModel: undefined,
+        sourceBufferExt: undefined,
 
         setup: function() {
             this[MediaPlayer.dependencies.BufferController.eventList.ENAME_BUFFER_LEVEL_OUTRUN] = onBufferLevelOutrun;
@@ -204,15 +206,15 @@ MediaPlayer.dependencies.FragmentModel = function () {
         },
 
         addRequest: function(value) {
-            if (!value || this.isFragmentLoadedOrPending(value)) return false;
+            if (!value || this.isFragmentLoadedOrPendingAndNotDiscarded(value)) return false;
 
             pendingRequests.push(value);
             addSchedulingInfoMetrics.call(this, value, MediaPlayer.dependencies.FragmentModel.states.PENDING);
 
             return true;
         },
 
-        isFragmentLoadedOrPending: function(request) {
+        isFragmentLoadedOrPendingAndNotDiscarded: function(request) {
             var isEqualComplete = function(req1, req2) {
                     return ((req1.action === "complete") && (req1.action === req2.action));
                 },
@@ -225,6 +227,28 @@ MediaPlayer.dependencies.FragmentModel = function () {
                     return isNaN(req1.index) && isNaN(req2.index) && (req1.quality === req2.quality);
                 },
 
+                isDiscarded = function() {
+                    var buffer = this.videoModel.getElement(),
+                        inBuffer = this.sourceBufferExt.getBufferRange(buffer, request.availabilityStartTime) !== null,
+                        req,
+                        d;
+
+                    // It can take a few moments to get into the buffer
+                    if (!inBuffer) {
+                        d = new Date();
+                        d.setSeconds(d.getSeconds() + 3);
+                        for (var i = 0; i < executedRequests.length; i += 1) {
+                            req = executedRequests[i];
+
+                            if (isEqualMedia(request, req) && req.requestEndDate <= d) {
+                                return false;
+                            }
+                        }
+                    }
+
+                    return !inBuffer;
+                },
+
                 check = function(arr) {
                     var req,
                         isLoaded = false,
@@ -244,7 +268,7 @@ MediaPlayer.dependencies.FragmentModel = function () {
                     return isLoaded;
                 };
 
-            return (check(pendingRequests) || check(loadingRequests) || check(executedRequests));
+            return (check(pendingRequests) || check(loadingRequests) || (check(executedRequests) && !isDiscarded.call(this)));
         },
 
         /**

diff --git a/src/streaming/rules/SchedulingRules/PlaybackTimeRule.js b/src/streaming/rules/SchedulingRules/PlaybackTimeRule.js
@@ -113,7 +113,7 @@ MediaPlayer.rules.PlaybackTimeRule = function () {
                 request = this.adapter.getFragmentRequestForTime(streamProcessor, track, rejected.startTime + (rejected.duration / 2) + EPSILON, {keepIdx: keepIdx, timeThreshold: 0});
             }
 
-            while (request && streamProcessor.getFragmentModel().isFragmentLoadedOrPending(request)) {
+            while (request && streamProcessor.getFragmentModel().isFragmentLoadedOrPendingAndNotDiscarded(request)) {
                 if (request.action === "complete") {
                     request = null;
                     this.adapter.setIndexHandlerTime(streamProcessor, NaN);
-Original file line number
+Diff line change
@@ Expand Up / @@ -74,7 +74,6 @@ describe("AbrController", function () { @@
             match = expectedBitrates.filter(function(val, idx/*, arr*/) {
                 item = actualBitrates[idx];
                 return (item && (item.qualityIndex === idx) && (item.bitrate === val) && (item.mediaType === dummyMediaInfo.type));
             });
@@ Expand Down @@