feat(ffmpeg8): decouple ffmpeg8-bin program compilation and enforce macos exclusivity

debugly · debugly · commit cd409ab87cb0 · 2026-07-13T16:43:18.000+08:00
diff --git a/.github/workflows/build all libs.yml b/.github/workflows/build all libs.yml
@@ -63,6 +63,7 @@ on:
           - ffmpeg6
           - ffmpeg7
           - ffmpeg8
+          - ffmpeg8-bin
       dryrun:
         description: 'just run workflow,but not deploy'
         required: false
@@ -214,6 +215,7 @@ jobs:
           "ffmpeg6"
           "ffmpeg7"
           "ffmpeg8"
+          "ffmpeg8-bin"
         )
 
         first=${{ inputs.first_library }}
diff --git a/.github/workflows/build one lib.yml b/.github/workflows/build one lib.yml
@@ -50,6 +50,7 @@ on:
         default: 'ffmpeg7'
         options:
           - ffmpeg8
+          - ffmpeg8-bin
           - ffmpeg7
           - ffmpeg6
           - ffmpeg5
diff --git a/.github/workflows/install-dependencies.sh b/.github/workflows/install-dependencies.sh
@@ -54,6 +54,9 @@ case $LIB_NAME in
             fi
         fi
     ;;
+    ffmpeg8-bin)
+        ./main.sh install -l 'ass openssl3 opus bluray dav1d dvdnav uavs3d smb2 webp x264 x265' -p macos
+    ;;
     ffmpeg7)
         if [[ $PLAT == all ]];then
             ./main.sh install -l 'openssl3 opus bluray dav1d dvdnav uavs3d smb2 webp' -p ios
diff --git a/.github/workflows/onestep.sh b/.github/workflows/onestep.sh
@@ -25,6 +25,7 @@ fi
 export HOMEBREW_NO_AUTO_UPDATE=1
 export RELEASE_DATE=$(TZ=UTC-8 date +'%y%m%d%H%M%S')
 export RELEASE_VERSION=$(grep GIT_REPO_VERSION= ./configs/libs/${LIB_NAME}.sh | tail -n 1 | awk -F = '{printf "%s",$2}')
+export REPO_DIR=$(grep REPO_DIR= ./configs/libs/${LIB_NAME}.sh | tail -n 1 | awk -F = '{printf "%s",$2}' | tr -d "'\"")
 export TAG=${LIB_NAME}-${RELEASE_VERSION}-${RELEASE_DATE}
 export TITLE="👏👏${LIB_NAME}-${PLAT}-${RELEASE_VERSION}"
 
@@ -70,11 +71,7 @@ function compile_macos_platform
     
     local log_file="$DIST_DIR/macos-compile-log-$RELEASE_VERSION.md"
 
