Create polished demo videos without editing skills. Mac/Windows/Linux
fix(export): stream audio encoding for long exports
webadderall22914541bde4
diff --git a/src/lib/exporter/audioEncoder.ts b/src/lib/exporter/audioEncoder.tsindex 40f50a1b..3109c16b 100644--- a/src/lib/exporter/audioEncoder.ts+++ b/src/lib/exporter/audioEncoder.ts@@ -5,6 +5,7 @@ import { resolveMediaElementSource } from './localMediaSource'const AUDIO_BITRATE = 128_000const DECODE_BACKPRESSURE_LIMIT = 20+const ENCODE_BACKPRESSURE_LIMIT = 20const MIN_SPEED_REGION_DELTA_MS = 0.0001export class AudioProcessor {@@ -73,51 +74,44 @@ export class AudioProcessor {return}- const decodedFrames: AudioData[] = []+ const pendingFrames: AudioData[] = []+ let decodeError: Error | null = null+ let encodeError: Error | null = null+ let muxError: Error | null = null+ let pendingMuxing = Promise.resolve()- const decoder = new AudioDecoder({- output: (data: AudioData) => decodedFrames.push(data),- error: (error: DOMException) => console.error('[AudioProcessor] Decode error:', error),- })- decoder.configure(audioConfig)-- const audioStream = typeof readEndSec === 'number'- ? demuxer.read('audio', 0, readEndSec)- : demuxer.read('audio')- const reader = (audioStream as ReadableStream<EncodedAudioChunk>).getReader()-- while (!this.cancelled) {- const { done, value: chunk } = await reader.read()- if (done || !chunk) break+ const failIfNeeded = () => {+ if (decodeError) throw decodeError+ if (encodeError) throw encodeError+ if (muxError) throw muxError+ }- const timestampMs = chunk.timestamp / 1000- if (this.isInTrimRegion(timestampMs, sortedTrims)) continue+ const pumpEncodedFrames = () => {+ while (!this.cancelled && pendingFrames.length > 0) {+ if (encodeError || muxError) {+ break+ }+ if (encoder.encodeQueueSize >= ENCODE_BACKPRESSURE_LIMIT) {+ break+ }- decoder.decode(chunk)+ const frame = pendingFrames.shift()+ if (!frame) {+ break+ }- while (decoder.decodeQueueSize > DECODE_BACKPRESSURE_LIMIT && !this.cancelled) {- await new Promise((resolve) => setTimeout(resolve, 1))+ encoder.encode(frame)+ frame.close()}}- if (decoder.state === 'configured') {- await decoder.flush()- decoder.close()- }-- if (this.cancelled || decodedFrames.length === 0) {- for (const frame of decodedFrames) frame.close()- return+ const cleanupPendingFrames = () => {+ for (const frame of pendingFrames) {+ frame.close()+ }+ pendingFrames.length = 0}- const encodedChunks: { chunk: EncodedAudioChunk; meta?: EncodedAudioChunkMetadata }[] = []- const encoder = new AudioEncoder({- output: (chunk: EncodedAudioChunk, meta?: EncodedAudioChunkMetadata) => {- encodedChunks.push({ chunk, meta })- },- error: (error: DOMException) => console.error('[AudioProcessor] Encode error:', error),- })-const sampleRate = audioConfig.sampleRate || 48_000const channels = audioConfig.numberOfChannels || 2const encodeConfig: AudioEncoderConfig = {@@ -130,37 +124,119 @@ export class AudioProcessor {const encodeSupport = await AudioEncoder.isConfigSupported(encodeConfig)if (!encodeSupport.supported) {console.warn('[AudioProcessor] Opus encoding not supported, skipping audio')- for (const frame of decodedFrames) frame.close()return}+ const encoder = new AudioEncoder({+ output: (chunk: EncodedAudioChunk, meta?: EncodedAudioChunkMetadata) => {+ pendingMuxing = pendingMuxing+ .then(async () => {+ if (this.cancelled) {+ return+ }+ await muxer.addAudioChunk(chunk, meta)+ })+ .catch((error) => {+ muxError = error instanceof Error ? error : new Error(String(error))+ })+ },+ error: (error: DOMException) => {+ encodeError = new Error(`[AudioProcessor] Encode error: ${error.message}`)+ },+ })+encoder.configure(encodeConfig)- for (const audioData of decodedFrames) {- if (this.cancelled) {- audioData.close()- continue+ const decoder = new AudioDecoder({+ output: (data: AudioData) => {+ if (this.cancelled || encodeError || muxError) {+ data.close()+ return+ }++ const timestampMs = data.timestamp / 1000+ const trimOffsetMs = this.computeTrimOffset(timestampMs, sortedTrims)+ const adjustedTimestampUs = data.timestamp - trimOffsetMs * 1000+ const adjusted = this.cloneWithTimestamp(data, Math.max(0, adjustedTimestampUs))+ data.close()+ pendingFrames.push(adjusted)+ },+ error: (error: DOMException) => {+ decodeError = new Error(`[AudioProcessor] Decode error: ${error.message}`)+ },+ })+ decoder.configure(audioConfig)++ const audioStream = typeof readEndSec === 'number'+ ? demuxer.read('audio', 0, readEndSec)+ : demuxer.read('audio')+ const reader = (audioStream as ReadableStream<EncodedAudioChunk>).getReader()++ try {+ while (!this.cancelled) {+ failIfNeeded()++ const { done, value: chunk } = await reader.read()+ if (done || !chunk) break++ const timestampMs = chunk.timestamp / 1000+ if (this.isInTrimRegion(timestampMs, sortedTrims)) continue++ decoder.decode(chunk)+ pumpEncodedFrames()++ while (+ !this.cancelled &&+ (decoder.decodeQueueSize > DECODE_BACKPRESSURE_LIMIT+ || pendingFrames.length > DECODE_BACKPRESSURE_LIMIT+ || encoder.encodeQueueSize >= ENCODE_BACKPRESSURE_LIMIT)+ ) {+ failIfNeeded()+ pumpEncodedFrames()+ await new Promise((resolve) => setTimeout(resolve, 1))+ }}- const timestampMs = audioData.timestamp / 1000- const trimOffsetMs = this.computeTrimOffset(timestampMs, sortedTrims)- const adjustedTimestampUs = audioData.timestamp - trimOffsetMs * 1000+ if (decoder.state === 'configured') {+ await decoder.flush()+ }- const adjusted = this.cloneWithTimestamp(audioData, Math.max(0, adjustedTimestampUs))- audioData.close()+ while (!this.cancelled && (pendingFrames.length > 0 || encoder.encodeQueueSize > 0)) {+ failIfNeeded()+ pumpEncodedFrames()+ if (pendingFrames.length > 0 || encoder.encodeQueueSize > 0) {+ await new Promise((resolve) => setTimeout(resolve, 1))+ }+ }- encoder.encode(adjusted)- adjusted.close()- }+ failIfNeeded()++ if (encoder.state === 'configured') {+ await encoder.flush()+ }- if (encoder.state === 'configured') {- await encoder.flush()- encoder.close()+ await pendingMuxing+ failIfNeeded()+ } finally {+ try {+ await reader.cancel()+ } catch {+ // reader already closed+ }++ cleanupPendingFrames()++ if (decoder.state === 'configured') {+ decoder.close()+ }++ if (encoder.state === 'configured') {+ encoder.close()+ }}- for (const { chunk, meta } of encodedChunks) {- if (this.cancelled) break- await muxer.addAudioChunk(chunk, meta)+ if (this.cancelled) {+ return}}diff --git a/src/lib/exporter/streamingDecoder.ts b/src/lib/exporter/streamingDecoder.tsindex bdf22ada..2d6a31aa 100644--- a/src/lib/exporter/streamingDecoder.ts+++ b/src/lib/exporter/streamingDecoder.ts@@ -31,6 +31,7 @@ export class StreamingVideoDecoder {private decoder: VideoDecoder | null = null;private cancelled = false;private metadata: DecodedVideoInfo | null = null;+ private pendingFrames: VideoFrame[] = [];private toLocalFilePath(resourceUrl: string): string | null {if (!resourceUrl.startsWith('file:')) {@@ -167,7 +168,8 @@ export class StreamingVideoDecoder {const epsilonSec = 0.001;// Async frame queue — decoder pushes, consumer pulls- const pendingFrames: VideoFrame[] = [];+ this.pendingFrames.length = 0+ const pendingFrames = this.pendingFrameslet frameResolve: ((frame: VideoFrame | null) => void) | null = null;let decodeError: Error | null = null;let decodeDone = false;@@ -504,6 +506,15 @@ export class StreamingVideoDecoder {}this.demuxer = null;}++ for (const frame of this.pendingFrames) {+ try {+ frame.close()+ } catch {+ /* ignore */+ }+ }+ this.pendingFrames.length = 0}}diff --git a/src/lib/exporter/videoExporter.ts b/src/lib/exporter/videoExporter.tsindex 435ac483..2e1e105d 100644--- a/src/lib/exporter/videoExporter.ts+++ b/src/lib/exporter/videoExporter.ts@@ -76,7 +76,7 @@ export class VideoExporter {private videoColorSpace: VideoColorSpaceInit | undefined;private pendingMuxing: Promise<void> = Promise.resolve();private chunkCount = 0;- private readonly WINDOWS_FINALIZATION_TIMEOUT_MS = 60_000;+ private readonly WINDOWS_FINALIZATION_TIMEOUT_MS = 180_000;constructor(config: VideoExporterConfig) {this.config = config;