Skip to content

Commit aeac1e6

Browse files
authored
Merge pull request #12535 from remotion-dev/perf/core-audio-render-boundary
`remotion`: Avoid redundant `Html5Audio` volume evaluations
2 parents 7a03d4f + 9a0a76a commit aeac1e6

1 file changed

Lines changed: 32 additions & 7 deletions

File tree

‎packages/core/src/audio/AudioForRendering.tsx‎

Lines changed: 32 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,10 @@ import React, {
1010
} from 'react';
1111
import {getAbsoluteSrc} from '../absolute-src.js';
1212
import {random} from '../random.js';
13-
import {RenderAssetManager} from '../RenderAssetManager.js';
13+
import {
14+
RenderAssetManager,
15+
type RenderAssetManagerContext,
16+
} from '../RenderAssetManager.js';
1417
import {SequenceContext} from '../SequenceContext.js';
1518
import {useTimelinePosition} from '../timeline-position-state.js';
1619
import {useCurrentFrame} from '../use-current-frame.js';
@@ -32,11 +35,17 @@ type AudioForRenderingProps = RemotionAudioProps & {
3235

3336
const AudioForRenderingRefForwardingFunction: React.ForwardRefRenderFunction<
3437
HTMLAudioElement,
35-
AudioForRenderingProps
38+
AudioForRenderingProps &
39+
Pick<
40+
RenderAssetManagerContext,
41+
'registerRenderAsset' | 'unregisterRenderAsset'
42+
>
3643
> = (props, ref) => {
3744
const audioRef = useRef<HTMLAudioElement>(null);
3845

3946
const {
47+
registerRenderAsset,
48+
unregisterRenderAsset,
4049
volume: volumeProp,
4150
playbackRate,
4251
allowAmplificationDuringRender,
@@ -64,8 +73,6 @@ const AudioForRenderingRefForwardingFunction: React.ForwardRefRenderFunction<
6473
const sequenceContext = useContext(SequenceContext);
6574
const sequencePlaybackRate = sequenceContext?.playbackRate ?? 1;
6675
const audioStartFrame = useContext(Html5MediaTrimContext);
67-
const {registerRenderAsset, unregisterRenderAsset} =
68-
useContext(RenderAssetManager);
6976

7077
const {delayRender, continueRender} = useDelayRender();
7178

@@ -208,8 +215,26 @@ const AudioForRenderingRefForwardingFunction: React.ForwardRefRenderFunction<
208215
return <audio ref={audioRef} {...nativeProps} onError={onNativeError} />;
209216
};
210217

211-
export const AudioForRendering = forwardRef(
212-
AudioForRenderingRefForwardingFunction,
213-
) as ForwardRefExoticComponent<
218+
// Asset collection updates the context, but the audio component only needs its callbacks.
219+
const MemoAudioForRendering = React.memo(
220+
forwardRef(AudioForRenderingRefForwardingFunction),
221+
);
222+
223+
export const AudioForRendering = forwardRef<
224+
HTMLAudioElement,
225+
AudioForRenderingProps
226+
>((props, ref) => {
227+
const {registerRenderAsset, unregisterRenderAsset} =
228+
useContext(RenderAssetManager);
229+
230+
return (
231+
<MemoAudioForRendering
232+
{...props}
233+
ref={ref}
234+
registerRenderAsset={registerRenderAsset}
235+
unregisterRenderAsset={unregisterRenderAsset}
236+
/>
237+
);
238+
}) as ForwardRefExoticComponent<
214239
AudioForRenderingProps & RefAttributes<HTMLAudioElement>
215240
>;

0 commit comments

Comments
 (0)