Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions packages/core/src/RemotionRoot.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ export const RemotionRootContexts: React.FC<{
readonly numberOfAudioTags: number;
readonly logLevel: LogLevel;
readonly audioLatencyHint: AudioContextLatencyCategory;
readonly videoEnabled: boolean | null;
readonly audioEnabled: boolean | null;
readonly videoEnabled: boolean;
readonly audioEnabled: boolean;
readonly frameState: Record<string, number> | null;
}> = ({
children,
Expand Down Expand Up @@ -87,6 +87,7 @@ export const RemotionRootContexts: React.FC<{
<SharedAudioContextProvider
numberOfAudioTags={numberOfAudioTags}
audioLatencyHint={audioLatencyHint}
audioEnabled={audioEnabled}
>
<DurationsContextProvider>
<BufferingProvider>{children}</BufferingProvider>
Expand Down
7 changes: 1 addition & 6 deletions packages/core/src/audio/AudioForPreview.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import {
import {evaluateVolume} from '../volume-prop.js';
import {warnAboutTooHighVolume} from '../volume-safeguard.js';
import type {IsExact, NativeAudioProps, RemotionAudioProps} from './props.js';
import {SharedAudioContext, useSharedAudio} from './shared-audio-tags.js';
import {useSharedAudio} from './shared-audio-tags.js';
import {useFrameForVolumeProp} from './use-audio-frame.js';

type AudioForPreviewProps = RemotionAudioProps & {
Expand Down Expand Up @@ -165,11 +165,6 @@ const AudioForDevelopmentForwardRefFunction: React.ForwardRefRenderFunction<
],
);

const context = useContext(SharedAudioContext);
if (!context) {
throw new Error('SharedAudioContext not found');
}

const {el: audioRef, mediaElementSourceNode} = useSharedAudio({
aud: propsToPass,
audioId: id,
Expand Down
9 changes: 7 additions & 2 deletions packages/core/src/audio/shared-audio-tags.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,8 @@ export const SharedAudioContextProvider: React.FC<{
readonly numberOfAudioTags: number;
readonly children: React.ReactNode;
readonly audioLatencyHint: AudioContextLatencyCategory;
}> = ({children, numberOfAudioTags, audioLatencyHint}) => {
readonly audioEnabled: boolean;
}> = ({children, numberOfAudioTags, audioLatencyHint, audioEnabled}) => {
const audios = useRef<AudioElem[]>([]);
const [initialNumberOfAudioTags] = useState(numberOfAudioTags);

Expand All @@ -129,7 +130,11 @@ export const SharedAudioContextProvider: React.FC<{
}

const logLevel = useLogLevel();
const audioContext = useSingletonAudioContext(logLevel, audioLatencyHint);
const audioContext = useSingletonAudioContext({
logLevel,
latencyHint: audioLatencyHint,
audioEnabled,
});
const refs = useMemo(() => {
return new Array(numberOfAudioTags).fill(true).map((): Ref => {
const ref = createRef<HTMLAudioElement>();
Expand Down
19 changes: 14 additions & 5 deletions packages/core/src/audio/use-audio-context.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,26 @@ const warnOnce = (logLevel: LogLevel) => {
}
};

export const useSingletonAudioContext = (
logLevel: LogLevel,
latencyHint: AudioContextLatencyCategory,
) => {
export const useSingletonAudioContext = ({
logLevel,
latencyHint,
audioEnabled,
}: {
logLevel: LogLevel;
latencyHint: AudioContextLatencyCategory;
audioEnabled: boolean;
}) => {
const env = useRemotionEnvironment();

const audioContext = useMemo(() => {
if (env.isRendering) {
return null;
}

if (!audioEnabled) {
return null;
}

if (typeof AudioContext === 'undefined') {
warnOnce(logLevel);
return null;
Expand All @@ -44,7 +53,7 @@ export const useSingletonAudioContext = (
// we observe some issues that seem to go away when we set the sample rate to 48000 with Sony LinkBuds Bluetooth headphones.
sampleRate: 48000,
});
}, [logLevel, latencyHint, env.isRendering]);
}, [logLevel, latencyHint, env.isRendering, audioEnabled]);

return audioContext;
};
1 change: 1 addition & 0 deletions packages/player/src/Player.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -408,6 +408,7 @@ const PlayerFn = <
audioLatencyHint={audioLatencyHint}
volumePersistenceKey={volumePersistenceKey}
inputProps={actualInputProps}
audioEnabled
>
<Internals.SetTimelineContext.Provider value={setTimelineContextValue}>
<PlayerEmitterProvider currentPlaybackRate={currentPlaybackRate}>
Expand Down
3 changes: 3 additions & 0 deletions packages/player/src/SharedPlayerContext.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ export const SharedPlayerContexts: React.FC<{
readonly audioLatencyHint: AudioContextLatencyCategory;
readonly volumePersistenceKey?: string;
readonly inputProps: Record<string, unknown>;
readonly audioEnabled: boolean;
}> = ({
children,
timelineContext,
Expand All @@ -44,6 +45,7 @@ export const SharedPlayerContexts: React.FC<{
audioLatencyHint,
volumePersistenceKey,
inputProps,
audioEnabled,
}) => {
const compositionManagerContext: CompositionManagerContext = useMemo(() => {
const context: CompositionManagerContext = {
Expand Down Expand Up @@ -152,6 +154,7 @@ export const SharedPlayerContexts: React.FC<{
<Internals.SharedAudioContextProvider
numberOfAudioTags={numberOfSharedAudioTags}
audioLatencyHint={audioLatencyHint}
audioEnabled={audioEnabled}
>
<Internals.BufferingProvider>
{children}
Expand Down
1 change: 1 addition & 0 deletions packages/player/src/Thumbnail.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@ const ThumbnailFn = <
logLevel={logLevel}
audioLatencyHint="playback"
inputProps={passedInputProps}
audioEnabled={false}
>
<ThumbnailEmitterContext.Provider value={emitter}>
<ThumbnailUI
Expand Down
Loading