heckyel/yt-local
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

av-merge: call mediaSource.endOfStream() so player pauses at end

Browse Source 
Signed-off-by: Jesús <heckyel@hyperbola.info>
This commit is contained in:
James Taylor 2021-08-26 20:48:50 -07:00 committed by Jesús
parent 6e39ae19b6
commit 1c591b4457
No known key found for this signature in database
GPG Key ID: F6EE7BC59A315766
1 changed files with 35 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
youtube/static/js/av-merge.js
View File

@ -17,8 +17,6 @@
// SourceBuffer data limits: // SourceBuffer data limits:
// https://developers.google.com/web/updates/2017/10/quotaexceedederror // https://developers.google.com/web/updates/2017/10/quotaexceedederror
// TODO: close stream at end?
// TODO: Better buffering algorithm
// TODO: Call abort to cancel in-progress appends? // TODO: Call abort to cancel in-progress appends?
@ -38,6 +36,9 @@ function AVMerge(video, srcPair, startTime){
this.video = video; this.video = video;
this.mediaSource = null; this.mediaSource = null;
this.closed = false; this.closed = false;
this.opened = false;
this.audioEndOfStreamCalled = false;
this.videoEndOfStreamCalled = false;
this.setup(); this.setup();
} }
AVMerge.prototype.setup = function() { AVMerge.prototype.setup = function() {
@ -55,6 +56,14 @@ AVMerge.prototype.setup = function() {
} }
AVMerge.prototype.sourceOpen = function(_) { AVMerge.prototype.sourceOpen = function(_) {
// If after calling mediaSource.endOfStream, the user seeks back
// into the video, the sourceOpen event will be fired again. Do not
// overwrite the streams.
this.audioEndOfStreamCalled = false;
this.videoEndOfStreamCalled = false;
if (this.opened)
return;
this.opened = true;
this.videoStream = new Stream(this, this.videoSource, this.startTime); this.videoStream = new Stream(this, this.videoSource, this.startTime);
this.audioStream = new Stream(this, this.audioSource, this.startTime); this.audioStream = new Stream(this, this.audioSource, this.startTime);
@ -88,10 +97,24 @@ AVMerge.prototype.seek = function(e) {
this.videoStream.handleSeek(); this.videoStream.handleSeek();
this.seeking = false; this.seeking = false;
} else { } else {
this.reportWarning('seek but not open? readyState:', reportWarning('seek but not open? readyState:',
this.mediaSource.readyState); this.mediaSource.readyState);
} }
} }
AVMerge.prototype.audioEndOfStream = function() {
if (this.videoEndOfStreamCalled && !this.audioEndOfStreamCalled) {
reportDebug('Calling mediaSource.endOfStream()');
this.mediaSource.endOfStream();
}
this.audioEndOfStreamCalled = true;
}
AVMerge.prototype.videoEndOfStream = function() {
if (this.audioEndOfStreamCalled && !this.videoEndOfStreamCalled) {
reportDebug('Calling mediaSource.endOfStream()');
this.mediaSource.endOfStream();
}
this.videoEndOfStreamCalled = true;
}
function Stream(avMerge, source, startTime) { function Stream(avMerge, source, startTime) {
this.avMerge = avMerge; this.avMerge = avMerge;
@ -259,6 +282,14 @@ Stream.prototype.checkBuffer = async function() {
if (i < this.sidx.entries.length && !this.sidx.entries[i].requested) { if (i < this.sidx.entries.length && !this.sidx.entries[i].requested) {
this.fetchSegment(i); this.fetchSegment(i);
// We are playing the last segment and we have it.
// Signal the end of stream
} else if (currentSegmentIdx == this.sidx.entries.length - 1
&& this.sidx.entries[currentSegmentIdx].have) {
if (this.streamType == 'audio')
this.avMerge.audioEndOfStream();
else
this.avMerge.videoEndOfStream();
} }
} }
Stream.prototype.segmentInBuffer = function(segmentIdx) { Stream.prototype.segmentInBuffer = function(segmentIdx) {