@remotion/renderer: New attempt for better BT.709 color space conve…

…rsion
remotion-dev · May 11, 2024 · acc84f6 · acc84f6
1 parent 0d231ec
commit acc84f6
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 33 deletions.
diff --git a/packages/example/frameroriginal.png b/packages/example/frameroriginal.png
diff --git a/packages/example/public/blue.mp4 b/packages/example/public/blue.mp4
diff --git a/packages/example/src/Framer/index.tsx b/packages/example/src/Framer/index.tsx
@@ -1,4 +1,4 @@
-import {Audio, random, Sequence, staticFile, useCurrentFrame} from 'remotion';
+import {AbsoluteFill, OffthreadVideo, random, staticFile} from 'remotion';
 
 export function selectColor(color: string, frame: number): number {
 	return Math.floor((random(`${color}-${frame}`) * 255) % 255);
@@ -7,33 +7,9 @@ export function selectColor(color: string, frame: number): number {
 export const Framer: React.FC<{
 	playbackRate?: number;
 }> = ({playbackRate}) => {
-	const frame = useCurrentFrame();
-
-	const red = selectColor('red', frame);
-	const green = selectColor('green', frame);
-	const blue = selectColor('blue', frame);
-
 	return (
-		<div
-			style={{
-				display: 'flex',
-				justifyContent: 'center',
-				alignItems: 'center',
-				background: 'white',
-				flex: 1,
-				borderTop: `100px solid rgb(${red}, ${green}, ${blue})`,
-				paddingBottom: 100,
-			}}
-		>
-			<h1 style={{fontSize: 120}}>{frame} 😁</h1>
-			<Sequence from={30}>
-				<Audio
-					startFrom={60}
-					volume={(f) => (Math.sin(f / 4) + 1) / 2}
-					playbackRate={playbackRate ?? 1}
-					src={staticFile('chirp.wav')}
-				/>
-			</Sequence>
-		</div>
+		<AbsoluteFill style={{backgroundColor: '#00BDF2'}}>
+			<OffthreadVideo style={{height: 400}} src={staticFile('blue.mp4')} />
+		</AbsoluteFill>
 	);
 };
diff --git a/packages/renderer/rust/scalable_frame.rs b/packages/renderer/rust/scalable_frame.rs
@@ -2,9 +2,10 @@ use std::usize;
 
 use ffmpeg_next::{
     color,
-    format::Pixel,
+    ffi::sws_getCoefficients,
+    format::{self, Pixel},
     frame::{self, Video},
-    software::scaling::{Context, Flags},
+    software::scaling::{ColorSpace, Context, Flags},
 };
 
 use crate::{
@@ -204,15 +205,26 @@ pub fn scale_and_make_bitmap(
         native_frame.scaled_width,
         native_frame.scaled_height,
         // FFmpeg also uses BICUBIC by default when extracting a frame
-        Flags::BICUBIC,
+        Flags::BILINEAR,
     )?;
+
+    _print_verbose(&format!(
+        "Scaling from {}x{} to {}x{} colorspace: {:?} range: {:?}",
+        native_frame.original_width,
+        native_frame.original_height,
+        native_frame.scaled_width,
+        native_frame.scaled_height,
+        native_frame.colorspace,
+        native_frame.src_range,
+    ))?;
+
     scaler.set_colorspace_details(
         native_frame.colorspace,
         native_frame.src_range,
         color::Range::JPEG,
         0,
-        0,
-        0,
+        1 << 16,
+        1 << 16,
     )?;
 
     let mut data: Vec<*const u8> = Vec::with_capacity(planes.len());