Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remotion: Fix audio continuing to play when another element buffers #4382

Merged
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
26 changes: 26 additions & 0 deletions packages/core/src/buffering.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -121,3 +121,29 @@ export const BufferingProvider: React.FC<{
</BufferingContextReact.Provider>
);
};

export const useIsPlayerBuffering = (bufferManager: BufferManager) => {
const [isBuffering, setIsBuffering] = useState(
bufferManager.buffering.current,
);

useEffect(() => {
const onBuffer = () => {
setIsBuffering(true);
};

const onResume = () => {
setIsBuffering(false);
};

bufferManager.listenForBuffering(onBuffer);
bufferManager.listenForResume(onResume);

return () => {
bufferManager.listenForBuffering(() => undefined);
bufferManager.listenForResume(() => undefined);
};
}, [bufferManager]);

return isBuffering;
};
13 changes: 4 additions & 9 deletions packages/core/src/use-media-playback.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import type {RefObject} from 'react';
import {useCallback, useContext, useEffect, useRef} from 'react';
import {useMediaStartsAt} from './audio/use-audio-frame.js';
import {useBufferUntilFirstFrame} from './buffer-until-first-frame.js';
import {BufferingContextReact} from './buffering.js';
import {BufferingContextReact, useIsPlayerBuffering} from './buffering.js';
import {playAndHandleNotAllowedError} from './play-and-handle-not-allowed-error.js';
import {
TimelineContext,
Expand Down Expand Up @@ -129,25 +129,20 @@ export const useMediaPlayback = ({
return acceptableTimeshift;
})();

const isPlayerBuffering = useIsPlayerBuffering(buffering);

useEffect(() => {
if (!playing) {
mediaRef.current?.pause();
return;
}

const isPlayerBuffering = buffering.buffering.current;
const isMediaTagBufferingOrStalled = isMediaTagBuffering || isBuffering();

if (isPlayerBuffering && !isMediaTagBufferingOrStalled) {
mediaRef.current?.pause();
}
}, [
buffering.buffering,
isBuffering,
isMediaTagBuffering,
mediaRef,
playing,
]);
}, [isBuffering, isMediaTagBuffering, isPlayerBuffering, mediaRef, playing]);

useEffect(() => {
const tagName = mediaType === 'audio' ? '<Audio>' : '<Video>';
Expand Down
Loading