🎥 Make videos programmatically with React
`@remotion/media`: Fix duplicate timeline layers when `<Video>` falls back
Jonny Burgerad4ffde6f2f4
diff --git a/packages/core/src/video/html5-video.tsx b/packages/core/src/video/html5-video.tsxindex f91e4bb5fd..99bde3f79c 100644--- a/packages/core/src/video/html5-video.tsx+++ b/packages/core/src/video/html5-video.tsx@@ -170,6 +170,7 @@ const VideoForwardingFunction: React.ForwardRefRenderFunction<onVideoFrame={onVideoFrame}{...otherProps}ref={ref}+ showInTimeline={showInTimeline}_remotionInternalStack={_remotionInternalStack}/></Sequence>diff --git a/packages/media/src/video/video.tsx b/packages/media/src/video/video.tsxindex b43f6a4e84..fb5a9c7837 100644--- a/packages/media/src/video/video.tsx+++ b/packages/media/src/video/video.tsx@@ -450,7 +450,8 @@ const VideoInner: React.FC<muted={muted ?? false}onVideoFrame={onVideoFrame}playbackRate={playbackRate ?? 1}- showInTimeline={showInTimeline ?? true}+ // The enclosing Sequence already represents the video in the timeline.+ showInTimeline={false}src={src}style={croppedStyle ?? {}}trimAfter={effectiveTrimAfter}diff --git a/packages/studio/src/test/media-video-fallback-timeline.test.tsx b/packages/studio/src/test/media-video-fallback-timeline.test.tsxnew file mode 100644index 0000000000..f4e51e87f9--- /dev/null+++ b/packages/studio/src/test/media-video-fallback-timeline.test.tsx@@ -0,0 +1,74 @@+import {afterEach, expect, spyOn, test} from 'bun:test';+import {Video} from '@remotion/media';+import {Player, PlayerInternals} from '@remotion/player';+import {cleanup, render, waitFor} from '@testing-library/react';+import React from 'react';+import type {TSequence} from 'remotion';+import {shouldShowTrackInTimeline} from '../components/Timeline/should-show-track-in-timeline';+import {calculateTimeline} from '../helpers/calculate-timeline';++afterEach(cleanup);++test('a trimmed Video keeps one timeline layer when native playback takes over', async () => {+ // Simulate an unavailable browser canvas without starting a browser or fetching media.+ const getContext = Object.getOwnPropertyDescriptor(+ HTMLCanvasElement.prototype,+ 'getContext',+ );+ Object.defineProperty(HTMLCanvasElement.prototype, 'getContext', {+ configurable: true,+ value: () => null,+ });+ const consoleError = spyOn(console, 'error').mockImplementation(+ () => undefined,+ );+ const src = 'http://localhost:3000/whats2.mp4';+ let sequences: TSequence[] = [];+ const Composition: React.FC = () => (+ <Video src={src} trimBefore={191} durationInFrames={224} />+ );++ try {+ const {container} = render(+ <PlayerInternals.TimelineSequenceObserverContext.Provider+ value={(registered) => {+ sequences = registered;+ }}+ >+ <Player+ acknowledgeRemotionLicense+ component={Composition}+ compositionWidth={320}+ compositionHeight={180}+ durationInFrames={720}+ fps={30}+ initiallyMuted+ numberOfSharedAudioTags={0}+ />+ </PlayerInternals.TimelineSequenceObserverContext.Provider>,+ );++ await waitFor(() => {+ expect(container.querySelector('video')?.src.split('#')[0]).toBe(src);+ });+ const tracks = calculateTimeline({sequences, overrideIdsToNodePaths: {}})+ .filter((track) => shouldShowTrackInTimeline(track, 720))+ .map((track) => track.sequence);+ expect(tracks).toMatchObject([+ {type: 'video', src, duration: 224, startMediaFrom: 191},+ ]);+ } finally {+ cleanup();+ if (getContext) {+ Object.defineProperty(+ HTMLCanvasElement.prototype,+ 'getContext',+ getContext,+ );+ } else {+ Reflect.deleteProperty(HTMLCanvasElement.prototype, 'getContext');+ }++ consoleError.mockRestore();+ }+});