diff --git a/packages/compositor-darwin-arm64/ffmpeg b/packages/compositor-darwin-arm64/ffmpeg index 3c9111a7700..f1508231654 100755 Binary files a/packages/compositor-darwin-arm64/ffmpeg and b/packages/compositor-darwin-arm64/ffmpeg differ diff --git a/packages/compositor-darwin-arm64/ffprobe b/packages/compositor-darwin-arm64/ffprobe index 6800d8d5f3b..02124b71e2e 100755 Binary files a/packages/compositor-darwin-arm64/ffprobe and b/packages/compositor-darwin-arm64/ffprobe differ diff --git a/packages/compositor-darwin-arm64/libavcodec.dylib b/packages/compositor-darwin-arm64/libavcodec.dylib index fe8f187264f..ff20c4851b0 100755 Binary files a/packages/compositor-darwin-arm64/libavcodec.dylib and b/packages/compositor-darwin-arm64/libavcodec.dylib differ diff --git a/packages/compositor-darwin-arm64/libavdevice.dylib b/packages/compositor-darwin-arm64/libavdevice.dylib index 25b569789c1..8f364f8d741 100755 Binary files a/packages/compositor-darwin-arm64/libavdevice.dylib and b/packages/compositor-darwin-arm64/libavdevice.dylib differ diff --git a/packages/compositor-darwin-arm64/libavfilter.dylib b/packages/compositor-darwin-arm64/libavfilter.dylib index 9ceb2e521fd..9da38062536 100755 Binary files a/packages/compositor-darwin-arm64/libavfilter.dylib and b/packages/compositor-darwin-arm64/libavfilter.dylib differ diff --git a/packages/compositor-darwin-arm64/libavformat.dylib b/packages/compositor-darwin-arm64/libavformat.dylib index 35f9574a2b3..f64a22c3d34 100755 Binary files a/packages/compositor-darwin-arm64/libavformat.dylib and b/packages/compositor-darwin-arm64/libavformat.dylib differ diff --git a/packages/compositor-darwin-arm64/libavutil.dylib b/packages/compositor-darwin-arm64/libavutil.dylib index 14548ad4581..4c856ad4474 100755 Binary files a/packages/compositor-darwin-arm64/libavutil.dylib and b/packages/compositor-darwin-arm64/libavutil.dylib differ diff --git a/packages/compositor-darwin-arm64/libswresample.dylib b/packages/compositor-darwin-arm64/libswresample.dylib index 5a5c5a0c0f9..c0f6c472e53 100755 Binary files a/packages/compositor-darwin-arm64/libswresample.dylib and b/packages/compositor-darwin-arm64/libswresample.dylib differ diff --git a/packages/compositor-darwin-arm64/libswscale.dylib b/packages/compositor-darwin-arm64/libswscale.dylib index 3e1aebb4a41..eef9b63c88c 100755 Binary files a/packages/compositor-darwin-arm64/libswscale.dylib and b/packages/compositor-darwin-arm64/libswscale.dylib differ diff --git a/packages/compositor-darwin-arm64/remotion b/packages/compositor-darwin-arm64/remotion index c397efb92bc..268fcff9588 100755 Binary files a/packages/compositor-darwin-arm64/remotion and b/packages/compositor-darwin-arm64/remotion differ diff --git a/packages/compositor-darwin-x64/ffmpeg b/packages/compositor-darwin-x64/ffmpeg index 050326b69fd..10f6d869009 100755 Binary files a/packages/compositor-darwin-x64/ffmpeg and b/packages/compositor-darwin-x64/ffmpeg differ diff --git a/packages/compositor-darwin-x64/ffprobe b/packages/compositor-darwin-x64/ffprobe index 52a960d50a5..d0d4f80e590 100755 Binary files a/packages/compositor-darwin-x64/ffprobe and b/packages/compositor-darwin-x64/ffprobe differ diff --git a/packages/compositor-darwin-x64/libavcodec.dylib b/packages/compositor-darwin-x64/libavcodec.dylib index 79740ebaa8b..58d8a665aaf 100755 Binary files a/packages/compositor-darwin-x64/libavcodec.dylib and b/packages/compositor-darwin-x64/libavcodec.dylib differ diff --git a/packages/compositor-darwin-x64/libavdevice.dylib b/packages/compositor-darwin-x64/libavdevice.dylib index a54b1356ffc..6bc96cd5098 100755 Binary files a/packages/compositor-darwin-x64/libavdevice.dylib and b/packages/compositor-darwin-x64/libavdevice.dylib differ diff --git a/packages/compositor-darwin-x64/libavfilter.dylib b/packages/compositor-darwin-x64/libavfilter.dylib index 3e79a190e0e..3b118409775 100755 Binary files a/packages/compositor-darwin-x64/libavfilter.dylib and b/packages/compositor-darwin-x64/libavfilter.dylib differ diff --git a/packages/compositor-darwin-x64/libavformat.dylib b/packages/compositor-darwin-x64/libavformat.dylib index efbcb728344..e716b3f957e 100755 Binary files a/packages/compositor-darwin-x64/libavformat.dylib and b/packages/compositor-darwin-x64/libavformat.dylib differ diff --git a/packages/compositor-darwin-x64/libavutil.dylib b/packages/compositor-darwin-x64/libavutil.dylib index 235df77faa5..ed73a4961b1 100755 Binary files a/packages/compositor-darwin-x64/libavutil.dylib and b/packages/compositor-darwin-x64/libavutil.dylib differ diff --git a/packages/compositor-darwin-x64/libswresample.dylib b/packages/compositor-darwin-x64/libswresample.dylib index ea20b66a0e1..1e944b87b36 100755 Binary files a/packages/compositor-darwin-x64/libswresample.dylib and b/packages/compositor-darwin-x64/libswresample.dylib differ diff --git a/packages/compositor-darwin-x64/libswscale.dylib b/packages/compositor-darwin-x64/libswscale.dylib index d24b0be78ec..d476f07c026 100755 Binary files a/packages/compositor-darwin-x64/libswscale.dylib and b/packages/compositor-darwin-x64/libswscale.dylib differ diff --git a/packages/compositor-darwin-x64/remotion b/packages/compositor-darwin-x64/remotion index 09f19e95dcf..df5d26ae5a3 100755 Binary files a/packages/compositor-darwin-x64/remotion and b/packages/compositor-darwin-x64/remotion differ diff --git a/packages/compositor-linux-arm64-gnu/ffmpeg b/packages/compositor-linux-arm64-gnu/ffmpeg index 2411f9c0856..adde703319d 100755 Binary files a/packages/compositor-linux-arm64-gnu/ffmpeg and b/packages/compositor-linux-arm64-gnu/ffmpeg differ diff --git a/packages/compositor-linux-arm64-gnu/ffprobe b/packages/compositor-linux-arm64-gnu/ffprobe index bd6b773bdf8..d01a3730bdf 100755 Binary files a/packages/compositor-linux-arm64-gnu/ffprobe and b/packages/compositor-linux-arm64-gnu/ffprobe differ diff --git a/packages/compositor-linux-arm64-gnu/libavcodec.so b/packages/compositor-linux-arm64-gnu/libavcodec.so index 06b1169dcc2..63c174ce8fd 100755 Binary files a/packages/compositor-linux-arm64-gnu/libavcodec.so and b/packages/compositor-linux-arm64-gnu/libavcodec.so differ diff --git a/packages/compositor-linux-arm64-gnu/libavdevice.so b/packages/compositor-linux-arm64-gnu/libavdevice.so index 36cf92ad8ce..3e74373e2d8 100755 Binary files a/packages/compositor-linux-arm64-gnu/libavdevice.so and b/packages/compositor-linux-arm64-gnu/libavdevice.so differ diff --git a/packages/compositor-linux-arm64-gnu/libavfilter.so b/packages/compositor-linux-arm64-gnu/libavfilter.so index 8d48b90bfc8..692e72bd1f8 100755 Binary files a/packages/compositor-linux-arm64-gnu/libavfilter.so and b/packages/compositor-linux-arm64-gnu/libavfilter.so differ diff --git a/packages/compositor-linux-arm64-gnu/libavformat.so b/packages/compositor-linux-arm64-gnu/libavformat.so index 96976565031..bfbe830001a 100755 Binary files a/packages/compositor-linux-arm64-gnu/libavformat.so and b/packages/compositor-linux-arm64-gnu/libavformat.so differ diff --git a/packages/compositor-linux-arm64-gnu/libavutil.so b/packages/compositor-linux-arm64-gnu/libavutil.so index e60857d2be0..ad0733d4478 100755 Binary files a/packages/compositor-linux-arm64-gnu/libavutil.so and b/packages/compositor-linux-arm64-gnu/libavutil.so differ diff --git a/packages/compositor-linux-arm64-gnu/libswresample.so b/packages/compositor-linux-arm64-gnu/libswresample.so index 2af4bd6b13e..ebbfc598ff4 100755 Binary files a/packages/compositor-linux-arm64-gnu/libswresample.so and b/packages/compositor-linux-arm64-gnu/libswresample.so differ diff --git a/packages/compositor-linux-arm64-gnu/libswscale.so b/packages/compositor-linux-arm64-gnu/libswscale.so index 6e0d8a0e230..4fc3a71122d 100755 Binary files a/packages/compositor-linux-arm64-gnu/libswscale.so and b/packages/compositor-linux-arm64-gnu/libswscale.so differ diff --git a/packages/compositor-linux-arm64-gnu/remotion b/packages/compositor-linux-arm64-gnu/remotion index bb0b9e5e0f5..270c705bddd 100755 Binary files a/packages/compositor-linux-arm64-gnu/remotion and b/packages/compositor-linux-arm64-gnu/remotion differ diff --git a/packages/compositor-linux-arm64-musl/ffmpeg b/packages/compositor-linux-arm64-musl/ffmpeg index 8077cb29293..b59201248b1 100755 Binary files a/packages/compositor-linux-arm64-musl/ffmpeg and b/packages/compositor-linux-arm64-musl/ffmpeg differ diff --git a/packages/compositor-linux-arm64-musl/ffprobe b/packages/compositor-linux-arm64-musl/ffprobe index 331e3f7bb0f..2683b4e82fd 100755 Binary files a/packages/compositor-linux-arm64-musl/ffprobe and b/packages/compositor-linux-arm64-musl/ffprobe differ diff --git a/packages/compositor-linux-arm64-musl/libavcodec.so b/packages/compositor-linux-arm64-musl/libavcodec.so index 91d17bca0e4..c4615ad6cba 100755 Binary files a/packages/compositor-linux-arm64-musl/libavcodec.so and b/packages/compositor-linux-arm64-musl/libavcodec.so differ diff --git a/packages/compositor-linux-arm64-musl/libavdevice.so b/packages/compositor-linux-arm64-musl/libavdevice.so index 1738bb6f668..12b9af46923 100755 Binary files a/packages/compositor-linux-arm64-musl/libavdevice.so and b/packages/compositor-linux-arm64-musl/libavdevice.so differ diff --git a/packages/compositor-linux-arm64-musl/libavfilter.so b/packages/compositor-linux-arm64-musl/libavfilter.so index d73cd9ad4de..2b475fa0a7e 100755 Binary files a/packages/compositor-linux-arm64-musl/libavfilter.so and b/packages/compositor-linux-arm64-musl/libavfilter.so differ diff --git a/packages/compositor-linux-arm64-musl/libavformat.so b/packages/compositor-linux-arm64-musl/libavformat.so index 9a83042497e..066f6d1d483 100755 Binary files a/packages/compositor-linux-arm64-musl/libavformat.so and b/packages/compositor-linux-arm64-musl/libavformat.so differ diff --git a/packages/compositor-linux-arm64-musl/libavutil.so b/packages/compositor-linux-arm64-musl/libavutil.so index 16d9724418e..8c143f6656d 100755 Binary files a/packages/compositor-linux-arm64-musl/libavutil.so and b/packages/compositor-linux-arm64-musl/libavutil.so differ diff --git a/packages/compositor-linux-arm64-musl/libswresample.so b/packages/compositor-linux-arm64-musl/libswresample.so index 608aec26c5e..5211c3c193f 100755 Binary files a/packages/compositor-linux-arm64-musl/libswresample.so and b/packages/compositor-linux-arm64-musl/libswresample.so differ diff --git a/packages/compositor-linux-arm64-musl/libswscale.so b/packages/compositor-linux-arm64-musl/libswscale.so index afc52a8a331..da53b7074c8 100755 Binary files a/packages/compositor-linux-arm64-musl/libswscale.so and b/packages/compositor-linux-arm64-musl/libswscale.so differ diff --git a/packages/compositor-linux-arm64-musl/remotion b/packages/compositor-linux-arm64-musl/remotion index 12ae9c079d2..439ce6c1b1d 100755 Binary files a/packages/compositor-linux-arm64-musl/remotion and b/packages/compositor-linux-arm64-musl/remotion differ diff --git a/packages/compositor-linux-x64-gnu/ffmpeg b/packages/compositor-linux-x64-gnu/ffmpeg index a6963da6595..50c8b2cdee9 100755 Binary files a/packages/compositor-linux-x64-gnu/ffmpeg and b/packages/compositor-linux-x64-gnu/ffmpeg differ diff --git a/packages/compositor-linux-x64-gnu/ffprobe b/packages/compositor-linux-x64-gnu/ffprobe index e21b270910f..f1dfdad530b 100755 Binary files a/packages/compositor-linux-x64-gnu/ffprobe and b/packages/compositor-linux-x64-gnu/ffprobe differ diff --git a/packages/compositor-linux-x64-gnu/libavcodec.so b/packages/compositor-linux-x64-gnu/libavcodec.so index c034241a935..c6ac85a6e29 100755 Binary files a/packages/compositor-linux-x64-gnu/libavcodec.so and b/packages/compositor-linux-x64-gnu/libavcodec.so differ diff --git a/packages/compositor-linux-x64-gnu/libavdevice.so b/packages/compositor-linux-x64-gnu/libavdevice.so index 03f917b3068..5b56ba7cd0a 100755 Binary files a/packages/compositor-linux-x64-gnu/libavdevice.so and b/packages/compositor-linux-x64-gnu/libavdevice.so differ diff --git a/packages/compositor-linux-x64-gnu/libavfilter.so b/packages/compositor-linux-x64-gnu/libavfilter.so index 16140eb5752..a8adfe4d56b 100755 Binary files a/packages/compositor-linux-x64-gnu/libavfilter.so and b/packages/compositor-linux-x64-gnu/libavfilter.so differ diff --git a/packages/compositor-linux-x64-gnu/libavformat.so b/packages/compositor-linux-x64-gnu/libavformat.so index 34d15a5fde5..fd0c03e05bd 100755 Binary files a/packages/compositor-linux-x64-gnu/libavformat.so and b/packages/compositor-linux-x64-gnu/libavformat.so differ diff --git a/packages/compositor-linux-x64-gnu/libavutil.so b/packages/compositor-linux-x64-gnu/libavutil.so index d98f8e67d41..b3d9202a4f2 100755 Binary files a/packages/compositor-linux-x64-gnu/libavutil.so and b/packages/compositor-linux-x64-gnu/libavutil.so differ diff --git a/packages/compositor-linux-x64-gnu/libswresample.so b/packages/compositor-linux-x64-gnu/libswresample.so index fc8c2de53b8..bb74091454b 100755 Binary files a/packages/compositor-linux-x64-gnu/libswresample.so and b/packages/compositor-linux-x64-gnu/libswresample.so differ diff --git a/packages/compositor-linux-x64-gnu/libswscale.so b/packages/compositor-linux-x64-gnu/libswscale.so index 9410ae06354..c0a9c295d38 100755 Binary files a/packages/compositor-linux-x64-gnu/libswscale.so and b/packages/compositor-linux-x64-gnu/libswscale.so differ diff --git a/packages/compositor-linux-x64-gnu/remotion b/packages/compositor-linux-x64-gnu/remotion index ec2235575e7..20d26bfe7d0 100755 Binary files a/packages/compositor-linux-x64-gnu/remotion and b/packages/compositor-linux-x64-gnu/remotion differ diff --git a/packages/compositor-linux-x64-musl/ffmpeg b/packages/compositor-linux-x64-musl/ffmpeg index 7dbf9598d22..7a043daa8d1 100755 Binary files a/packages/compositor-linux-x64-musl/ffmpeg and b/packages/compositor-linux-x64-musl/ffmpeg differ diff --git a/packages/compositor-linux-x64-musl/ffprobe b/packages/compositor-linux-x64-musl/ffprobe index 29595d50d6a..86412f0fab5 100755 Binary files a/packages/compositor-linux-x64-musl/ffprobe and b/packages/compositor-linux-x64-musl/ffprobe differ diff --git a/packages/compositor-linux-x64-musl/libavcodec.so b/packages/compositor-linux-x64-musl/libavcodec.so index 9d9ff3ead74..12d463e7471 100755 Binary files a/packages/compositor-linux-x64-musl/libavcodec.so and b/packages/compositor-linux-x64-musl/libavcodec.so differ diff --git a/packages/compositor-linux-x64-musl/libavdevice.so b/packages/compositor-linux-x64-musl/libavdevice.so index 3201ebab32c..8804724bda6 100755 Binary files a/packages/compositor-linux-x64-musl/libavdevice.so and b/packages/compositor-linux-x64-musl/libavdevice.so differ diff --git a/packages/compositor-linux-x64-musl/libavfilter.so b/packages/compositor-linux-x64-musl/libavfilter.so index e7c45418090..ddace8f33f2 100755 Binary files a/packages/compositor-linux-x64-musl/libavfilter.so and b/packages/compositor-linux-x64-musl/libavfilter.so differ diff --git a/packages/compositor-linux-x64-musl/libavformat.so b/packages/compositor-linux-x64-musl/libavformat.so index 2024cedeab1..5bef3abd23c 100755 Binary files a/packages/compositor-linux-x64-musl/libavformat.so and b/packages/compositor-linux-x64-musl/libavformat.so differ diff --git a/packages/compositor-linux-x64-musl/libavutil.so b/packages/compositor-linux-x64-musl/libavutil.so index 2efa38c7cd7..2ab2755f086 100755 Binary files a/packages/compositor-linux-x64-musl/libavutil.so and b/packages/compositor-linux-x64-musl/libavutil.so differ diff --git a/packages/compositor-linux-x64-musl/libswresample.so b/packages/compositor-linux-x64-musl/libswresample.so index fc562456324..950ceaa3c18 100755 Binary files a/packages/compositor-linux-x64-musl/libswresample.so and b/packages/compositor-linux-x64-musl/libswresample.so differ diff --git a/packages/compositor-linux-x64-musl/libswscale.so b/packages/compositor-linux-x64-musl/libswscale.so index b9b4864c395..6b77b952d6e 100755 Binary files a/packages/compositor-linux-x64-musl/libswscale.so and b/packages/compositor-linux-x64-musl/libswscale.so differ diff --git a/packages/compositor-linux-x64-musl/remotion b/packages/compositor-linux-x64-musl/remotion index a2de3e3cb31..55a5e2239a2 100755 Binary files a/packages/compositor-linux-x64-musl/remotion and b/packages/compositor-linux-x64-musl/remotion differ diff --git a/packages/compositor-win32-x64-msvc/avcodec-61.dll b/packages/compositor-win32-x64-msvc/avcodec-61.dll new file mode 100755 index 00000000000..f50f4b173b0 Binary files /dev/null and b/packages/compositor-win32-x64-msvc/avcodec-61.dll differ diff --git a/packages/compositor-win32-x64-msvc/avdevice-61.dll b/packages/compositor-win32-x64-msvc/avdevice-61.dll new file mode 100755 index 00000000000..ef9da5c4113 Binary files /dev/null and b/packages/compositor-win32-x64-msvc/avdevice-61.dll differ diff --git a/packages/compositor-win32-x64-msvc/avfilter-10.dll b/packages/compositor-win32-x64-msvc/avfilter-10.dll new file mode 100755 index 00000000000..1460727295d Binary files /dev/null and b/packages/compositor-win32-x64-msvc/avfilter-10.dll differ diff --git a/packages/compositor-win32-x64-msvc/avformat-61.dll b/packages/compositor-win32-x64-msvc/avformat-61.dll new file mode 100755 index 00000000000..a09feda2e13 Binary files /dev/null and b/packages/compositor-win32-x64-msvc/avformat-61.dll differ diff --git a/packages/compositor-win32-x64-msvc/avutil-59.dll b/packages/compositor-win32-x64-msvc/avutil-59.dll new file mode 100755 index 00000000000..03db84414f0 Binary files /dev/null and b/packages/compositor-win32-x64-msvc/avutil-59.dll differ diff --git a/packages/compositor-win32-x64-msvc/ffmpeg.exe b/packages/compositor-win32-x64-msvc/ffmpeg.exe index b309f94195f..9654bd7b8c6 100755 Binary files a/packages/compositor-win32-x64-msvc/ffmpeg.exe and b/packages/compositor-win32-x64-msvc/ffmpeg.exe differ diff --git a/packages/compositor-win32-x64-msvc/ffprobe.exe b/packages/compositor-win32-x64-msvc/ffprobe.exe index 9fdf4fc162e..a9975ad04d1 100755 Binary files a/packages/compositor-win32-x64-msvc/ffprobe.exe and b/packages/compositor-win32-x64-msvc/ffprobe.exe differ diff --git a/packages/compositor-win32-x64-msvc/remotion.exe b/packages/compositor-win32-x64-msvc/remotion.exe index efebc41b38a..a7332c135b6 100755 Binary files a/packages/compositor-win32-x64-msvc/remotion.exe and b/packages/compositor-win32-x64-msvc/remotion.exe differ diff --git a/packages/compositor-win32-x64-msvc/swresample-5.dll b/packages/compositor-win32-x64-msvc/swresample-5.dll new file mode 100755 index 00000000000..db4c20691a6 Binary files /dev/null and b/packages/compositor-win32-x64-msvc/swresample-5.dll differ diff --git a/packages/compositor-win32-x64-msvc/swscale-8.dll b/packages/compositor-win32-x64-msvc/swscale-8.dll new file mode 100755 index 00000000000..6a9da864525 Binary files /dev/null and b/packages/compositor-win32-x64-msvc/swscale-8.dll differ diff --git a/packages/docs/docs/contributing/rust.mdx b/packages/docs/docs/contributing/rust.mdx index c48f9c0dcfa..a776f4df4e8 100644 --- a/packages/docs/docs/contributing/rust.mdx +++ b/packages/docs/docs/contributing/rust.mdx @@ -23,7 +23,7 @@ curl https://sh.rustup.rs -sSf | sh To build the Rust parts for your operating system, run: ```sh -node build.mjs +bun build.ts ``` while you are in the `packages/renderer` directory. diff --git a/packages/example/testcloudrun.sh b/packages/example/testcloudrun.sh index f9016d6084d..f12a4ceeb32 100644 --- a/packages/example/testcloudrun.sh +++ b/packages/example/testcloudrun.sh @@ -1,7 +1,7 @@ set -e cd .. cd renderer -node build.mjs --cloudrun +bun build.ts --cloudrun cd .. cd cloudrun bun run make diff --git a/packages/it-tests/src/rendering/render-scale.test.ts b/packages/it-tests/src/rendering/render-scale.test.ts index c4f60c38b05..4042a00bc36 100644 --- a/packages/it-tests/src/rendering/render-scale.test.ts +++ b/packages/it-tests/src/rendering/render-scale.test.ts @@ -50,7 +50,7 @@ test( }); const data = info.stderr; expect(data).toContain('Video: h264'); - expect(data).toContain('yuv420p'); + expect(data).toContain('yuvj420p'); expect(data).toContain('2160x2160'); expect(data).toContain('30 fps'); }, @@ -97,7 +97,7 @@ test( }); const data = info.stderr; expect(data).toContain('Video: h264'); - expect(data).toContain('yuv420p'); + expect(data).toContain('yuvj420p'); expect(data).toContain('108x108'); expect(data).toContain('30 fps'); }, diff --git a/packages/it-tests/src/rendering/rendering.test.ts b/packages/it-tests/src/rendering/rendering.test.ts index a2fd5828a3a..fda909f0d8e 100644 --- a/packages/it-tests/src/rendering/rendering.test.ts +++ b/packages/it-tests/src/rendering/rendering.test.ts @@ -517,7 +517,7 @@ test('Dynamic duration should work and audio separation', async () => { ); } else { expect(data).toContain( - `Stream #0:0[0x1](und): Video: h264 (avc1 / 0x31637661), yuv420p(tv, bt470bg/unknown/unknown, progressive)`, + `Stream #0:0[0x1](und): Video: h264 (avc1 / 0x31637661), yuvj420p(pc, bt470bg/unknown/unknown, progressive)`, ); } diff --git a/packages/lambda/src/test/integration/renders/regular-audio.bmp b/packages/lambda/src/test/integration/renders/regular-audio.bmp index 9960764c3a0..64a5e7c9909 100644 Binary files a/packages/lambda/src/test/integration/renders/regular-audio.bmp and b/packages/lambda/src/test/integration/renders/regular-audio.bmp differ diff --git a/packages/lambda/src/test/integration/renders/seamless-audio.bmp b/packages/lambda/src/test/integration/renders/seamless-audio.bmp index 52f07573862..3898ba2e803 100644 Binary files a/packages/lambda/src/test/integration/renders/seamless-audio.bmp and b/packages/lambda/src/test/integration/renders/seamless-audio.bmp differ diff --git a/packages/lambda/src/test/integration/renders/slow-seamless-audio.bmp b/packages/lambda/src/test/integration/renders/slow-seamless-audio.bmp index 089e1dea3fd..1928bcc0cbf 100644 Binary files a/packages/lambda/src/test/integration/renders/slow-seamless-audio.bmp and b/packages/lambda/src/test/integration/renders/slow-seamless-audio.bmp differ diff --git a/packages/renderer/Cargo.lock b/packages/renderer/Cargo.lock index e48fc135f65..e2f86fe5361 100644 --- a/packages/renderer/Cargo.lock +++ b/packages/renderer/Cargo.lock @@ -36,22 +36,20 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "bindgen" -version = "0.64.0" +version = "0.70.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4243e6031260db77ede97ad86c27e501d646a27ab57b59a574f725d98ab1fb4" +checksum = "f49d8fed880d473ea71efb9bf597651e77201bdd4893efe54c9e5d65ae04ce6f" dependencies = [ - "bitflags", + "bitflags 2.6.0", "cexpr", "clang-sys", - "lazy_static", - "lazycell", - "peeking_take_while", + "itertools", "proc-macro2", "quote", "regex", "rustc-hash", "shlex", - "syn 1.0.109", + "syn", ] [[package]] @@ -66,6 +64,12 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +[[package]] +name = "bitflags" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" + [[package]] name = "block" version = "0.1.6" @@ -92,9 +96,12 @@ checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" [[package]] name = "cc" -version = "1.0.79" +version = "1.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +checksum = "812acba72f0a070b003d3697490d2b55b837230ae7c6c6497f05cc2ddbb8d938" +dependencies = [ + "shlex", +] [[package]] name = "cexpr" @@ -161,7 +168,7 @@ version = "0.22.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb" dependencies = [ - "bitflags", + "bitflags 1.3.2", "core-foundation", "core-graphics-types", "foreign-types", @@ -174,7 +181,7 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2bb142d41022986c1d8ff29103a1411c8a3dfad3552f87a4f8dc50d61d4f4e33" dependencies = [ - "bitflags", + "bitflags 1.3.2", "core-foundation", "libc", ] @@ -270,18 +277,18 @@ dependencies = [ [[package]] name = "ffmpeg-next" -version = "6.0.0" -source = "git+https://github.com/remotion-dev/rust-ffmpeg?rev=4027d3764d54c6c71ab72ff076764ae7abe91428#4027d3764d54c6c71ab72ff076764ae7abe91428" +version = "7.1.0" +source = "git+https://github.com/remotion-dev/rust-ffmpeg?rev=7390be48beef9dc1e9433532abcac4d431ccc362#7390be48beef9dc1e9433532abcac4d431ccc362" dependencies = [ - "bitflags", + "bitflags 2.6.0", "ffmpeg-sys-next", "libc", ] [[package]] name = "ffmpeg-sys-next" -version = "6.0.1" -source = "git+https://github.com/remotion-dev/rust-ffmpeg-sys?rev=7da943df1ea7be22868b3f8e236b6a9f5b8c1559#7da943df1ea7be22868b3f8e236b6a9f5b8c1559" +version = "7.1.0" +source = "git+https://github.com/remotion-dev/rust-ffmpeg-sys?rev=6721c2055a15717f74d03685e7179cfdc6d677a8#6721c2055a15717f74d03685e7179cfdc6d677a8" dependencies = [ "bindgen", "cc", @@ -377,12 +384,9 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.2.6" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" -dependencies = [ - "libc", -] +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" [[package]] name = "image" @@ -403,6 +407,15 @@ dependencies = [ "tiff", ] +[[package]] +name = "itertools" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "1.0.6" @@ -430,12 +443,6 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" -[[package]] -name = "lazycell" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" - [[package]] name = "lebe" version = "0.5.2" @@ -551,7 +558,7 @@ version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cfg-if", "libc", "memoffset 0.6.5", @@ -621,9 +628,9 @@ dependencies = [ [[package]] name = "num_cpus" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ "hermit-abi", "libc", @@ -687,12 +694,6 @@ dependencies = [ "windows-targets 0.48.0", ] -[[package]] -name = "peeking_take_while" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" - [[package]] name = "pkg-config" version = "0.3.26" @@ -705,7 +706,7 @@ version = "0.17.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1" dependencies = [ - "bitflags", + "bitflags 1.3.2", "crc32fast", "fdeflate", "flate2", @@ -765,7 +766,7 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -774,7 +775,7 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -845,7 +846,7 @@ checksum = "4c614d17805b093df4b147b51339e7e44bf05ef59fba1e45d83500bcfb4d8585" dependencies = [ "proc-macro2", "quote", - "syn 2.0.13", + "syn", ] [[package]] @@ -892,17 +893,6 @@ version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e08d8363704e6c71fc928674353e6b7c23dcea9d82d7012c8faf2a3a025f8d0" -[[package]] -name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - [[package]] name = "syn" version = "2.0.13" @@ -957,7 +947,7 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.13", + "syn", ] [[package]] diff --git a/packages/renderer/Cargo.toml b/packages/renderer/Cargo.toml index 9424377c218..b54aeefa7cc 100644 --- a/packages/renderer/Cargo.toml +++ b/packages/renderer/Cargo.toml @@ -19,7 +19,7 @@ image = "0.24.7" arboard = "3.2.0" sysinfo = "0.30.7" mp4 = {git = "https://github.com/jonnyburger/mp4-rust", rev = "92ba375738cc2f05a4d754e1f968cf2e97d06641"} -ffmpeg-next = {git = "https://github.com/remotion-dev/rust-ffmpeg", rev ="4027d3764d54c6c71ab72ff076764ae7abe91428"} +ffmpeg-next = {git = "https://github.com/remotion-dev/rust-ffmpeg", rev ="7390be48beef9dc1e9433532abcac4d431ccc362"} [[bin]] name = "remotion" diff --git a/packages/renderer/build.mjs b/packages/renderer/build.ts similarity index 99% rename from packages/renderer/build.mjs rename to packages/renderer/build.ts index 6a6c187c041..84fe639d38e 100644 --- a/packages/renderer/build.mjs +++ b/packages/renderer/build.ts @@ -24,6 +24,7 @@ if (os.platform() === 'win32') { } function isMusl() { + // @ts-expect-error const {glibcVersionRuntime} = process.report.getReport().header; return !glibcVersionRuntime; } @@ -161,7 +162,7 @@ for (const toolchain of toolchains) { } const stdout = execSync('cargo metadata --format-version=1'); -const {packages} = JSON.parse(stdout); +const {packages} = JSON.parse(stdout as unknown as string); const rustFfmpegSys = packages.find((p) => p.name === 'ffmpeg-sys-next'); diff --git a/packages/renderer/package.json b/packages/renderer/package.json index 154dcd4fa5b..a51929748df 100644 --- a/packages/renderer/package.json +++ b/packages/renderer/package.json @@ -12,9 +12,9 @@ "formatting": "prettier src --check", "lint": "eslint src --ext ts,tsx", "test": "bun test src", - "make": "node build.mjs --debug", - "build-all": "node build.mjs --all", - "prepublishOnly": "node build.mjs --all" + "make": "bun build.ts --debug", + "build-all": "bun build.ts --all", + "prepublishOnly": "bun build.ts --all" }, "author": "Jonny Burger ", "license": "SEE LICENSE IN LICENSE.md", diff --git a/packages/renderer/rust/ffmpeg.rs b/packages/renderer/rust/ffmpeg.rs index afff26c5575..9e070c6e3d7 100644 --- a/packages/renderer/rust/ffmpeg.rs +++ b/packages/renderer/rust/ffmpeg.rs @@ -281,6 +281,9 @@ pub fn get_video_metadata(file_path: &str) -> Result KnownColorSpaces::Unknown, remotionffmpeg::ffi::AVColorSpace::AVCOL_SPC_SMPTE2085 => KnownColorSpaces::SMPTE2085, remotionffmpeg::ffi::AVColorSpace::AVCOL_SPC_UNSPECIFIED => KnownColorSpaces::BT601, + remotionffmpeg::ffi::AVColorSpace::AVCOL_SPC_IPT_C2 => KnownColorSpaces::Unknown, + remotionffmpeg::ffi::AVColorSpace::AVCOL_SPC_YCGCO_RE => KnownColorSpaces::Unknown, + remotionffmpeg::ffi::AVColorSpace::AVCOL_SPC_YCGCO_RO => KnownColorSpaces::Unknown, }; #[allow(non_snake_case)] diff --git a/packages/renderer/src/test/get-silent-parts.test.ts b/packages/renderer/src/test/get-silent-parts.test.ts index cbe3a6b9384..56f20a117cd 100644 --- a/packages/renderer/src/test/get-silent-parts.test.ts +++ b/packages/renderer/src/test/get-silent-parts.test.ts @@ -10,10 +10,10 @@ test('Should be able to get the silences from a video', async () => { }); expect(silentParts.length).toEqual(1); expect(silentParts[0].startInSeconds).toBe(0); - expect(silentParts[0].endInSeconds).toBe(1.0149); + expect(silentParts[0].endInSeconds).toBe(1.014896); expect(audibleParts.length).toEqual(1); - expect(audibleParts[0].startInSeconds).toEqual(1.0149); + expect(audibleParts[0].startInSeconds).toEqual(1.014896); expect(audibleParts[0].endInSeconds).toEqual(2.789); }); diff --git a/set-version.ts b/set-version.ts index 888973c3fcd..c1f81cbdba6 100644 --- a/set-version.ts +++ b/set-version.ts @@ -65,7 +65,7 @@ execSync('bun test src/monorepo', { stdio: 'inherit', }); -execSync('node build.mjs --all', { +execSync('bun build.ts --all', { cwd: 'packages/renderer', stdio: 'inherit', });