From ce47a0182f5f50dd64accec3ed2aba4324903993 Mon Sep 17 00:00:00 2001 From: WyattBlue Date: Sun, 1 Nov 2026 19:21:42 -0500 Subject: [PATCH 1/2] Enable x265 high-bit-depth assembly on Win-x86_64 and AArch64 platform.machine() returns 'AMD64' on Windows, so the 10/12-bit x265 builds were compiled with ENABLE_ASSEMBLY=0. Lowercase before comparing. x265 4.x also has 10/12-bit Neon assembly and intrinsics for AArch64, so enable assembly there too. Fixes #274 --- .github/workflows/build-ffmpeg.yml | 4 ++-- scripts/cibuildpkg.py | 11 ++++++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build-ffmpeg.yml b/.github/workflows/build-ffmpeg.yml index 1b243185..14161a77 100644 --- a/.github/workflows/build-ffmpeg.yml +++ b/.github/workflows/build-ffmpeg.yml @@ -109,7 +109,7 @@ jobs: CIBW_ARCHS: ${{ matrix.msys_system == 'CLANGARM64' && 'ARM64' || (matrix.msys_prefix && 'AMD64' || matrix.arch) }} CIBW_BEFORE_BUILD: python scripts/build-ffmpeg.py /tmp/vendor CIBW_BEFORE_BUILD_WINDOWS: python scripts\build-ffmpeg.py C:\cibw\vendor - CIBW_BUILD: cp311-* + CIBW_BUILD: cp312-* CIBW_REPAIR_WHEEL_COMMAND_LINUX: LD_LIBRARY_PATH=/tmp/vendor/lib:$LD_LIBRARY_PATH auditwheel repair --exclude libmvec.so.1 --exclude libmvec-2.so --exclude libmvec.so --exclude libmvec -w {dest_dir} {wheel} CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: delvewheel repair --add-path C:\cibw\vendor\bin -w {dest_dir} {wheel} CIBW_TEST_COMMAND: python -c "import dummy" @@ -150,7 +150,7 @@ jobs: CIBW_ARCHS: ${{ matrix.arch }} CIBW_BEFORE_ALL_LINUX: ./scripts/install-static-clang.sh CIBW_BEFORE_BUILD_LINUX: python scripts/build-ffmpeg.py /tmp/vendor - CIBW_BUILD: cp311-${{ matrix.build }}${{ matrix.arch }} + CIBW_BUILD: cp312-${{ matrix.build }}${{ matrix.arch }} CIBW_ENVIRONMENT_LINUX: > CC="/opt/clang/bin/clang" CXX="/opt/clang/bin/clang++" diff --git a/scripts/cibuildpkg.py b/scripts/cibuildpkg.py index 60ffb3e7..31223cbe 100644 --- a/scripts/cibuildpkg.py +++ b/scripts/cibuildpkg.py @@ -358,18 +358,19 @@ def _build_x265(self, package: Package) -> None: # builds in dummy directory dummy_install_path = os.path.join(package_path, "dummy_install_path") - # For 10/12 bits version, only x86_64 has assembly instructions available + # For 10/12 bits version, only x86_64 and AArch64 have assembly + # instructions available. flags_high_bits = [] disable_sve = platform.system() == "Linux" and platform.machine() == "aarch64" - if platform.machine() not in {"x86_64", "amd64"}: + if platform.machine().lower() not in {"x86_64", "amd64", "arm64", "aarch64"}: flags_high_bits.append("-DENABLE_ASSEMBLY=0") flags_high_bits.append("-DENABLE_ALTIVEC=0") - if disable_sve: - flags_high_bits.append("-DENABLE_SVE2=OFF") + if disable_sve: + flags_high_bits.append("-DENABLE_SVE2=OFF") - # x265 greps /proc/cpuinfo for NEON, which reports the aarch64 host's + # x265 greps /proc/cpuinfo for NEON, which reports the AArch64 host's # flags ("asimd") inside the 32-bit ARM container. Its NEON .S files are # assembled regardless, so tell it NEON is there or they get -mfpu=vfp. arm32_flags = ( From f87df99dacd5e041e933db796fc44125d06a34aa Mon Sep 17 00:00:00 2001 From: WyattBlue Date: Mon, 2 Nov 2026 10:42:31 -0500 Subject: [PATCH 2/2] Upgrade svt-av1 to 4.3.0 --- README.md | 2 +- scripts/pkg.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 38a49756..dae5f707 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ Currently FFmpeg 9.0.2 is built with the following packages enabled for all plat - [bwlame](https://github.com/basswood-io/bwlame) 4.1.0 - opus 1.6.1 - dav1d 1.5.4 -- libsvtav1 4.2.0 +- libsvtav1 4.3.0 - vpx 1.17.0 - webp 1.6.0 - libvmaf 3.2.1 diff --git a/scripts/pkg.py b/scripts/pkg.py index daceb04b..198c68f3 100644 --- a/scripts/pkg.py +++ b/scripts/pkg.py @@ -83,8 +83,8 @@ def __lt__(self, other): ), Package( name="libsvtav1", - source_url="https://gitlab.com/AOMediaCodec/SVT-AV1/-/archive/v4.2.0/SVT-AV1-v4.2.0.tar.bz2", - sha256="512f2ea5649e3e76c2dddcc25c2556fb67a9582baaab207c9c96161c94659dad", + source_url="https://gitlab.com/AOMediaCodec/SVT-AV1/-/archive/v4.3.0/SVT-AV1-v4.3.0.tar.bz2", + sha256="9223ce06e6172ad41357ed23b3b00f036e03794b86b0e20ea9ccb3f648b8955d", build_system="cmake", build_arguments=["-DBUILD_APPS=OFF", "-DBUILD_DEC=OFF", "-DBUILD_ENC=ON", "-DENABLE_NASM=ON"], ),