From 7f96dab49d45dc908cd423b517670e9926516ef0 Mon Sep 17 00:00:00 2001 From: Martin Pulec Date: Mon, 28 Mar 2022 08:32:12 +0200 Subject: [PATCH] Partially revert "GitHub CI C/C++ Lin. FFmpeg: disable SVT HEVC/VP9" This partially reverts commit 9fbd18b53d9429e1d80bd1090c64258b1669a2ad. Note: VP9 patch is still not working. --- .github/scripts/Linux/download_build_ffmpeg.sh | 6 +++--- .github/scripts/Linux/install_ffmpeg.sh | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/scripts/Linux/download_build_ffmpeg.sh b/.github/scripts/Linux/download_build_ffmpeg.sh index 4bb879fba..0f2ff9690 100755 --- a/.github/scripts/Linux/download_build_ffmpeg.sh +++ b/.github/scripts/Linux/download_build_ffmpeg.sh @@ -12,11 +12,11 @@ install_libvpx() { FFMPEG_GIT_DEPTH=5000 # greater depth is useful for 3-way merges install_svt() { - #( git clone --depth 1 https://github.com/OpenVisualCloud/SVT-HEVC && cd SVT-HEVC/Build/linux && ./build.sh release && cd Release && make -j $(nproc) && sudo make install || exit 1 ) + ( git clone --depth 1 https://github.com/OpenVisualCloud/SVT-HEVC && cd SVT-HEVC/Build/linux && ./build.sh release && cd Release && make -j $(nproc) && sudo make install || exit 1 ) ( git clone --depth 1 https://github.com/OpenVisualCloud/SVT-AV1 && cd SVT-AV1 && cd Build && cmake .. -G"Unix Makefiles" -DCMAKE_BUILD_TYPE=Release && make -j $(nproc) && sudo make install || exit 1 ) #( git clone --depth 1 https://github.com/OpenVisualCloud/SVT-VP9.git && cd SVT-VP9/Build && cmake .. -DCMAKE_BUILD_TYPE=Release && make -j $(nproc) && sudo make install || exit 1 ) # if patch apply fails, try increasing $FFMPEG_GIT_DEPTH - #git apply -3 SVT-HEVC/ffmpeg_plugin/master-*.patch + git apply -3 SVT-HEVC/ffmpeg_plugin/master-*.patch #git apply -3 SVT-VP9/ffmpeg_plugin/master-*.patch } @@ -43,7 +43,7 @@ done --enable-libdav1d \ --enable-librav1e \ --enable-libsvtav1 \ - #--enable-libsvthevc \ + --enable-libsvthevc \ #--enable-libsvtvp9 \ make -j $(nproc) diff --git a/.github/scripts/Linux/install_ffmpeg.sh b/.github/scripts/Linux/install_ffmpeg.sh index 4ec50454b..3b8c820b9 100755 --- a/.github/scripts/Linux/install_ffmpeg.sh +++ b/.github/scripts/Linux/install_ffmpeg.sh @@ -6,7 +6,7 @@ cd /var/tmp/ffmpeg ( cd nv-codec-headers && sudo make install ) ( cd aom/build && sudo cmake --install . ) ( cd SVT-AV1/Build && sudo make install ) -#( cd SVT-HEVC/Build/linux/Release && sudo make install || exit 1 ) +( cd SVT-HEVC/Build/linux/Release && sudo make install || exit 1 ) #( cd SVT-VP9/Build && sudo make install || exit 1 ) sudo make install sudo ldconfig