arcodange/mediabunny
1
0
Fork 0
mirror of https://github.com/arcodange-org/mediabunny.git synced 2026-10-02 05:13:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add per-playlist "mutices" for HLS muxer

Browse Source
This commit is contained in:
Vanilagy
2026-04-17 18:35:33 +02:00
parent 2ab6bbe3d1
commit 9a7120f5f4
2 changed files with 101 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/media-source.ts
+34 -24
View File
@@ -267,6 +267,8 @@ class VideoEncoderWrapper {
*/
private error: Error | null = null;
private lastMuxerPromise: Promise<void> = Promise.resolve();
constructor(private source: VideoSource, private encodingConfig: VideoEncodingConfig) {
const sizeChangeBehavior = encodingConfig.sizeChangeBehavior ?? 'deny';
if (['fill', 'contain', 'cover'].includes(sizeChangeBehavior) && encodingConfig.transform?.fit !== undefined) {
@@ -648,7 +650,7 @@ class VideoEncoderWrapper {
}
}
await this.muxer!.mutex.currentPromise; // Allow the writer to apply backpressure
await this.lastMuxerPromise; // Allow the writer to apply backpressure
}
} finally {
for (const sample of samplesToEncode) {
@@ -711,10 +713,11 @@ class VideoEncoderWrapper {
maybeEnsureIsKeyPacket(this.source._connectedTrack!, packet);
this.encodingConfig.onEncodedPacket?.(packet, meta);
void this.muxer!.addEncodedVideoPacket(this.source._connectedTrack!, packet, meta)
.catch((error) => {
this.error ??= error;
});
this.lastMuxerPromise
= this.muxer!.addEncodedVideoPacket(this.source._connectedTrack!, packet, meta)
.catch((error) => {
this.error ??= error;
});
};
await this.customEncoder.init();
@@ -802,10 +805,11 @@ class VideoEncoderWrapper {
maybeEnsureIsKeyPacket(this.source._connectedTrack!, packet);
this.encodingConfig.onEncodedPacket?.(packet, meta);
void this.muxer!.addEncodedVideoPacket(this.source._connectedTrack!, packet, meta)
.catch((error) => {
this.error ??= error;
});
this.lastMuxerPromise
= this.muxer!.addEncodedVideoPacket(this.source._connectedTrack!, packet, meta)
.catch((error) => {
this.error ??= error;
});
};
const stack = new Error('Encoding error').stack;
@@ -1787,6 +1791,7 @@ class AudioEncoderWrapper {
* So, we keep track of the encoder error and throw it as soon as we get the chance.
*/
private error: Error | null = null;
private lastMuxerPromise: Promise<void> = Promise.resolve();
constructor(private source: AudioSource, private encodingConfig: AudioEncodingConfig) {}
@@ -1950,7 +1955,7 @@ class AudioEncoderWrapper {
await promise;
}
await this.muxer!.mutex.currentPromise; // Allow the writer to apply backpressure
await this.lastMuxerPromise; // Allow the writer to apply backpressure
} else if (this.isPcmEncoder) {
await this.doPcmEncoding(audioSample, shouldClose);
} else {
@@ -1967,7 +1972,7 @@ class AudioEncoderWrapper {
await new Promise(resolve => this.encoder!.addEventListener('dequeue', resolve, { once: true }));
}
await this.muxer!.mutex.currentPromise; // Allow the writer to apply backpressure
await this.lastMuxerPromise; // Allow the writer to apply backpressure
}
} finally {
if (shouldClose) {
@@ -2080,10 +2085,11 @@ class AudioEncoderWrapper {
}
this.encodingConfig.onEncodedPacket?.(packet, meta);
void this.muxer!.addEncodedAudioPacket(this.source._connectedTrack!, packet, meta)
.catch((error) => {
this.error ??= error;
});
this.lastMuxerPromise
= this.muxer!.addEncodedAudioPacket(this.source._connectedTrack!, packet, meta)
.catch((error) => {
this.error ??= error;
});
};
await this.customEncoder.init();
@@ -2145,10 +2151,11 @@ class AudioEncoderWrapper {
});
this.encodingConfig.onEncodedPacket?.(packet, meta);
void this.muxer!.addEncodedAudioPacket(this.source._connectedTrack!, packet, meta)
.catch((error) => {
this.error ??= error;
});
this.lastMuxerPromise
= this.muxer!.addEncodedAudioPacket(this.source._connectedTrack!, packet, meta)
.catch((error) => {
this.error ??= error;
});
},
error: (error) => {
error.stack = stack; // Provide a more useful stack trace
@@ -2803,6 +2810,8 @@ export class TextSubtitleSource extends SubtitleSource {
private _parser: SubtitleParser;
/** @internal */
private _error: Error | null = null;
/** @internal */
private _lastMuxerPromise: Promise<void> = Promise.resolve();
/** Creates a new {@link TextSubtitleSource} where added text chunks are in the specified `codec`. */
constructor(codec: SubtitleCodec) {
@@ -2811,10 +2820,11 @@ export class TextSubtitleSource extends SubtitleSource {
this._parser = new SubtitleParser({
codec,
output: (cue, metadata) => {
void this._connectedTrack?.output._muxer.addSubtitleCue(this._connectedTrack, cue, metadata)
.catch((error) => {
this._error ??= error;
});
this._lastMuxerPromise
= this._connectedTrack!.output._muxer.addSubtitleCue(this._connectedTrack!, cue, metadata)
.catch((error) => {
this._error ??= error;
});
},
});
}
@@ -2836,7 +2846,7 @@ export class TextSubtitleSource extends SubtitleSource {
this._ensureValidAdd();
this._parser.parse(text);
return this._connectedTrack!.output._muxer.mutex.currentPromise;
return this._lastMuxerPromise; // Allow the writer to apply backpressure
}
/** @internal */