@remotion/player 4.0.290 → 4.0.291

package/dist/cjs/use-playback.js

@@ -13,7 +13,6 @@ const usePlayback = ({ loop, playbackRate, moveToBeginningWhenEnded, inFrame, ou
     const frame = remotion_1.Internals.Timeline.useTimelinePosition();
     const { playing, pause, emitter } = (0, use_player_js_1.usePlayer)();
     const setFrame = remotion_1.Internals.Timeline.useTimelineSetFrame();
-    const buffering = (0, react_1.useRef)(null);
     // requestAnimationFrame() does not work if the tab is not active.
     // This means that audio will keep playing even if it has ended.
     // In that case, we use setTimeout() instead.
@@ -29,18 +28,6 @@ const usePlayback = ({ loop, playbackRate, moveToBeginningWhenEnded, inFrame, ou
         videoConfig: config,
     });
     //	complete code for media session API
-    (0, react_1.useEffect)(() => {
-        const onBufferClear = context.listenForBuffering(() => {
-            buffering.current = performance.now();
-        });
-        const onResumeClear = context.listenForResume(() => {
-            buffering.current = null;
-        });
-        return () => {
-            onBufferClear.remove();
-            onResumeClear.remove();
-        };
-    }, [context]);
     (0, react_1.useEffect)(() => {
         if (!config) {
             return;
@@ -67,6 +54,9 @@ const usePlayback = ({ loop, playbackRate, moveToBeginningWhenEnded, inFrame, ou
             cancelQueuedFrame();
         };
         const callback = () => {
+            if (hasBeenStopped) {
+                return;
+            }
             const time = performance.now() - startedTime;
             const actualLastFrame = outFrame !== null && outFrame !== void 0 ? outFrame : config.durationInFrames - 1;
             const actualFirstFrame = inFrame !== null && inFrame !== void 0 ? inFrame : 0;
@@ -92,20 +82,15 @@ const usePlayback = ({ loop, playbackRate, moveToBeginningWhenEnded, inFrame, ou
                 emitter.dispatchEnded();
                 return;
             }
-            if (!hasBeenStopped) {
-                queueNextFrame();
-            }
+            queueNextFrame();
         };
         const queueNextFrame = () => {
-            if (buffering.current) {
+            if (context.buffering.current) {
                 const stopListening = context.listenForResume(() => {
                     stopListening.remove();
-                    if (hasBeenStopped) {
-                        return;
-                    }
                     startedTime = performance.now();
                     framesAdvanced = 0;
-                    callback();
+                    queueNextFrame();
                 });
                 return;
             }
@@ -115,10 +100,9 @@ const usePlayback = ({ loop, playbackRate, moveToBeginningWhenEnded, inFrame, ou
                     // Note: Most likely, this will not be 1000 / fps, but the browser will throttle it to ~1/sec.
                     id: setTimeout(callback, 1000 / config.fps),
                 };
+                return;
             }
-            else {
-                reqAnimFrameCall = { type: 'raf', id: requestAnimationFrame(callback) };
-            }
+            reqAnimFrameCall = { type: 'raf', id: requestAnimationFrame(callback) };
         };
         queueNextFrame();
         const onVisibilityChange = () => {
@@ -148,7 +132,6 @@ const usePlayback = ({ loop, playbackRate, moveToBeginningWhenEnded, inFrame, ou
         moveToBeginningWhenEnded,
         isBackgroundedRef,
         getCurrentFrame,
-        buffering,
         context,
     ]);
     (0, react_1.useEffect)(() => {

package/dist/esm/index.mjs

@@ -881,7 +881,6 @@ var usePlayback = ({
   const frame = Internals6.Timeline.useTimelinePosition();
   const { playing, pause, emitter } = usePlayer();
   const setFrame = Internals6.Timeline.useTimelineSetFrame();
-  const buffering = useRef4(null);
   const isBackgroundedRef = useIsBackgrounded();
   const lastTimeUpdateEvent = useRef4(null);
   const context = useContext4(Internals6.BufferingContextReact);
@@ -893,18 +892,6 @@ var usePlayback = ({
     playbackRate,
     videoConfig: config
   });
-  useEffect6(() => {
-    const onBufferClear = context.listenForBuffering(() => {
-      buffering.current = performance.now();
-    });
-    const onResumeClear = context.listenForResume(() => {
-      buffering.current = null;
-    });
-    return () => {
-      onBufferClear.remove();
-      onResumeClear.remove();
-    };
-  }, [context]);
   useEffect6(() => {
     if (!config) {
       return;
@@ -930,6 +917,9 @@ var usePlayback = ({
       cancelQueuedFrame();
     };
     const callback = () => {
+      if (hasBeenStopped) {
+        return;
+      }
       const time = performance.now() - startedTime;
       const actualLastFrame = outFrame ?? config.durationInFrames - 1;
       const actualFirstFrame = inFrame ?? 0;
@@ -954,20 +944,15 @@ var usePlayback = ({
         emitter.dispatchEnded();
         return;
       }
-      if (!hasBeenStopped) {
-        queueNextFrame();
-      }
+      queueNextFrame();
     };
     const queueNextFrame = () => {
-      if (buffering.current) {
+      if (context.buffering.current) {
         const stopListening = context.listenForResume(() => {
           stopListening.remove();
-          if (hasBeenStopped) {
-            return;
-          }
           startedTime = performance.now();
           framesAdvanced = 0;
-          callback();
+          queueNextFrame();
         });
         return;
       }
@@ -976,9 +961,9 @@ var usePlayback = ({
           type: "timeout",
           id: setTimeout(callback, 1000 / config.fps)
         };
-      } else {
-        reqAnimFrameCall = { type: "raf", id: requestAnimationFrame(callback) };
+        return;
       }
+      reqAnimFrameCall = { type: "raf", id: requestAnimationFrame(callback) };
     };
     queueNextFrame();
     const onVisibilityChange = () => {
@@ -1006,7 +991,6 @@ var usePlayback = ({
     moveToBeginningWhenEnded,
     isBackgroundedRef,
     getCurrentFrame,
-    buffering,
     context
   ]);
   useEffect6(() => {

package/package.json

@@ -3,7 +3,7 @@
     "url": "https://github.com/remotion-dev/remotion/tree/main/packages/player"
   },
   "name": "@remotion/player",
-  "version": "4.0.290",
+  "version": "4.0.291",
   "description": "React component for embedding a Remotion preview into your app",
   "main": "dist/cjs/index.js",
   "types": "dist/cjs/index.d.ts",
@@ -28,7 +28,7 @@
   ],
   "license": "SEE LICENSE IN LICENSE.md",
   "dependencies": {
-    "remotion": "4.0.290"
+    "remotion": "4.0.291"
   },
   "peerDependencies": {
     "react": ">=16.8.0",
@@ -43,7 +43,7 @@
     "webpack": "5.96.1",
     "zod": "3.22.3",
     "eslint": "9.19.0",
-    "@remotion/eslint-config-internal": "4.0.290"
+    "@remotion/eslint-config-internal": "4.0.291"
   },
   "keywords": [
     "remotion",

package/dist/cjs/use-playback-new.js

@@ -1,171 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.usePlayback = void 0;
-/* eslint-disable @typescript-eslint/no-use-before-define */
-const react_1 = require("react");
-const react_dom_1 = require("react-dom");
-const remotion_1 = require("remotion");
-const browser_mediasession_js_1 = require("./browser-mediasession.js");
-const calculate_next_frame_js_1 = require("./calculate-next-frame.js");
-const is_backgrounded_js_1 = require("./is-backgrounded.js");
-const use_player_js_1 = require("./use-player.js");
-const usePlayback = ({ loop, playbackRate, moveToBeginningWhenEnded, inFrame, outFrame, browserMediaControlsBehavior, getCurrentFrame, }) => {
-    const config = remotion_1.Internals.useUnsafeVideoConfig();
-    const frame = remotion_1.Internals.Timeline.useTimelinePosition();
-    const { playing, pause, emitter } = (0, use_player_js_1.usePlayer)();
-    const setFrame = remotion_1.Internals.Timeline.useTimelineSetFrame();
-    const buffering = (0, react_1.useRef)(null);
-    // requestAnimationFrame() does not work if the tab is not active.
-    // This means that audio will keep playing even if it has ended.
-    // In that case, we use setTimeout() instead.
-    const isBackgroundedRef = (0, is_backgrounded_js_1.useIsBackgrounded)();
-    const lastTimeUpdateEvent = (0, react_1.useRef)(null);
-    const context = (0, react_1.useContext)(remotion_1.Internals.BufferingContextReact);
-    if (!context) {
-        throw new Error('Missing the buffering context. Most likely you have a Remotion version mismatch.');
-    }
-    (0, browser_mediasession_js_1.useBrowserMediaSession)({
-        browserMediaControlsBehavior,
-        playbackRate,
-        videoConfig: config,
-    });
-    //	complete code for media session API
-    (0, react_1.useEffect)(() => {
-        const onBufferClear = context.listenForBuffering(() => {
-            buffering.current = performance.now();
-        });
-        const onResumeClear = context.listenForResume(() => {
-            buffering.current = null;
-        });
-        return () => {
-            onBufferClear.remove();
-            onResumeClear.remove();
-        };
-    }, [context]);
-    (0, react_1.useEffect)(() => {
-        if (!config) {
-            return;
-        }
-        if (!playing) {
-            return;
-        }
-        let hasBeenStopped = false;
-        let reqAnimFrameCall = null;
-        let startedTime = performance.now();
-        let framesAdvanced = 0;
-        const cancelQueuedFrame = () => {
-            if (reqAnimFrameCall !== null) {
-                if (reqAnimFrameCall.type === 'raf') {
-                    cancelAnimationFrame(reqAnimFrameCall.id);
-                }
-                else {
-                    clearTimeout(reqAnimFrameCall.id);
-                }
-            }
-        };
-        const stop = () => {
-            hasBeenStopped = true;
-            cancelQueuedFrame();
-        };
-        const callback = () => {
-            const time = performance.now() - startedTime;
-            const actualLastFrame = outFrame !== null && outFrame !== void 0 ? outFrame : config.durationInFrames - 1;
-            const actualFirstFrame = inFrame !== null && inFrame !== void 0 ? inFrame : 0;
-            const currentFrame = getCurrentFrame();
-            const { nextFrame, framesToAdvance, hasEnded } = (0, calculate_next_frame_js_1.calculateNextFrame)({
-                time,
-                currentFrame,
-                playbackSpeed: playbackRate,
-                fps: config.fps,
-                actualFirstFrame,
-                actualLastFrame,
-                framesAdvanced,
-                shouldLoop: loop,
-            });
-            framesAdvanced += framesToAdvance;
-            if (nextFrame !== getCurrentFrame() &&
-                (!hasEnded || moveToBeginningWhenEnded)) {
-                (0, react_dom_1.flushSync)(() => {
-                    setFrame((c) => ({ ...c, [config.id]: nextFrame }));
-                });
-            }
-            if (hasEnded) {
-                stop();
-                pause();
-                emitter.dispatchEnded();
-                return;
-            }
-            if (!hasBeenStopped) {
-                queueNextFrame();
-            }
-        };
-        const queueNextFrame = () => {
-            if (buffering.current) {
-                const stopListening = context.listenForResume(() => {
-                    stopListening.remove();
-                    if (hasBeenStopped) {
-                        return;
-                    }
-                    startedTime = performance.now();
-                    framesAdvanced = 0;
-                    callback();
-                });
-                return;
-            }
-            if (isBackgroundedRef.current) {
-                reqAnimFrameCall = {
-                    type: 'timeout',
-                    // Note: Most likely, this will not be 1000 / fps, but the browser will throttle it to ~1/sec.
-                    id: setTimeout(callback, 1000 / config.fps),
-                };
-            }
-            else {
-                reqAnimFrameCall = { type: 'raf', id: requestAnimationFrame(callback) };
-            }
-        };
-        queueNextFrame();
-        const onVisibilityChange = () => {
-            if (document.visibilityState === 'visible') {
-                return;
-            }
-            // If tab goes into the background, cancel requestAnimationFrame() and update immediately.
-            // , so the transition to setTimeout() can be fulfilled.
-            cancelQueuedFrame();
-            callback();
-        };
-        window.addEventListener('visibilitychange', onVisibilityChange);
-        return () => {
-            window.removeEventListener('visibilitychange', onVisibilityChange);
-            stop();
-        };
-    }, [
-        config,
-        loop,
-        pause,
-        playing,
-        setFrame,
-        emitter,
-        playbackRate,
-        inFrame,
-        outFrame,
-        moveToBeginningWhenEnded,
-        isBackgroundedRef,
-        getCurrentFrame,
-        buffering,
-        context,
-    ]);
-    (0, react_1.useEffect)(() => {
-        const interval = setInterval(() => {
-            if (lastTimeUpdateEvent.current === getCurrentFrame()) {
-                return;
-            }
-            emitter.dispatchTimeUpdate({ frame: getCurrentFrame() });
-            lastTimeUpdateEvent.current = getCurrentFrame();
-        }, 250);
-        return () => clearInterval(interval);
-    }, [emitter, getCurrentFrame]);
-    (0, react_1.useEffect)(() => {
-        emitter.dispatchFrameUpdate({ frame });
-    }, [emitter, frame]);
-};
-exports.usePlayback = usePlayback;