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.

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 Video Glitches with Fetch Loader #3755

Merged
merged 3 commits into from Apr 13, 2021
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/demux/tsdemuxer.ts
Expand Up @@ -409,7 +409,11 @@ class TSDemuxer implements Demuxer {
id3Track,
textTrack: this._txtTrack,
};
this.extractRemainingSamples(demuxResult);

if (flush) {
this.extractRemainingSamples(demuxResult);
}
softworkz marked this conversation as resolved.
Show resolved Hide resolved

return demuxResult;
}

Expand Down
18 changes: 10 additions & 8 deletions src/utils/fetch-loader.ts
Expand Up @@ -110,7 +110,7 @@ class FetchLoader implements Loader<LoaderContext> {
stats.total = parseInt(response.headers.get('Content-Length') || '0');

if (onProgress && Number.isFinite(config.highWaterMark)) {
this.loadProgressively(
return this.loadProgressively(
response,
stats,
context,
Expand Down Expand Up @@ -175,19 +175,20 @@ class FetchLoader implements Loader<LoaderContext> {
context: LoaderContext,
highWaterMark: number = 0,
onProgress: LoaderOnProgress<LoaderContext>
) {
): Promise<ArrayBuffer> {
const chunkCache = new ChunkCache();
const reader = (response.clone().body as ReadableStream).getReader();
softworkz marked this conversation as resolved.
Show resolved Hide resolved
const reader = (response.body as ReadableStream).getReader();

const pump = () => {
reader
const pump = (): Promise<ArrayBuffer> => {
return reader
.read()
.then((data) => {
if (data.done) {
if (chunkCache.dataLength) {
onProgress(stats, context, chunkCache.flush(), response);
}
return;

return Promise.resolve(new ArrayBuffer(0));
}
const chunk: Uint8Array = data.value;
const len = chunk.length;
Expand All @@ -205,14 +206,15 @@ class FetchLoader implements Loader<LoaderContext> {
// just emit the progress event
onProgress(stats, context, chunk, response);
}
pump();
return pump();
})
.catch(() => {
/* aborted */
return Promise.reject();
});
};

pump();
return pump();
}
}

Expand Down