Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #240 #713

Closed
wants to merge 4 commits into from
Closed

Fix #240 #713

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
61a3ba5
Check if a fragment has been discarded from the buffer and reload it …
May 7, 2015
fb82766
SMPHTML-337: Fix isDiscarded causing repeated loading of segments
Jun 12, 2015
7600398
Fix up tests
May 26, 2015
239f2b9
Don't retry failed requests
Jul 15, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion build/test/js/streaming/AbrControllerSpec.js
View file
Open in desktop
Original file line number Diff 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
4 changes: 2 additions & 2 deletions build/test/js/streaming/FragmentModelSpec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 () {
Expand Down
2 changes: 1 addition & 1 deletion build/test/js/utils/ObjectsHelper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
getMediaInfo: function() {
return {bitrateList:[]};
}
}
};
},

setup = function() {
Expand Down
2 changes: 1 addition & 1 deletion src/streaming/controllers/AbrController.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,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) {
Expand Down
40 changes: 35 additions & 5 deletions src/streaming/models/FragmentModel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ MediaPlayer.dependencies.FragmentModel = function () {
pendingRequests = [],
loadingRequests = [],
rejectedRequests = [],
failedRequests = [],

isLoadingPostponed = false,

Expand Down Expand Up @@ -112,6 +113,9 @@ MediaPlayer.dependencies.FragmentModel = function () {
case MediaPlayer.dependencies.FragmentModel.states.REJECTED:
requests = rejectedRequests;
break;
case MediaPlayer.dependencies.FragmentModel.states.FAILED:
requests = failedRequests;
break;
default:
requests = [];
}
Expand Down Expand Up @@ -143,6 +147,8 @@ MediaPlayer.dependencies.FragmentModel = function () {

if (response && !error) {
executedRequests.push(request);
} else {
failedRequests.push(request);
}

addSchedulingInfoMetrics.call(this, request, error ? MediaPlayer.dependencies.FragmentModel.states.FAILED : MediaPlayer.dependencies.FragmentModel.states.EXECUTED);
Expand Down Expand Up @@ -180,6 +186,8 @@ MediaPlayer.dependencies.FragmentModel = function () {
subscribe: undefined,
unsubscribe: undefined,
manifestExt:undefined,
videoModel: undefined,
sourceBufferExt: undefined,

setup: function() {
this[MediaPlayer.dependencies.BufferController.eventList.ENAME_BUFFER_LEVEL_OUTRUN] = onBufferLevelOutrun;
Expand All @@ -206,15 +214,15 @@ MediaPlayer.dependencies.FragmentModel = function () {

addRequest: function(value) {

if (!this.manifestExt.getIsTextTrack(value.mediaType) && (!value || this.isFragmentLoadedOrPending(value))) return false;
if (!this.manifestExt.getIsTextTrack(value.mediaType) && (!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));
},
Expand All @@ -227,6 +235,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);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you please explain this 3 seconds. Is it related to the chunk duration? Or is it for edge cases?

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,
Expand All @@ -246,7 +276,7 @@ MediaPlayer.dependencies.FragmentModel = function () {
return isLoaded;
};

return (check(pendingRequests) || check(loadingRequests) || check(executedRequests));
return (check(pendingRequests) || check(loadingRequests) || check(failedRequests) || (check(executedRequests) && !isDiscarded.call(this)));
},

/**
Expand Down Expand Up @@ -363,7 +393,7 @@ MediaPlayer.dependencies.FragmentModel = function () {
}

loadingRequests = [];

return reqs;
},

Expand Down Expand Up @@ -423,4 +453,4 @@ MediaPlayer.dependencies.FragmentModel.states = {
REJECTED: "rejected",
CANCELED: "canceled",
FAILED: "failed"
};
};
2 changes: 1 addition & 1 deletion src/streaming/rules/SchedulingRules/PlaybackTimeRule.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ MediaPlayer.rules.PlaybackTimeRule = function () {
request = this.adapter.getFragmentRequestForTime(streamProcessor, representationInfo, 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;
streamProcessor.setIndexHandlerTime(NaN);
Expand Down