From bfe2ee425573568a2dabb896f73172f90e3d7a31 Mon Sep 17 00:00:00 2001 From: Martin Pulec Date: Fri, 9 Dec 2022 09:18:26 +0100 Subject: [PATCH] CI Linux FFmpeg: add openVPL refer to GH-270 --- .github/scripts/Linux/download_build_ffmpeg.sh | 11 +++++++++++ .github/scripts/Linux/install_ffmpeg.sh | 1 + .github/scripts/Linux/prepare.sh | 4 ++++ 3 files changed, 16 insertions(+) diff --git a/.github/scripts/Linux/download_build_ffmpeg.sh b/.github/scripts/Linux/download_build_ffmpeg.sh index 1ca20f780..c54d2f416 100755 --- a/.github/scripts/Linux/download_build_ffmpeg.sh +++ b/.github/scripts/Linux/download_build_ffmpeg.sh @@ -27,6 +27,15 @@ install_nv_codec_headers() { ( cd nv-codec-headers && make && sudo make install || exit 1 ) } +install_onevpl() {( + git clone --depth 1 https://github.com/oneapi-src/oneVPL + mkdir oneVPL/build + cd oneVPL/build + cmake .. + cmake --build . --config Release --parallel + sudo cmake --build . --config Release --target install +)} + rm -rf /var/tmp/ffmpeg git clone --depth $FFMPEG_GIT_DEPTH https://git.ffmpeg.org/ffmpeg.git /var/tmp/ffmpeg cd /var/tmp/ffmpeg @@ -34,6 +43,7 @@ cd /var/tmp/ffmpeg ( git clone --depth 1 https://aomedia.googlesource.com/aom && mkdir -p aom/build && cd aom/build && cmake -DBUILD_SHARED_LIBS=1 .. && cmake --build . --parallel && sudo cmake --install . || exit 1 ) install_libvpx install_nv_codec_headers +install_onevpl install_svt # apply patches find "$GITHUB_WORKSPACE/.github/scripts/Linux/ffmpeg-patches" -name '*.patch' -print0 | sort -z | xargs -0 -n 1 git apply @@ -44,6 +54,7 @@ find "$GITHUB_WORKSPACE/.github/scripts/Linux/ffmpeg-patches" -name '*.patch' -p --enable-libsvtav1 \ --enable-libsvthevc \ --enable-libsvtvp9 \ + --enable-libvpl \ --disable-sdl2 \ make -j "$(nproc)" diff --git a/.github/scripts/Linux/install_ffmpeg.sh b/.github/scripts/Linux/install_ffmpeg.sh index 4183ed0c2..3884bcaa1 100755 --- a/.github/scripts/Linux/install_ffmpeg.sh +++ b/.github/scripts/Linux/install_ffmpeg.sh @@ -8,6 +8,7 @@ cd /var/tmp/ffmpeg sudo cmake --install SVT-AV1/Build sudo cmake --install SVT-HEVC/Build/linux/Release sudo cmake --install SVT-VP9/Build +sudo cmake --build oneVPL/build --config Release --target install sudo make install sudo ldconfig diff --git a/.github/scripts/Linux/prepare.sh b/.github/scripts/Linux/prepare.sh index fea4902bc..589901272 100755 --- a/.github/scripts/Linux/prepare.sh +++ b/.github/scripts/Linux/prepare.sh @@ -46,6 +46,10 @@ sudo apt-get -y remove 'libavcodec*' 'libavutil*' 'libswscale*' libvpx-dev 'libx update_nasm # own x264 build sudo apt --no-install-recommends install asciidoc xmlto +# openVPL +sudo apt install libva-dev libdrm-dev libx11-dev libx11-xcb-dev libxcb-present-dev libxcb-dri3-dev +sudo curl -LO http://azure.archive.ubuntu.com/ubuntu/pool/main/w/wayland-protocols/wayland-protocols_1.20-1_all.deb # at least 1.15 is needed +sudo dpkg -i wayland-protocols_*_all.deb sudo apt install qtbase5-dev