🎥 Make videos programmatically with React
`@remotion/media`: Fix audio crackling after seeking during playback
Jonny Burgercfad46818ee7
diff --git a/packages/core/src/audio/get-audio-sync-anchor-tolerance.ts b/packages/core/src/audio/get-audio-sync-anchor-tolerance.tsnew file mode 100644index 0000000000..7ccdd91232--- /dev/null+++ b/packages/core/src/audio/get-audio-sync-anchor-tolerance.ts@@ -0,0 +1,8 @@+const ALLOWED_GLOBAL_TIME_ANCHOR_SHIFT = 0.1;++// The tolerance is measured in AudioContext seconds.+export const getAudioSyncAnchorTolerance = (audioContext: AudioContext) => {+ const {baseLatency, outputLatency} = audioContext;+ const safeOutputLatency = outputLatency === 0 ? 0.3 : outputLatency;+ return ALLOWED_GLOBAL_TIME_ANCHOR_SHIFT + baseLatency + safeOutputLatency;+};diff --git a/packages/core/src/internals.ts b/packages/core/src/internals.tsindex 6abd25f45e..ec3f1d1e9e 100644--- a/packages/core/src/internals.ts+++ b/packages/core/src/internals.ts@@ -3,6 +3,7 @@ import {getAbsoluteSrc} from './absolute-src.js';import {AbsoluteFillElement} from './AbsoluteFillElement.js';import {getAnimatedImageDurationInSeconds} from './animated-image/get-duration-in-seconds.js';import {AudioForPreview} from './audio/AudioForPreview.js';+import {getAudioSyncAnchorTolerance} from './audio/get-audio-sync-anchor-tolerance.js';import type {ScheduleAudioNodeResult} from './audio/shared-audio-tags.js';import {SharedAudioContext,@@ -417,6 +418,7 @@ export const Internals = {SharedAudioContextProvider,SharedAudioTagsContext,SharedAudioTagsContextProvider,+ getAudioSyncAnchorTolerance,invalidCompositionErrorMessage,invalidFolderNameErrorMessage,calculateMediaDuration,diff --git a/packages/media/src/audio-iterator-manager.ts b/packages/media/src/audio-iterator-manager.tsindex 67c8abaf61..6ba201c25e 100644--- a/packages/media/src/audio-iterator-manager.ts+++ b/packages/media/src/audio-iterator-manager.ts@@ -6,7 +6,6 @@ import {import type {LogLevel} from 'remotion';import {Internals, type ScheduleAudioNodeResult} from 'remotion';import {- ALLOWED_GLOBAL_TIME_ANCHOR_SHIFT,isAlreadyQueued,makeAudioIterator,type AudioIterator,@@ -602,15 +601,16 @@ export const audioIteratorManager = ({}): newTime;const queuedPeriod = audioBufferIterator.getQueuedPeriod();+ // Queued timestamps are in media seconds, so convert the Player's+ // AudioContext tolerance using the combined media and Player rate.+ const anchorTolerance =+ Internals.getAudioSyncAnchorTolerance(sharedAudioContext.audioContext) *+ Math.abs(playbackRate);// If there is a missing period, but we'd have no chance to schedule nodes,// then let's not bother. Let's just leave the gap.const queuedPeriodMinusLatency: QueuedPeriod | null = queuedPeriod? {- from:- queuedPeriod.from -- ALLOWED_GLOBAL_TIME_ANCHOR_SHIFT -- sharedAudioContext.audioContext.baseLatency -- sharedAudioContext.audioContext.outputLatency,+ from: queuedPeriod.from - anchorTolerance,until: queuedPeriod.until,}: null;diff --git a/packages/media/src/audio/audio-preview-iterator.ts b/packages/media/src/audio/audio-preview-iterator.tsindex 58db251f24..6d05eb1131 100644--- a/packages/media/src/audio/audio-preview-iterator.ts+++ b/packages/media/src/audio/audio-preview-iterator.ts@@ -1,7 +1,6 @@import type {AudioBufferSlice} from '../make-iterator-with-priming';export const HEALTHY_BUFFER_THRESHOLD_SECONDS = 1;-export const ALLOWED_GLOBAL_TIME_ANCHOR_SHIFT = 0.1;export type QueuedNode = {node: AudioBufferSourceNode;diff --git a/packages/player/src/set-global-time-anchor.ts b/packages/player/src/set-global-time-anchor.tsindex 5681300317..e140e58c9e 100644--- a/packages/player/src/set-global-time-anchor.ts+++ b/packages/player/src/set-global-time-anchor.ts@@ -1,7 +1,5 @@import {Internals, type LogLevel} from 'remotion';-export const ALLOWED_GLOBAL_TIME_ANCHOR_SHIFT = 0.1;-export const setGlobalTimeAnchor = ({audioContext,audioSyncAnchor,@@ -20,12 +18,10 @@ export const setGlobalTimeAnchor = ({const newAnchor =audioContext.currentTime - absoluteTimeInSeconds / globalPlaybackRate;const shift = newAnchor - audioSyncAnchor.value;- const {outputLatency} = audioContext;- const safeOutputLatency = outputLatency === 0 ? 0.3 : outputLatency;- const latency = audioContext.baseLatency + safeOutputLatency;+ const tolerance = Internals.getAudioSyncAnchorTolerance(audioContext);// Skip small shifts to avoid audio glitches from frame-quantized re-anchoring- if (Math.abs(shift) < ALLOWED_GLOBAL_TIME_ANCHOR_SHIFT + latency && !force) {+ if (Math.abs(shift) < tolerance && !force) {return false;}