From a20013290cdd6fa69bcf55b4bcfd253b92e00119 Mon Sep 17 00:00:00 2001 From: Samuel Mira Date: Tue, 8 Nov 2022 14:35:37 +0200 Subject: Provision FFmpeg library for Android Fixes: QTBUG-100474 Change-Id: I5cc6f645bd020628bc6a77d4a5d42575f4fcf979 Reviewed-by: Lars Knoll (cherry picked from commit f412e6f1d1c09ff4d77bae9aba4d76e871a4501b) --- .../cmake_platforms_target_android.yaml | 1 + .../linux_android_tests_developer.yaml | 1 + coin/platform_configs/tqtc-android-automotive.yaml | 1 + coin/provisioning/common/unix/install-ffmpeg.sh | 118 +++++++++++++++++++-- .../90-install-ffmpeg.sh | 1 + 5 files changed, 114 insertions(+), 8 deletions(-) mode change 100644 => 100755 coin/provisioning/qtci-linux-RHEL-8.4-x86_64/90-install-ffmpeg.sh diff --git a/coin/platform_configs/cmake_platforms_target_android.yaml b/coin/platform_configs/cmake_platforms_target_android.yaml index 3cb87c10..684da249 100644 --- a/coin/platform_configs/cmake_platforms_target_android.yaml +++ b/coin/platform_configs/cmake_platforms_target_android.yaml @@ -43,6 +43,7 @@ Configurations: Environment variables: [ 'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86', 'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON', + 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID}}', 'CONAN_HOST_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc', 'CONAN_PROFILE=coin/conan/profiles/ci-unix-android-x86-clang', 'ANDROID_EMULATOR=@emulator_x86_api_23', diff --git a/coin/platform_configs/linux_android_tests_developer.yaml b/coin/platform_configs/linux_android_tests_developer.yaml index d3ccba2b..d96f03c1 100644 --- a/coin/platform_configs/linux_android_tests_developer.yaml +++ b/coin/platform_configs/linux_android_tests_developer.yaml @@ -11,6 +11,7 @@ Configurations: Environment variables: [ 'TARGET_CONFIGURE_ARGS=-nomake examples -debug -developer-build -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86', 'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}}', + 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID}}', 'CONAN_HOST_PROFILE=coin/conan/profiles/linux-x86_64-gcc', 'CONAN_INSTALL_DIR={{.InstallDir}}/target', 'CONAN_PROFILE=coin/conan/profiles/unix-android-x86-clang', diff --git a/coin/platform_configs/tqtc-android-automotive.yaml b/coin/platform_configs/tqtc-android-automotive.yaml index 83848148..993f59d6 100644 --- a/coin/platform_configs/tqtc-android-automotive.yaml +++ b/coin/platform_configs/tqtc-android-automotive.yaml @@ -51,6 +51,7 @@ Configurations: Environment variables: [ 'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86', 'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}}', + 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID}}', 'CONAN_HOST_PROFILE=coin/conan/profiles/linux-x86_64-gcc', 'CONAN_PROFILE=coin/conan/profiles/unix-android-x86-clang', 'ANDROID_EMULATOR=@automotive_emulator_x86_api_30' diff --git a/coin/provisioning/common/unix/install-ffmpeg.sh b/coin/provisioning/common/unix/install-ffmpeg.sh index dedad29a..db119557 100755 --- a/coin/provisioning/common/unix/install-ffmpeg.sh +++ b/coin/provisioning/common/unix/install-ffmpeg.sh @@ -48,34 +48,100 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh" # shellcheck source=../unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" -version="n5.0" -ffmpeg_name="FFmpeg-$version" +function SourceEnvVar { + echo "Source environment variables file" + if [ uname -a | grep -q "Ubuntu" ]; + then + if [ lsb_release -a | grep "Ubuntu 22.04" ]; + then source ~/.bashrc + else source ~/.profile + fi + else + source ~/.bashrc + source ~/.zshrc + fi +} -url_cached="http://ci-files01-hki.intra.qt.io/input/ffmpeg/$version.tar.gz" +if [ "$os" == "android" ]; +then +version="f0d2ed135c3602670b56a95e0346487730317407" +url_public="https://github.com/FFmpeg/FFmpeg/archive/$version.tar.gz" +sha1="a429060d07b6d84c849a68741f816a7e91447d12" +else +version="n5.0" url_public="https://github.com/FFmpeg/FFmpeg/archive/refs/tags/$version.tar.gz" sha1="1a979876463fd81e481d53ceb3cc117f0fce8521" +fi + +url_cached="http://ci-files01-hki.intra.qt.io/input/ffmpeg/$version.tar.gz" +ffmpeg_name="FFmpeg-$version" target_dir="$HOME" app_prefix="" +ffmpeg_source_dir="$target_dir/$ffmpeg_name" -InstallFromCompressedFileFromURL "$url_cached" "$url_public" "$sha1" "$target_dir" "$app_prefix" +if [ ! -d "$ffmpeg_source_dir" ]; +then + InstallFromCompressedFileFromURL "$url_cached" "$url_public" "$sha1" "$target_dir" "$app_prefix" +fi ffmpeg_config_options=$(cat "${BASH_SOURCE%/*}/../shared/ffmpeg_config_options.txt") -ffmpeg_source_dir="$target_dir/$ffmpeg_name" + build_ffmpeg() { local arch="$1" + local prefix="$2" local build_dir="$ffmpeg_source_dir/build/$arch" mkdir -p "$build_dir" pushd "$build_dir" + + if [ -z "$prefix" ] + then prefix="/usr/local/$ffmpeg_name" + fi + + # android configures its own toolchain, it does not use the system clang + if [ -n "$arch" ] && [ "$os" != "android" ] + then cc="clang -arch $arch" + fi + if [ -n "$arch" ] - then $ffmpeg_source_dir/configure $ffmpeg_config_options --prefix="/usr/local/$ffmpeg_name" --enable-cross-compile --arch=$arch --cc="clang -arch $arch" - else $ffmpeg_source_dir/configure $ffmpeg_config_options --prefix="/usr/local/$ffmpeg_name" + then $ffmpeg_source_dir/configure $ffmpeg_config_options --prefix="$prefix" --enable-cross-compile --arch=$arch --cc="$cc" + else $ffmpeg_source_dir/configure $ffmpeg_config_options --prefix="$prefix" fi make install DESTDIR=$build_dir/installed -j4 popd } +build_ffmpeg_android() { + SourceEnvVar + target_arch=$1 + target_dir=$2 + + if [ "$target_arch" == "x86_64" ]; + then + #emulador on CI is x86_64 + target_toolchain_arch="x86_64-linux-android" + target_arch=x86_64 + target_cpu=x86_64 + else + #emulador on CI is x86 + target_toolchain_arch="i686-linux-android" + target_arch=x86 + target_cpu=i686 + fi + + api_version=24 + + toolchain=${ANDROID_NDK_ROOT_DEFAULT}/toolchains/llvm/prebuilt/${ANDROID_NDK_HOST} + toolchain_bin=${toolchain}/bin + sysroot=${toolchain}/sysroot + cxx=${toolchain_bin}/${target_toolchain_arch}${api_version}-clang++ + cc=${toolchain_bin}/${target_toolchain_arch}${api_version}-clang + + ffmpeg_config_options+=" --disable-vulkan --target-os=android --enable-jni --enable-mediacodec --enable-pthreads --enable-neon --disable-asm --cpu=${target_cpu} --disable-indev=android_camera --sysroot=${sysroot} --sysinclude=${sysroot}/usr/include/ --cc=${cc} --cxx=${cxx}" + build_ffmpeg ${target_arch} ${target_dir} +} + if [ "$os" == "linux" ]; then if [ -f /etc/redhat-release ] then sudo yum -y install yasm @@ -83,12 +149,14 @@ if [ "$os" == "linux" ]; then fi build_ffmpeg sudo mv "$ffmpeg_source_dir/build/installed/usr/local/$ffmpeg_name" "/usr/local" + SetEnvVar "FFMPEG_DIR" "/usr/local/$ffmpeg_name" elif [ "$os" == "macos" ]; then brew install yasm export MACOSX_DEPLOYMENT_TARGET=10.14 build_ffmpeg sudo mv "$ffmpeg_source_dir/build/installed/usr/local/$ffmpeg_name" "/usr/local" + SetEnvVar "FFMPEG_DIR" "/usr/local/$ffmpeg_name" elif [ "$os" == "macos-universal" ]; then brew install yasm @@ -97,6 +165,40 @@ elif [ "$os" == "macos-universal" ]; then build_ffmpeg "x86_64" sudo "${BASH_SOURCE%/*}/../macos/makeuniversal.sh" "$ffmpeg_source_dir/build/arm64/installed" "$ffmpeg_source_dir/build/x86_64/installed" + SetEnvVar "FFMPEG_DIR" "/usr/local/$ffmpeg_name" + +elif [ "$os" == "android" ]; then + + SourceEnvVar + + url_cached="" + url_public="" + sha1="" + + #get emulator target arch + if [ "$ANDROID_EMULATOR" == *"x86_64"* ]; + then + target_arch=x86_64 + sha1="0241fd483c16f4ce53206b911214b06854cdef9d" + url_cached="http://ci-files01-hki.intra.qt.io/input/ffmpeg/android-ffmpeg-x86_64.zip" + else + target_arch=x86 + url_cached="http://ci-files01-hki.intra.qt.io/input/ffmpeg/android-ffmpeg-x86.zip" + sha1="8b254e31411a350edb581bb30e31401866abbe7d" + fi + + target_dir="/opt/android/$ffmpeg_name" + app_prefix="" + + #try install a pre-build + InstallFromCompressedFileFromURL "$url_cached" "$url_public" "$sha1" "$target_dir" "$app_prefix" + + #if could not install pre-build, build it + if [ ! -d "$target_dir" ]; + then build_ffmpeg_android "$target_arch" "$target_dir" + fi + + #set the var to use in yaml + SetEnvVar "FFMPEG_DIR_ANDROID" "$target_dir" fi -SetEnvVar "FFMPEG_DIR" "/usr/local/$ffmpeg_name" diff --git a/coin/provisioning/qtci-linux-RHEL-8.4-x86_64/90-install-ffmpeg.sh b/coin/provisioning/qtci-linux-RHEL-8.4-x86_64/90-install-ffmpeg.sh old mode 100644 new mode 100755 index 61da9b7b..280b2870 --- a/coin/provisioning/qtci-linux-RHEL-8.4-x86_64/90-install-ffmpeg.sh +++ b/coin/provisioning/qtci-linux-RHEL-8.4-x86_64/90-install-ffmpeg.sh @@ -1,3 +1,4 @@ #!/usr/bin/env bash source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "linux" +source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "android" -- cgit v1.2.3