-    local repo_dir=$(grep REPO_DIR= ./configs/libs/${LIB_NAME}.sh | tail -n 1 | awk -F = '{printf "%s",$2}' | tr -d '"'\''')
     local extra_args=""
-    if [[ "$repo_dir" == "ffmpeg8" ]]; then
-        extra_args="--enable-ffmpeg"
-    fi
 
     if [[ $VERBOSE ]];then
         ./main.sh compile -p macos -c build -l ${LIB_NAME} $extra_args 2>&1 | tee -a "$log_file"
@@ -86,14 +83,16 @@ function compile_macos_platform
     zip -ryq $DIST_DIR/${LIB_NAME}-macos-universal-${RELEASE_VERSION}.zip ./*
     cd $ROOT_DIR
 
-    # Copy the architecture-specific ffmpeg binaries if they were compiled
-    if [[ "$repo_dir" == "ffmpeg8" ]]; then
+    # Copy the architecture-specific binaries if they were compiled
+    if [[ "$REPO_DIR" == "ffmpeg8" ]]; then
         for arch in arm64 x86_64; do
-            local ffmpeg_bin="build/product/macos/${LIB_NAME}-${arch}/bin/ffmpeg"
-            if [ -f "$ffmpeg_bin" ]; then
-                cp "$ffmpeg_bin" "$DIST_DIR/ffmpeg-macos-${arch}"
-                echo "Copied $ffmpeg_bin to $DIST_DIR/ffmpeg-macos-${arch}"
-            fi
+            for bin in ffmpeg ffplay ffprobe; do
+                local bin_file="build/product/macos/${LIB_NAME}-${arch}/bin/$bin"
+                if [ -f "$bin_file" ]; then
+                    cp "$bin_file" "$DIST_DIR/$bin-macos-${arch}"
+                    echo "Copied $bin_file to $DIST_DIR/$bin-macos-${arch}"
+                fi
+            done
         done
     fi
 }
diff --git a/README.md b/README.md
@@ -158,6 +158,5 @@ If cloning repositories from GitHub is slow, or if you need to use an internal p
 
 - To download pre-compiled xcframework libraries, add the --fmwk parameter when using the install command.
 - To skip pulling remote repositories during initialization, add the --skip-pull-base parameter when using the init command.
-- To compile the `ffmpeg` command-line program itself alongside the macOS libraries (with VideoToolbox encoders and lavfi indevs enabled), add the `--enable-ffmpeg` parameter.
 - Currently, FFmpeg uses the **module-full.sh** configuration, resulting in slightly larger package sizes.
 - You can download all pre-compiled GitHub libraries to your own server and specify your server address using MR\_DOWNLOAD\_BASEURL before running the install command.
diff --git a/README_zh-CN.md b/README_zh-CN.md
@@ -161,6 +161,5 @@ MRFFToolChain 是一套成熟的编译工具，专门用来编译 iOS、macOS、
 
 - 要下载预编译的 xcframework 库，使用 install 命令时添加 --fmwk 参数
 - 初始化时要跳过拉取远程仓库，使用 init 命令时添加 --skip-pull-base 参数
-- 编译 macOS 平台时可同时生成 `ffmpeg` 可执行程序（并启用 VideoToolbox 编码器和 lavfi 输入设备），使用 compile 命令时添加 `--enable-ffmpeg`
 - 目前 FFmpeg 使用 module-full.sh 配置，功能全但同时导致包体积略大
 - 可以将所有预编译的 GitHub 库下载到自己的服务器，并在运行 install 命令前通过 MR\_DOWNLOAD\_BASEURL 指定你的服务器地址
diff --git a/configs/ffconfig/module-full.sh b/configs/ffconfig/module-full.sh
@@ -19,12 +19,8 @@ export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --disable-gray"
 export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --disable-swscale-alpha"
 
 # Program options:
-if [[ "$MR_ENABLE_FFMPEG" == "1" ]]; then
-    export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --enable-ffmpeg"
-else
-    export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --disable-programs"
-    export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --disable-ffmpeg"
-fi
+export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --disable-programs"
+export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --disable-ffmpeg"
 export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --disable-ffplay"
 export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --disable-ffprobe"
 #ff4.0--ijk0.8.25--20190703--001 Unknown option "--disable-ffserver"
@@ -86,12 +82,6 @@ export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --disable-encoders"
 # export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --enable-encoder=wmv*"
 # export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --enable-encoder=msmpeg4*"
 export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --enable-encoder=gif"
-if [[ "$MR_ENABLE_FFMPEG" == "1" ]]; then
-    # 显式启用 VideoToolbox hevc(H.265) 编码器
-    export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --enable-encoder=hevc_videotoolbox"
-    # 显式启用 VideoToolbox H.264 编码器
-    export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --enable-encoder=h264_videotoolbox"
-fi
 # ./configure --list-decoders
 #audio
 export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --disable-decoders"
@@ -450,9 +440,7 @@ export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --disable-protocol=unix"
 
 #
 export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --disable-devices"
-if [[ "$MR_ENABLE_FFMPEG" == "1" ]]; then
-    export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --enable-indev=lavfi,testsrc,sine"
-fi
+# export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --enable-indev=lavfi,testsrc,sine"
 export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --enable-filters"
 # transpose_vt available macos(13.0), ios(16.0), tvos(16.0), visionos(1.0)
 export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --disable-filter=transpose_vt"
diff --git a/configs/ffconfig/module-program.sh b/configs/ffconfig/module-program.sh
@@ -13,7 +13,16 @@ cd ${enter_path}
 # enable programs 
 export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --enable-avdevice"
 export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --enable-avfilter"
-export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --enable-sdl2"
 export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --enable-ffmpeg"
 export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --enable-ffplay"
-export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --enable-ffprobe"
+export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --enable-ffprobe"
+
+# enable virtual and capture indevs for the binary program
+export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --enable-indev=lavfi,testsrc,sine"
+if [[ "$MR_PLAT" == "macos" || "$MR_PLAT" == "ios" ]]; then
+    export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --enable-indev=avfoundation,openal"
+    export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --enable-outdev=audiotoolbox"
+    # 显式启用 VideoToolbox hevc(H.265) 与 H.264 硬件加速编码器
+    export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --enable-encoder=hevc_videotoolbox"
+    export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --enable-encoder=h264_videotoolbox"
+fi
diff --git a/configs/libs/ffmpeg8-bin.sh b/configs/libs/ffmpeg8-bin.sh
@@ -0,0 +1,20 @@
+export LIB_NAME='ffmpeg8-bin'
+
+if [[ "$MR_PLAT" != "macos" ]]; then
+    echo "❌ ffmpeg8-bin is only supported on the macos platform."
+    exit 1
+fi
+
+export LIPO_LIBS=""
+export LIB_DEPENDS_BIN="nasm pkg-config"
+export GIT_LOCAL_REPO=extra/ffmpeg
+export REPO_DIR=ffmpeg8
+export PATCH_DIR=../../patches/ffmpeg8-bin
+export GIT_COMMIT=n8.1.2
+export GIT_REPO_VERSION=8.1.2
+
+if [[ "$GIT_FFMPEG_UPSTREAM" != "" ]] ;then
+    export GIT_UPSTREAM="$GIT_FFMPEG_UPSTREAM"
+else
+    export GIT_UPSTREAM=https://github.com/FFmpeg/FFmpeg.git
+fi
diff --git a/do-compile/apple/ffmpeg.sh b/do-compile/apple/ffmpeg.sh
@@ -39,21 +39,7 @@ CFG_FLAGS="$CFG_FLAGS $COMMON_FF_CFG_FLAGS"
 CFG_FLAGS="$CFG_FLAGS $THIRD_CFG_FLAGS"
 
 C_FLAGS="$MR_DEFAULT_CFLAGS"
-EXTRA_LDFLAGS=
-if [[ "$MR_ENABLE_FFMPEG" == "1" && "$MR_PLAT" = "macos" ]]; then
-    # Dynamically find third-party static libraries using pkg-config
-    pkgs="libass libbluray dav1d dvdread dvdnav freetype2 fribidi harfbuzz openssl opus libsmb2 uavs3d libunibreak libxml-2.0 libwebp libwebpdecoder libwebpdemux"
-    enabled_pkgs=""
-    for pkg in $pkgs; do
-        if pkg-config --exists "$pkg" 2>/dev/null; then
-            enabled_pkgs="$enabled_pkgs $pkg"
-        fi
-    done
-    if [ -n "$enabled_pkgs" ]; then
-        EXTRA_LDFLAGS=$(pkg-config --static --libs $enabled_pkgs)
-    fi
-fi
-LDFLAGS="$C_FLAGS $EXTRA_LDFLAGS"
+LDFLAGS="$C_FLAGS"
 # C_FLAGS="$C_FLAGS -I/Users/matt/GitWorkspace/MoltenVK/Package/Release/MoltenVK/include"
 # use system xml2 lib
 # C_FLAGS="$C_FLAGS $(xml2-config --prefix=${MR_SYS_ROOT}/usr --cflags)"
diff --git a/do-compile/apple/ffmpeg8-bin.sh b/do-compile/apple/ffmpeg8-bin.sh
@@ -0,0 +1,108 @@
+#! /usr/bin/env bash
+#
+# Copyright (C) 2021 Matt Reach<qianlongxu@gmail.com>
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+set -e
+
+error_handler() {
+    echo "An error occurred!"
+    tail -n20 ${MR_BUILD_SOURCE}/ffbuild/config.log
+}
+
+trap 'error_handler' ERR
+
+THIS_DIR=$(DIRNAME=$(dirname "$0"); cd "$DIRNAME"; pwd)
+cd "$THIS_DIR"
+
+# ffmpeg config options for program building
+source $MR_SHELL_CONFIGS_DIR/ffconfig/module-program.sh
+
+# Prep PKG_CONFIG_PATH with our built universal products
+for d in "$MR_PRODUCT_ROOT/universal"/*; do
+    if [[ -d "$d/lib/pkgconfig" ]]; then
+        export PKG_CONFIG_PATH="$d/lib/pkgconfig:$PKG_CONFIG_PATH"
+    fi
+done
+
+source $MR_SHELL_CONFIGS_DIR/ffconfig/auto-detect-third-libs.sh
+
+CFG_FLAGS=
+CFG_FLAGS="$CFG_FLAGS $COMMON_FF_CFG_FLAGS"
+CFG_FLAGS="$CFG_FLAGS $THIRD_CFG_FLAGS"
+
+# If sdl2 is not found on host, disable sdl2 and ffplay
+if ! pkg-config --exists sdl2 2>/dev/null; then
+    echo "[!] SDL2 not found, disabling sdl2 and ffplay"
+    CFG_FLAGS="$CFG_FLAGS --disable-sdl2 --disable-ffplay"
+fi
+
+C_FLAGS="$MR_DEFAULT_CFLAGS"
+EXTRA_LDFLAGS=
+
+# Dynamically query pkg-config to link all available third party static libraries
+pkgs="libx264 libx265 libass libbluray dav1d dvdread dvdnav freetype2 fribidi harfbuzz openssl opus libsmb2 uavs3d libunibreak libxml-2.0 libwebp libwebpdecoder libwebpdemux"
+enabled_pkgs=""
+for pkg in $pkgs; do
+    if pkg-config --exists "$pkg" 2>/dev/null; then
+        enabled_pkgs="$enabled_pkgs $pkg"
+    fi
+done
+if [ -n "$enabled_pkgs" ]; then
+    EXTRA_LDFLAGS=$(pkg-config --static --libs $enabled_pkgs)
+fi
+
+LDFLAGS="$C_FLAGS $EXTRA_LDFLAGS"
+
+echo "----------------------"
+echo "[*] configure"
+
+if [[ ! -d $MR_BUILD_SOURCE ]]; then
+    echo ""
+    echo "!! ERROR"
+    echo "!! Can not find lib source: $MR_BUILD_SOURCE"
+    echo "!! Run 'init-*.sh' first"
+    echo ""
+    exit 1
+fi
+
+cd $MR_BUILD_SOURCE
+if [[ -f "./config.h" ]]; then
+    echo 'reuse configure'
+else
+    echo
+    echo "CC: $MR_CC"
+    echo "CFLAGS: $C_FLAGS"
+    echo "LDFLAG:$LDFLAGS"
+    echo "FF_CFG_FLAGS: $CFG_FLAGS"
+    echo
+    ./configure \
+        $CFG_FLAGS \
+        --cc="$MR_CC" \
+        --as="perl ${MR_GAS_PERL} -arch ${MR_ARCH} -- $MR_CC" \
+        --extra-cflags="$C_FLAGS" \
+        --extra-cxxflags="$C_FLAGS" \
+        --extra-ldflags="$LDFLAGS"
+fi
+
+#----------------------
+echo "----------------------"
+echo "[*] compile"
+
+make -j$MR_HOST_NPROC >/dev/null
+
+make install >/dev/null
+
+
diff --git a/patches/ffmpeg8-bin b/patches/ffmpeg8-bin
@@ -0,0 +1 @@
+ffmpeg-n8.1.2
diff --git a/tools/parse-arguments.sh b/tools/parse-arguments.sh
@@ -68,7 +68,6 @@ OPTIONS:
     --help              Show help banner of compile command
     --debug             Enable debug mode (disable by default)
     --fmwk              Make xcframework(apple platform only)
-    --enable-ffmpeg     Enable ffmpeg program and VT encoders / indevs (macos platform only)
 EOF
 }
 
@@ -205,9 +204,6 @@ while [[ $# -gt 0 ]]; do
         --fmwk)
             export MR_MAKE_XCFRAMEWORK=1
         ;;
-        --enable-ffmpeg)
-            export MR_ENABLE_FFMPEG=1
-        ;;
         -lib-config)
             MR_UNKNOWN_OPTIONS+=("$1")
             has_lib_config=1
@@ -304,7 +300,6 @@ echo "MR_HOST_NPROC   : [$MR_HOST_NPROC]"
 echo "MR_DEBUG        : [$MR_DEBUG]"
 echo "MR_INIT_CFLAGS  : [$MR_INIT_CFLAGS]"
 echo "MR_MAKE_XCFRAMEWORK" : [$MR_MAKE_XCFRAMEWORK]
-echo "MR_ENABLE_FFMPEG"    : [$MR_ENABLE_FFMPEG]
 [[ ${#MR_UNKNOWN_OPTIONS[@]} -gt 0 ]] && echo "MR_UNKNOWN_OPTIONS : [${MR_UNKNOWN_OPTIONS[*]}]"
 
 unset platform cmd arch libs workspace debug action cflags
