π₯ Make videos programmatically with React
Remove obsolete ordering nonce system
JonnyBurger4da87af74b11
diff --git a/packages/canvas/src/index.ts b/packages/canvas/src/index.tsindex 499cffc9eb..332104140b 100644--- a/packages/canvas/src/index.ts+++ b/packages/canvas/src/index.ts@@ -32,9 +32,5 @@ export type {CanvasSelectionInteraction,CanvasSelectionSnapshot,} from './selection';-export {- compareNonceHistories,- sortItemsByNonceHistory,-} from './sort-by-nonce-history';export {sortItemsByCommitOrder} from './sort-by-commit-order';export {timelineSequenceNodePathToKey} from './timeline-sequence-node-path-to-key';diff --git a/packages/canvas/src/sort-by-nonce-history.ts b/packages/canvas/src/sort-by-nonce-history.tsdeleted file mode 100644index 631d4ea896..0000000000--- a/packages/canvas/src/sort-by-nonce-history.ts+++ /dev/null@@ -1,190 +0,0 @@-import type {NonceHistory} from 'remotion';--const getSharedEpochOrder = (- a: NonceHistory,- b: NonceHistory,-): number | null => {- const aMap = new Map(a);- const bMap = new Map(b);-- const allEpochs = [...new Set([...aMap.keys(), ...bMap.keys()])].sort(- (x, y) => y - x,- );-- for (const epoch of allEpochs) {- const aNonce = aMap.get(epoch);- const bNonce = bMap.get(epoch);-- if (aNonce !== undefined && bNonce !== undefined) {- return aNonce - bNonce;- }- }-- return null;-};--export const compareNonceHistories = (- a: NonceHistory,- b: NonceHistory,-): number => {- const shared = getSharedEpochOrder(a, b);- if (shared !== null) {- return shared;- }-- // No shared epoch β items from a lower latest epoch come first- const aLatestEpoch = a[a.length - 1][0];- const bLatestEpoch = b[b.length - 1][0];- return aLatestEpoch - bLatestEpoch;-};--// Compare two histories, each pre-collapsed to parallel arrays of epochs and-// nonces sorted by descending epoch, without rebuilding a Map per comparison.-// Equivalent to getSharedEpochOrder: both find the newest shared epoch and-// compare its nonces.-const sharedEpochOrderFromSorted = (- aEpochs: number[],- aNonces: number[],- bEpochs: number[],- bNonces: number[],-): number | null => {- let i = 0;- let j = 0;- while (i < aEpochs.length && j < bEpochs.length) {- const ae = aEpochs[i];- const be = bEpochs[j];- if (ae === be) {- return aNonces[i] - bNonces[j];- }-- if (ae > be) {- i++;- } else {- j++;- }- }-- return null;-};--export const sortItemsByNonceHistory: <T extends {nonce: NonceHistory}>(- items: T[],-) => T[] = (items) => {- const n = items.length;- if (n <= 1) {- return items.slice();- }-- // Collapse each history once into epoch/nonce arrays sorted by descending- // epoch. `new Map(nonce)` keeps the last value per duplicated epoch, matching- // getSharedEpochOrder. This removes the per-pair Map/Set construction the- // pairwise loop below would otherwise repeat O(n^2) times.- const epochsOf: number[][] = new Array(n);- const noncesOf: number[][] = new Array(n);- for (let i = 0; i < n; i++) {- const map = new Map(items[i].nonce);- const epochs = [...map.keys()].sort((x, y) => y - x);- epochsOf[i] = epochs;- noncesOf[i] = epochs.map((e) => map.get(e)!);- }-- // Pairwise "strictly before" relation, stored as bitsets: `before[i]` has- // bit j set when i must come before j, `known[i]` has bit j set when the- // pair (i, j) is directly determined by a shared epoch. Bitsets let the- // transitive closure below combine 32 relationships per word.- const words = (n + 31) >> 5;- const before = new Uint32Array(n * words);- const known = new Uint32Array(n * words);- // Direct comparison sign per ordered pair; only read where `known` is set.- const sign = new Int8Array(n * n);-- for (let i = 0; i < n; i++) {- for (let j = i + 1; j < n; j++) {- const cmp = sharedEpochOrderFromSorted(- epochsOf[i],- noncesOf[i],- epochsOf[j],- noncesOf[j],- );- if (cmp === null) {- continue;- }-- known[i * words + (j >> 5)] |= 1 << (j & 31);- known[j * words + (i >> 5)] |= 1 << (i & 31);- sign[i * n + j] = cmp < 0 ? -1 : cmp > 0 ? 1 : 0;- sign[j * n + i] = cmp < 0 ? 1 : cmp > 0 ? -1 : 0;- if (cmp < 0) {- before[i * words + (j >> 5)] |= 1 << (j & 31);- } else if (cmp > 0) {- before[j * words + (i >> 5)] |= 1 << (i & 31);- }- }- }-- // Transitive closure: if i < k and k < j, then i < j. This is the same- // Floyd-Warshall relation as before, but the inner sweep is bitwise- // (`before[k] & ~known[i]` finds all reachable j at once). A newly derived- // edge is marked known immediately so the first path decides an otherwise- // undetermined pair β preserving behavior on the inputs where the pairwise- // comparison is intentionally non-transitive.- for (let k = 0; k < n; k++) {- const kBase = k * words;- const kWord = k >> 5;- const kBit = 1 << (k & 31);- for (let i = 0; i < n; i++) {- if (i === k) {- continue;- }-- const iBase = i * words;- if ((before[iBase + kWord] & kBit) === 0) {- continue; // i is not before k, so k adds nothing for i- }-- for (let w = 0; w < words; w++) {- const add = before[kBase + w] & ~known[iBase + w];- if (add === 0) {- continue;- }-- before[iBase + w] |= add;- known[iBase + w] |= add;- // Set the mirror relationship (j after i) for each newly known pair.- let bits = add;- while (bits !== 0) {- const lowest = bits & -bits;- const j = (w << 5) + (31 - Math.clz32(lowest));- sign[i * n + j] = -1;- known[j * words + (i >> 5)] |= 1 << (i & 31);- sign[j * n + i] = 1;- bits ^= lowest;- }- }- }- }-- const indexMap = new Map(items.map((item, i) => [item, i]));- const result = items.slice();- result.sort((a, b) => {- const ai = indexMap.get(a)!;- const bi = indexMap.get(b)!;-- if ((known[ai * words + (bi >> 5)] >> (bi & 31)) & 1) {- return sign[ai * n + bi];- }-- if ((before[ai * words + (bi >> 5)] >> (bi & 31)) & 1) {- return -1;- }-- if ((before[bi * words + (ai >> 5)] >> (ai & 31)) & 1) {- return 1;- }-- // No transitive relationship β lower latest epoch first- return a.nonce[a.nonce.length - 1][0] - b.nonce[b.nonce.length - 1][0];- });-- return result;-};diff --git a/packages/canvas/src/test/sort-by-nonce-history.test.ts b/packages/canvas/src/test/sort-by-nonce-history.test.tsdeleted file mode 100644index ba51ef73fc..0000000000--- a/packages/canvas/src/test/sort-by-nonce-history.test.ts+++ /dev/null@@ -1,197 +0,0 @@-import {expect, test} from 'bun:test';-import type {NonceHistory} from 'remotion';-import {- compareNonceHistories,- sortItemsByNonceHistory,-} from '../sort-by-nonce-history';--test('sorts by latest nonce ascending', () => {- const a: NonceHistory = [[0, 10]];- const b: NonceHistory = [[0, 5]];- const c: NonceHistory = [[0, 8]];-- const items = [- {id: 'a', nonce: a},- {id: 'b', nonce: b},- {id: 'c', nonce: c},- ];-- const sorted = sortItemsByNonceHistory(items);- expect(sorted.map((i) => i.id)).toEqual(['b', 'c', 'a']);-});--test('uses shared epoch for comparison', () => {- const a: NonceHistory = [- [0, 10],- [1, 3],- ];- const b: NonceHistory = [- [0, 5],- [1, 7],- ];-- // Both share epoch 1 (most recent shared). a=3 < b=7- expect(compareNonceHistories(a, b)).toBeLessThan(0);-});--test('items with different epoch counts sort by latest nonce', () => {- const a: NonceHistory = [[2, 585]];- const b: NonceHistory = [- [0, 526],- [1, 559],- [2, 586],- ];- const c: NonceHistory = [- [0, 527],- [1, 560],- [2, 587],- ];-- const items = [- {id: 'a', nonce: a},- {id: 'b', nonce: b},- {id: 'c', nonce: c},- ];-- const sorted = sortItemsByNonceHistory(items);- expect(sorted.map((i) => i.id)).toEqual(['a', 'b', 'c']);-});--test('sorts by nonce in the most recent shared epoch across different history lengths', () => {- const a: NonceHistory = [- [1, 540],- [2, 558],- [3, 576],- ];- const b: NonceHistory = [[3, 583]];- const c: NonceHistory = [- [3, 577],- [4, 594],- [5, 603],- [6, 618],- ];-- const items = [- {id: 'b', nonce: b},- {id: 'c', nonce: c},- {id: 'a', nonce: a},- ];-- // a and b share epoch 3: 576 vs 583 β a first- // a and c share epoch 3: 576 vs 577 β a first- // b and c share epoch 3: 583 vs 577 β c first- // Order: a (576), c (577), b (583)- const sorted = sortItemsByNonceHistory(items);- expect(sorted.map((i) => i.id)).toEqual(['a', 'c', 'b']);-});--test('items from higher epochs come before items from lower epochs when no shared epoch', () => {- const item1: NonceHistory = [- [3, 548],- [4, 556],- ];- const item2: NonceHistory = [[4, 557]];- const item3: NonceHistory = [[5, 564]];- const item4: NonceHistory = [[5, 565]];- const item5: NonceHistory = [- [4, 555],- [5, 566],- ];-- const items = [- {id: '1', nonce: item1},- {id: '2', nonce: item2},- {id: '3', nonce: item3},- {id: '4', nonce: item4},- {id: '5', nonce: item5},- ];-- // 3, 4, 5 share epoch 5: 564 < 565 < 566 β 3, 4, 5- // 1, 2, 5 share epoch 4: 555 < 556 < 557 β 5, 1, 2- // 3 vs 1: no shared epoch, epoch 5 > epoch 4 β 3 first- // Combined: 3, 4, 5, 1, 2- const sorted = sortItemsByNonceHistory(items);- expect(sorted.map((i) => i.id)).toEqual(['3', '4', '5', '1', '2']);-});--test('all items sharing an epoch sort by nonce in that epoch regardless of later epochs', () => {- const item1: NonceHistory = [- [0, 520],- [1, 534],- [2, 540],- ];- const item2: NonceHistory = [[2, 544]];- const item3: NonceHistory = [[2, 545]];- const item4: NonceHistory = [- [2, 541],- [3, 552],- ];- const item5: NonceHistory = [- [2, 542],- [3, 553],- ];-- const items = [- {id: '1', nonce: item1},- {id: '2', nonce: item2},- {id: '3', nonce: item3},- {id: '4', nonce: item4},- {id: '5', nonce: item5},- ];-- // All share epoch 2: 540, 541, 542, 544, 545- const sorted = sortItemsByNonceHistory(items);- expect(sorted.map((i) => i.id)).toEqual(['1', '4', '5', '2', '3']);-});--test('item with later epoch should sort by shared epoch 0 nonce', () => {- const item1: NonceHistory = [[0, 520]];- const item2: NonceHistory = [[0, 523]];- const item3: NonceHistory = [- [0, 521],- [1, 530],- ];-- const items = [- {id: '1', nonce: item1},- {id: '2', nonce: item2},- {id: '3', nonce: item3},- ];-- // All share epoch 0: 520, 521, 523 β 1, 3, 2- const sorted = sortItemsByNonceHistory(items);- expect(sorted.map((i) => i.id)).toEqual(['1', '3', '2']);-});--test('unconnected items with higher epoch sort last', () => {- const item1: NonceHistory = [- [0, 520],- [1, 528],- [2, 536],- [3, 542],- ];- const item2: NonceHistory = [[3, 545]];- const item3: NonceHistory = [- [0, 521],- [1, 529],- ];- const item4: NonceHistory = [- [0, 522],- [1, 530],- ];-- const items = [- {id: '1', nonce: item1},- {id: '2', nonce: item2},- {id: '3', nonce: item3},- {id: '4', nonce: item4},- ];-- // 1 < 2 (epoch 3: 542 < 545)- // 1 < 3 (epoch 1: 528 < 529)- // 1 < 4 (epoch 1: 528 < 530)- // 3 < 4 (epoch 1: 529 < 530)- // 2 vs 3/4: no shared epoch, no transitive path β lower epoch first (3/4 epoch 1 < 2 epoch 3)- const sorted = sortItemsByNonceHistory(items);- expect(sorted.map((i) => i.id)).toEqual(['1', '3', '4', '2']);-});diff --git a/packages/core/src/RemotionRoot.tsx b/packages/core/src/RemotionRoot.tsxindex dcbc956dde..aaa7bb2612 100644--- a/packages/core/src/RemotionRoot.tsx+++ b/packages/core/src/RemotionRoot.tsx@@ -8,8 +8,6 @@ import {EditorPropsProvider} from './EditorProps.js';import type {LoggingContextValue} from './log-level-context.js';import {LogLevelContext} from './log-level-context.js';import type {LogLevel} from './log.js';-import type {TNonceContext} from './nonce.js';-import {NonceContext} from './nonce.js';import {PrefetchProvider} from './prefetch-state.js';import {SequenceManagerProvider} from './SequenceManager.js';import {TimelineContextProvider} from './TimelineContext.js';@@ -37,52 +35,43 @@ export const RemotionRootContexts: React.FC<{frameState,_experimentalKeepAudioContextAlive,}) => {- const nonceContext = useMemo((): TNonceContext => {- let counter = 0;- return {- getNonce: () => counter++,- };- }, []);-const logging: LoggingContextValue = useMemo(() => {return {logLevel, mountTime: Date.now()};}, [logLevel]);return (<LogLevelContext.Provider value={logging}>- <NonceContext.Provider value={nonceContext}>- <TimelineContextProvider frameState={frameState}>- <MediaEnabledProvider- videoEnabled={videoEnabled}- audioEnabled={audioEnabled}- >- <EditorPropsProvider>- <PrefetchProvider>- <SequenceManagerProvider>- <DurationsContextProvider>- <BufferingProvider>- <SharedAudioContextProvider- audioLatencyHint={audioLatencyHint}- audioEnabled={audioEnabled}- previewSampleRate={previewSampleRate}- _experimentalKeepAudioContextAlive={- _experimentalKeepAudioContextAlive- }+ <TimelineContextProvider frameState={frameState}>+ <MediaEnabledProvider+ videoEnabled={videoEnabled}+ audioEnabled={audioEnabled}+ >+ <EditorPropsProvider>+ <PrefetchProvider>+ <SequenceManagerProvider>+ <DurationsContextProvider>+ <BufferingProvider>+ <SharedAudioContextProvider+ audioLatencyHint={audioLatencyHint}+ audioEnabled={audioEnabled}+ previewSampleRate={previewSampleRate}+ _experimentalKeepAudioContextAlive={+ _experimentalKeepAudioContextAlive+ }+ >+ <SharedAudioTagsContextProvider+ numberOfAudioTags={numberOfAudioTags}>- <SharedAudioTagsContextProvider- numberOfAudioTags={numberOfAudioTags}- >- {children}- </SharedAudioTagsContextProvider>- </SharedAudioContextProvider>- </BufferingProvider>- </DurationsContextProvider>- </SequenceManagerProvider>- </PrefetchProvider>- </EditorPropsProvider>- </MediaEnabledProvider>- </TimelineContextProvider>- </NonceContext.Provider>+ {children}+ </SharedAudioTagsContextProvider>+ </SharedAudioContextProvider>+ </BufferingProvider>+ </DurationsContextProvider>+ </SequenceManagerProvider>+ </PrefetchProvider>+ </EditorPropsProvider>+ </MediaEnabledProvider>+ </TimelineContextProvider></LogLevelContext.Provider>);};diff --git a/packages/core/src/index.ts b/packages/core/src/index.tsindex 7948e6e5ff..5621952a05 100644--- a/packages/core/src/index.ts+++ b/packages/core/src/index.ts@@ -232,7 +232,6 @@ export {random,RandomSeed,} from './no-react';-export type {NonceHistory} from './nonce.js';export {prefetch, PrefetchOnProgress} from './prefetch.js';export {registerRoot} from './register-root.js';export type {PixelFormat, VideoImageFormat} from './render-types.js';diff --git a/packages/core/src/internals.ts b/packages/core/src/internals.tsindex 91b08f14e2..66f677f028 100644--- a/packages/core/src/internals.ts+++ b/packages/core/src/internals.ts@@ -128,8 +128,6 @@ import {makeMediaResourceManager,MEDIABUNNY_DURATION_VALUE_KEY,} from './media-resource-manager.js';-import type {NonceHistory} from './nonce.js';-import {NonceContext} from './nonce.js';import {playbackLogging} from './playback-logging.js';import {portalNode, setPortalNodeCurrentScale} from './portal-node.js';import {PrefetchProvider} from './prefetch-state.js';@@ -393,7 +391,6 @@ export const Internals = {EditorPropsProvider,EditorPropsContext,usePreload,- NonceContext,resolveVideoConfig,resolveVideoConfigOrCatch,resolveVideoConfigWithMetadataOrCatch,@@ -511,7 +508,6 @@ export type {JsxComponentIdentity,LoggingContextValue,MediaVolumeContextValue,- NonceHistory,OverrideIdsToNodePathsGettersContext,OverrideIdsToNodePathsSettersContext,OverrideIdToNodePaths,diff --git a/packages/core/src/nonce.ts b/packages/core/src/nonce.tsdeleted file mode 100644index b81a855a00..0000000000--- a/packages/core/src/nonce.ts+++ /dev/null@@ -1,69 +0,0 @@-import {createContext, useCallback, useContext, useMemo, useRef} from 'react';--// Nonces keep track of the order of compositions.-// It's a counter that goes up and sequences and compositions get a nonce-// to keep track of the orders.--// On fast refresh, we reset the counter and all compositions and-// sequences have to re-register.--export type TNonceContext = {- getNonce: () => number;-};--type NonceHistoryItem = [number, number];--export type NonceHistory = NonceHistoryItem[];--export type NonceHistoryContext = {- get: () => NonceHistory;-};--export const NonceContext = createContext<TNonceContext>({- getNonce: () => 0,-});--let fastRefreshNonce = 0;--declare const __webpack_module__: {- hot: {- addStatusHandler(callback: (status: string) => void): void;- };-};--try {- if (typeof __webpack_module__ !== 'undefined') {- if (__webpack_module__.hot) {- __webpack_module__.hot.addStatusHandler((status) => {- if (status === 'idle') {- fastRefreshNonce++;- }- });- }- }-} catch {- // __webpack_module__ may throw ReferenceError in some environments-}--export const useNonce = (): NonceHistoryContext => {- const context = useContext(NonceContext);- const nonce = context.getNonce();- const nonceRef = useRef(nonce);- nonceRef.current = nonce;- const history = useRef<NonceHistoryItem[]>([[fastRefreshNonce, nonce]]);-- const get = useCallback(() => {- if (fastRefreshNonce !== history.current[history.current.length - 1][0]) {- history.current = [- ...history.current,- [fastRefreshNonce, nonceRef.current],- ];- }-- return history.current;- }, [history]);-- return useMemo(() => {- return {get};- }, [get]);-};diff --git a/packages/core/src/wrap-remotion-context.tsx b/packages/core/src/wrap-remotion-context.tsxindex 5029853e21..ad3f1526f8 100644--- a/packages/core/src/wrap-remotion-context.tsx+++ b/packages/core/src/wrap-remotion-context.tsx@@ -7,7 +7,6 @@ import {BufferingContextReact} from './buffering.js';import {CanUseRemotionHooks} from './CanUseRemotionHooks.js';import {CompositionManager} from './CompositionManagerContext.js';import {LogLevelContext} from './log-level-context.js';-import {NonceContext} from './nonce.js';import {PreloadContext} from './prefetch-state.js';import {RenderAssetManager} from './RenderAssetManager.js';import {ResolveCompositionContext} from './ResolveCompositionConfig.js';@@ -24,7 +23,6 @@ export function useRemotionContexts() {const timelineContext = React.useContext(TimelineContext);const setTimelineContext = React.useContext(SetTimelineContext);const sequenceContext = React.useContext(SequenceContext);- const nonceContext = React.useContext(NonceContext);const canUseRemotionHooksContext = React.useContext(CanUseRemotionHooks);const preloadContext = React.useContext(PreloadContext);const resolveCompositionContext = React.useContext(ResolveCompositionContext);@@ -43,7 +41,6 @@ export function useRemotionContexts() {timelineContext,setTimelineContext,sequenceContext,- nonceContext,canUseRemotionHooksContext,preloadContext,resolveCompositionContext,@@ -56,7 +53,6 @@ export function useRemotionContexts() {}),[compositionManagerCtx,- nonceContext,sequenceContext,setTimelineContext,timelineContext,@@ -85,49 +81,45 @@ export const RemotionContextProvider = (return (<LogLevelContext.Provider value={contexts.logLevelContext}><CanUseRemotionHooks.Provider value={contexts.canUseRemotionHooksContext}>- <NonceContext.Provider value={contexts.nonceContext}>- <PreloadContext.Provider value={contexts.preloadContext}>- <CompositionManager.Provider value={contexts.compositionManagerCtx}>- <SequenceManagerRefContext.Provider- value={contexts.sequenceManagerRefContext}- >- <SequenceManager.Provider- value={contexts.sequenceManagerContext}+ <PreloadContext.Provider value={contexts.preloadContext}>+ <CompositionManager.Provider value={contexts.compositionManagerCtx}>+ <SequenceManagerRefContext.Provider+ value={contexts.sequenceManagerRefContext}+ >+ <SequenceManager.Provider value={contexts.sequenceManagerContext}>+ <VisualModePropStatusesRefContext.Provider+ value={contexts.visualModePropStatusesRefContext}>- <VisualModePropStatusesRefContext.Provider- value={contexts.visualModePropStatusesRefContext}+ <RenderAssetManager.Provider+ value={contexts.renderAssetManagerContext}>- <RenderAssetManager.Provider- value={contexts.renderAssetManagerContext}+ <ResolveCompositionContext.Provider+ value={contexts.resolveCompositionContext}>- <ResolveCompositionContext.Provider- value={contexts.resolveCompositionContext}+ <TimelineContext.Provider+ value={contexts.timelineContext}>- <TimelineContext.Provider- value={contexts.timelineContext}+ <SetTimelineContext.Provider+ value={contexts.setTimelineContext}>- <SetTimelineContext.Provider- value={contexts.setTimelineContext}+ <SequenceContext.Provider+ value={contexts.sequenceContext}>- <SequenceContext.Provider- value={contexts.sequenceContext}+ <BufferingContextReact.Provider+ value={contexts.bufferManagerContext}>- <BufferingContextReact.Provider- value={contexts.bufferManagerContext}- >- {children}- </BufferingContextReact.Provider>- </SequenceContext.Provider>- </SetTimelineContext.Provider>- </TimelineContext.Provider>- </ResolveCompositionContext.Provider>- </RenderAssetManager.Provider>- </VisualModePropStatusesRefContext.Provider>- </SequenceManager.Provider>- </SequenceManagerRefContext.Provider>- </CompositionManager.Provider>- </PreloadContext.Provider>- </NonceContext.Provider>+ {children}+ </BufferingContextReact.Provider>+ </SequenceContext.Provider>+ </SetTimelineContext.Provider>+ </TimelineContext.Provider>+ </ResolveCompositionContext.Provider>+ </RenderAssetManager.Provider>+ </VisualModePropStatusesRefContext.Provider>+ </SequenceManager.Provider>+ </SequenceManagerRefContext.Provider>+ </CompositionManager.Provider>+ </PreloadContext.Provider></CanUseRemotionHooks.Provider></LogLevelContext.Provider>);