From d16fb16c530a43732e7fdc28abcdde9d403886cf Mon Sep 17 00:00:00 2001 From: Artem Dyomin Date: Tue, 8 Aug 2023 15:32:26 +0200 Subject: [PATCH] Disable vulkan and v4l2m2m for ffmpeg builds Vulkan: FFmpeg has a very draft support of vulkan in n5.x and n6.0, it's promised to be introduced with some working functionality in n6.1. We'll wait for 6.1, then test it. For now, let's get rid of the extra dependency. v4l2m2m: It's a prospective hw acceleration on linux, especially on embeddded platforms, but currently, in my experiments, it's not working with both QtMM and ffmpeg cmd line. Let's get rid of the not working codec. Hopefully, it'll be fixed in the future. Pick-to: 6.6 6.5 Change-Id: I2468f84ae2ec54043d2db83f1a9c08be8e4f509d Reviewed-by: Lars Knoll --- coin/provisioning/common/shared/ffmpeg_config_options.txt | 2 +- coin/provisioning/common/unix/install-ffmpeg-android.sh | 2 +- coin/provisioning/common/windows/install-ffmpeg.ps1 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/coin/provisioning/common/shared/ffmpeg_config_options.txt b/coin/provisioning/common/shared/ffmpeg_config_options.txt index c125998c..42282350 100644 --- a/coin/provisioning/common/shared/ffmpeg_config_options.txt +++ b/coin/provisioning/common/shared/ffmpeg_config_options.txt @@ -1 +1 @@ ---disable-programs --disable-doc --disable-debug --enable-network --disable-lzma --enable-pic +--disable-programs --disable-doc --disable-debug --enable-network --disable-lzma --enable-pic --disable-vulkan --disable-v4l2-m2m diff --git a/coin/provisioning/common/unix/install-ffmpeg-android.sh b/coin/provisioning/common/unix/install-ffmpeg-android.sh index 29f0a2ce..eb8de7e9 100755 --- a/coin/provisioning/common/unix/install-ffmpeg-android.sh +++ b/coin/provisioning/common/unix/install-ffmpeg-android.sh @@ -68,7 +68,7 @@ build_ffmpeg_android() { strip=${toolchain_bin}/llvm-strip ffmpeg_config_options=$(cat "${BASH_SOURCE%/*}/../shared/ffmpeg_config_options.txt") - ffmpeg_config_options+=" --disable-vulkan --enable-cross-compile --target-os=android --enable-jni --enable-mediacodec --enable-pthreads --enable-neon --disable-asm --disable-indev=android_camera" + ffmpeg_config_options+=" --enable-cross-compile --target-os=android --enable-jni --enable-mediacodec --enable-pthreads --enable-neon --disable-asm --disable-indev=android_camera" ffmpeg_config_options+=" --arch=$target_arch --cpu=${target_cpu} --sysroot=${sysroot} --sysinclude=${sysroot}/usr/include/" ffmpeg_config_options+=" --cc=${cc} --cxx=${cxx} --ar=${ar} --ranlib=${ranlib}" diff --git a/coin/provisioning/common/windows/install-ffmpeg.ps1 b/coin/provisioning/common/windows/install-ffmpeg.ps1 index e258c444..c83d06d0 100644 --- a/coin/provisioning/common/windows/install-ffmpeg.ps1 +++ b/coin/provisioning/common/windows/install-ffmpeg.ps1 @@ -124,7 +124,7 @@ function InstallAndroidArmv7 { $strip="${toolchain_bin}/llvm-strip.exe" $config = Get-Content "$PSScriptRoot\..\shared\ffmpeg_config_options.txt" - $config += " --disable-vulkan --enable-cross-compile --target-os=android --enable-jni --enable-mediacodec --enable-pthreads --enable-neon --disable-asm --disable-indev=android_camera" + $config += " --enable-cross-compile --target-os=android --enable-jni --enable-mediacodec --enable-pthreads --enable-neon --disable-asm --disable-indev=android_camera" $config += " --arch=$target_arch --cpu=${target_cpu} --sysroot=${sysroot} --sysinclude=${sysroot}/usr/include/" $config += " --cc=${cc} --cxx=${cxx} --ar=${ar} --ranlib=${ranlib}"