diff --git a/dist/bundles/mediabunny-aac-encoder.mjs b/dist/bundles/mediabunny-aac-encoder.mjs index d001ae8..0f35004 100644 --- a/dist/bundles/mediabunny-aac-encoder.mjs +++ b/dist/bundles/mediabunny-aac-encoder.mjs @@ -3627,6 +3627,7 @@ var AacEncoder = class extends CustomAudioEncoder { this.pendingBuffer = new Float32Array(2 ** 16); this.pendingFrames = 0; this.nextSampleTimestampInSamples = null; + this.validEndTimestampInSamples = null; } static supports(codec, config) { return codec === "aac" && config.numberOfChannels >= 1 && config.numberOfChannels <= 8 && AAC_SAMPLE_RATES.includes(config.sampleRate) && config.bitrate !== void 0; @@ -3688,6 +3689,7 @@ var AacEncoder = class extends CustomAudioEncoder { resetInternalState() { this.pendingFrames = 0; this.nextSampleTimestampInSamples = null; + this.validEndTimestampInSamples = null; this.chunkMetadata = { decoderConfig: { codec: "mp4a.40.2", @@ -3703,6 +3705,7 @@ var AacEncoder = class extends CustomAudioEncoder { } const channels = this.numberOfChannels; const incomingFrames = audioSample.numberOfFrames; + this.validEndTimestampInSamples = Math.round(audioSample.timestamp * this.sampleRate) + incomingFrames; const totalBytes = audioSample.allocationSize({ format: "f32", planeIndex: 0 }); const audioBytes = new Uint8Array(totalBytes); audioSample.copyTo(audioBytes, { format: "f32", planeIndex: 0 }); @@ -3738,7 +3741,11 @@ var AacEncoder = class extends CustomAudioEncoder { this.resetInternalState(); } close() { + this.workerError ??= new Error('AAC encoder closed.'); + for (const pending of this.pendingMessages.values()) pending.reject(this.workerError); + this.pendingMessages.clear(); this.worker?.terminate(); + this.worker = null; } async encodeOneFrame() { assert(this.nextSampleTimestampInSamples !== null); @@ -3764,6 +3771,10 @@ var AacEncoder = class extends CustomAudioEncoder { } emitPackets(packets) { for (const p of packets) { + const duration = this.validEndTimestampInSamples === null + ? p.duration + : Math.min(p.duration, this.validEndTimestampInSamples - p.pts); + if (duration <= 0) continue; let data = new Uint8Array(p.encodedData); if (this.useAdts) { assert(this.adtsHeaderTemplate !== null); @@ -3779,7 +3790,7 @@ var AacEncoder = class extends CustomAudioEncoder { data, "key", p.pts / this.sampleRate, - p.duration / this.sampleRate + duration / this.sampleRate ); this.onPacket( packet, diff --git a/dist/modules/src/encoder.js b/dist/modules/src/encoder.js index 0a0bce1..8ab933f 100644 --- a/dist/modules/src/encoder.js +++ b/dist/modules/src/encoder.js @@ -38,6 +38,7 @@ class AacEncoder extends mediabunny_1.CustomAudioEncoder { this.pendingBuffer = new Float32Array(2 ** 16); this.pendingFrames = 0; this.nextSampleTimestampInSamples = null; + this.validEndTimestampInSamples = null; } static supports(codec, config) { return codec === 'aac' @@ -108,6 +109,7 @@ class AacEncoder extends mediabunny_1.CustomAudioEncoder { resetInternalState() { this.pendingFrames = 0; this.nextSampleTimestampInSamples = null; + this.validEndTimestampInSamples = null; this.chunkMetadata = { decoderConfig: { codec: 'mp4a.40.2', @@ -123,6 +125,7 @@ class AacEncoder extends mediabunny_1.CustomAudioEncoder { } const channels = this.numberOfChannels; const incomingFrames = audioSample.numberOfFrames; + this.validEndTimestampInSamples = Math.round(audioSample.timestamp * this.sampleRate) + incomingFrames; // Extract interleaved f32 data const totalBytes = audioSample.allocationSize({ format: 'f32', planeIndex: 0 }); const audioBytes = new Uint8Array(totalBytes); @@ -160,7 +163,11 @@ class AacEncoder extends mediabunny_1.CustomAudioEncoder { this.resetInternalState(); } close() { + this.workerError ??= new Error('AAC encoder closed.'); + for (const pending of this.pendingMessages.values()) pending.reject(this.workerError); + this.pendingMessages.clear(); this.worker?.terminate(); + this.worker = null; } async encodeOneFrame() { assert(this.nextSampleTimestampInSamples !== null); @@ -187,6 +194,10 @@ class AacEncoder extends mediabunny_1.CustomAudioEncoder { } emitPackets(packets) { for (const p of packets) { + const duration = this.validEndTimestampInSamples === null + ? p.duration + : Math.min(p.duration, this.validEndTimestampInSamples - p.pts); + if (duration <= 0) continue; let data = new Uint8Array(p.encodedData); if (this.useAdts) { assert(this.adtsHeaderTemplate !== null); @@ -198,7 +209,7 @@ class AacEncoder extends mediabunny_1.CustomAudioEncoder { adtsFrame.set(data, header.byteLength); data = adtsFrame; } - const packet = new mediabunny_1.EncodedPacket(data, 'key', p.pts / this.sampleRate, p.duration / this.sampleRate); + const packet = new mediabunny_1.EncodedPacket(data, 'key', p.pts / this.sampleRate, duration / this.sampleRate); this.onPacket(packet, this.chunkMetadata); this.chunkMetadata = {}; } diff --git a/src/encoder.ts b/src/encoder.ts index 08c406b..16a151d 100644 --- a/src/encoder.ts +++ b/src/encoder.ts @@ -50,6 +50,7 @@ class AacEncoder extends CustomAudioEncoder { private pendingBuffer = new Float32Array(2 ** 16); private pendingFrames = 0; private nextSampleTimestampInSamples: number | null = null; + private validEndTimestampInSamples: number | null = null; static override supports(codec: AudioCodec, config: AudioEncoderConfig): boolean { return codec === 'aac' @@ -133,6 +134,7 @@ class AacEncoder extends CustomAudioEncoder { private resetInternalState() { this.pendingFrames = 0; this.nextSampleTimestampInSamples = null; + this.validEndTimestampInSamples = null; this.chunkMetadata = { decoderConfig: { @@ -151,6 +153,7 @@ class AacEncoder extends CustomAudioEncoder { const channels = this.numberOfChannels; const incomingFrames = audioSample.numberOfFrames; + this.validEndTimestampInSamples = Math.round(audioSample.timestamp * this.sampleRate) + incomingFrames; // Extract interleaved f32 data const totalBytes = audioSample.allocationSize({ format: 'f32', planeIndex: 0 }); @@ -197,7 +200,11 @@ class AacEncoder extends CustomAudioEncoder { } close() { + this.workerError ??= new Error('AAC encoder closed.'); + for (const pending of this.pendingMessages.values()) pending.reject(this.workerError); + this.pendingMessages.clear(); this.worker?.terminate(); + this.worker = null; } private async encodeOneFrame() { @@ -232,6 +239,11 @@ class AacEncoder extends CustomAudioEncoder { private emitPackets(packets: PacketInfo[]) { for (const p of packets) { + // Encoder frame padding must not extend the presented source timeline. + const duration = this.validEndTimestampInSamples === null + ? p.duration + : Math.min(p.duration, this.validEndTimestampInSamples - p.pts); + if (duration <= 0) continue; let data = new Uint8Array(p.encodedData); if (this.useAdts) { @@ -250,7 +262,7 @@ class AacEncoder extends CustomAudioEncoder { data, 'key', p.pts / this.sampleRate, - p.duration / this.sampleRate, + duration / this.sampleRate, ); this.onPacket(