Revert "GitHub CI C/C++ Lin. FFmpeg: disable SVT HEVC/VP9"

This reverts commit 9fbd18b.
CESNET · Jun 21, 2022 · 4b5eaeb · 4b5eaeb
1 parent c983447
commit 4b5eaeb
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/.github/scripts/Linux/download_build_ffmpeg.sh b/.github/scripts/Linux/download_build_ffmpeg.sh
@@ -12,12 +12,12 @@ 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 )
+        ( 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-VP9/ffmpeg_plugin/master-*.patch
+        git apply -3 SVT-HEVC/ffmpeg_plugin/master-*.patch
+        git apply -3 SVT-VP9/ffmpeg_plugin/master-*.patch
 }
 
 # The NVENC API implies respective driver version (see libavcodec/nvenc.c) - 455.28 (Linux) / 456.71 (Windows) for v11.0
@@ -43,8 +43,8 @@ done
         --enable-libdav1d \
         --enable-librav1e \
         --enable-libsvtav1 \
-        #--enable-libsvthevc \
-        #--enable-libsvtvp9 \
+        --enable-libsvthevc \
+        --enable-libsvtvp9 \
 
 make -j $(nproc)
 sudo make install

diff --git 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-VP9/Build && 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