viaprog/shaka-player
1
0
Fork 0
mirror of https://github.com/shaka-project/shaka-player.git synced 2026-06-26 17:46:26 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix several bugs with multi-Period content.

Browse Source 
First, Player should not call AbrManager.setVariants as part of load().
Before, it would set them for the first Period; however, this doesn't
work with a start time in another Period.  StreamingEngine will call
chooseStreams_ for the starting Period before startup finishes.

Second, we should handle Period transitions before we handle buffering
goal.  Before, we would wait until the playhead moves closer to the
Period transition even if we have buffered the entire Period.  This
can cause problems when seeking, especially with text content that
buffers quickly.  If we seek and we have buffered text but not video,
the pipeline will stall since text is waiting for the playhead to move
while video is waiting for the Period transition.

Lastly, it is possible for multiple Period transitions to occur closely
together.  If we seek into a Period that is not setup yet, and then
seek back to a Period that is setup, then the second transition will
complete and the first will override it once it finishes setting up
the Period.  We should stop any old transitions if another starts.

Issue #655

Change-Id: Iab8961c606a65487704c9f0efaa255db0e3dc942
This commit is contained in:
Jacob Trimble
2017-01-25 11:08:22 -08:00
parent 68e870dc9a
commit d4f2566de7
3 changed files with 45 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/media/streaming_engine.js
+30 -19
View File
@@ -887,16 +887,6 @@ shaka.media.StreamingEngine.prototype.update_ = function(mediaState) {
var bufferingGoal = this.getBufferingGoal_();
// If we've buffered to the buffering goal then schedule an update.
if (bufferedAhead >= bufferingGoal) {
shaka.log.v2(logPrefix, 'buffering goal met');
// Do not try to schedule the next update. Just poll twice every second.
// The playback rate can change at any time, so any prediction we make now
// could be terribly invalid soon.
return 0.5;
}
// Check if we've buffered to the end of the presentation.
if (timeNeeded >= this.manifest_.presentationTimeline.getDuration()) {
// We shouldn't rebuffer if the playhead is close to the end of the
@@ -922,6 +912,16 @@ shaka.media.StreamingEngine.prototype.update_ = function(mediaState) {
return null;
}
// If we've buffered to the buffering goal then schedule an update.
if (bufferedAhead >= bufferingGoal) {
shaka.log.v2(logPrefix, 'buffering goal met');
// Do not try to predict the next update. Just poll twice every second.
// The playback rate can change at any time, so any prediction we make now
// could be terribly invalid soon.
return 0.5;
}
var bufferEnd = this.mediaSourceEngine_.bufferEnd(mediaState.type);
var reference = this.getSegmentReferenceNeeded_(
mediaState, playheadTime, bufferEnd, currentPeriodIndex);
@@ -1617,6 +1617,25 @@ shaka.media.StreamingEngine.prototype.handlePeriodTransition_ = function(
this.setupPeriod_(needPeriodIndex).then(function() {
if (this.destroyed_) return;
// If we seek during a Period transition, we can start another transition.
// So we need to verify that:
// - We are still in need of the same Period.
// - All streams are still idle.
// - The current stream is not in the needed Period (another transition
// handled it).
var allReady = mediaStates.every(function(ms) {
var isIdle = shaka.media.StreamingEngine.isIdle_(ms);
var currentPeriodIndex = this.findPeriodContainingStream_(ms.stream);
return isIdle && ms.needPeriodIndex == needPeriodIndex &&
currentPeriodIndex != needPeriodIndex;
}.bind(this));
if (!allReady) {
// TODO: Write unit tests for this case.
shaka.log.debug(logPrefix, 'ignoring transition to Period',
needPeriodIndex, 'since another is happening');
return;
}
var needPeriod = this.manifest_.periods[needPeriodIndex];
shaka.log.v1(logPrefix, 'calling onChooseStreams_()...');
@@ -1649,15 +1668,7 @@ shaka.media.StreamingEngine.prototype.handlePeriodTransition_ = function(
for (var type in this.mediaStates_) {
var stream = streamsByType[type];
this.switch(type, stream, /* clearBuffer */ false);
var mediaState = this.mediaStates_[type];
if (shaka.media.StreamingEngine.isIdle_(mediaState)) {
this.scheduleUpdate_(mediaState, 0);
} else {
// TODO: Write unit tests to cover this case.
shaka.log.debug(logPrefix,
'seeked() was called while waiting for setupPeriod_()');
}
this.scheduleUpdate_(this.mediaStates_[type], 0);
}
// We've already set up the Period so call onCanSwitch_() right now.
lib/player.js
+4 -9
View File
@@ -506,6 +506,10 @@ shaka.Player.prototype.load = function(manifestUri, opt_startTime,
this.mediaSourceOpen_
]);
}.bind(this)).then(function() {
this.config_.abr.manager.init(this.switch_.bind(this));
// Don't call setVariants/setTextTracks since StreamingEngine.init() will
// call the onChooseStreams_ callback.
// MediaSource is open, so create the Playhead, MediaSourceEngine, and
// StreamingEngine.
this.playhead_ = this.createPlayhead(opt_startTime);
@@ -522,20 +526,11 @@ shaka.Player.prototype.load = function(manifestUri, opt_startTime,
// Since the first streams just became active, send an adaptation event.
this.onAdaptation_();
this.config_.abr.manager.init(this.switch_.bind(this));
// Copy preferred languages from the config again, in case the config was
// changed between construction and playback.
this.currentAudioLanguage_ = this.config_.preferredAudioLanguage;
this.currentTextLanguage_ = this.config_.preferredTextLanguage;
// Now that we've filtered out variants that aren't compatible with the
// active one, update abr manager with filtered variants for the first
// period.
var variants = shaka.util.StreamUtils.filterVariantsByRoleAndLanguage(
this.manifest_.periods[0], this.currentAudioLanguage_);
this.config_.abr.manager.setVariants(variants);
this.pendingTimelineRegions_.forEach(
this.playhead_.addTimelineRegion.bind(this.playhead_));
this.pendingTimelineRegions_ = [];
test/media/streaming_engine_unit.js
+11 -9
View File
@@ -717,9 +717,10 @@ describe('StreamingEngine', function() {
// Seek backwards to a buffered region in the first Period. Note that
// since the buffering goal is 5 seconds and each segment is 10
// seconds long, the first segment of the second Period should be
// required when the playhead is at the 16 second mark.
expect(playhead.getTime()).toBe(16);
// seconds long, the second segment of this Period will be required at
// 6 seconds. Then it will load the next Period, but not require the
// new segments.
expect(playhead.getTime()).toBe(6);
playheadTime -= 5;
streamingEngine.seeked();
@@ -789,9 +790,9 @@ describe('StreamingEngine', function() {
mediaSourceEngine.endOfStream.and.callFake(function() {
// Seek backwards to a buffered region in the first Period. Note
// that since the buffering goal is 5 seconds and each segment is
// 10 seconds long, endOfStream() should be called at the 36 second
// mark.
expect(playhead.getTime()).toBe(36);
// 10 seconds long, the last segment should be required at 26 seconds.
// Then endOfStream() should be called.
expect(playhead.getTime()).toBe(26);
playheadTime -= 20;
streamingEngine.seeked();
});
@@ -914,8 +915,9 @@ describe('StreamingEngine', function() {
// Seek backwards to an unbuffered region in the first Period. Note
// that since the buffering goal is 5 seconds and each segment is 10
// seconds long, endOfStream() should be called at the 36 second mark.
expect(playhead.getTime()).toBe(36);
// seconds long, the last segment should be required at 26 seconds.
// Then endOfStream() should be called.
expect(playhead.getTime()).toBe(26);
playheadTime -= 20;
streamingEngine.seeked();
@@ -1060,7 +1062,7 @@ describe('StreamingEngine', function() {
mediaSourceEngine.endOfStream.and.callFake(function() {
// Seek backwards to an unbuffered region in the second Period. Do not
// call seeked().
expect(playhead.getTime()).toBe(36);
expect(playhead.getTime()).toBe(26);
playheadTime -= 10;
});