From 51ec64d5cce002f05faa931fbfecaafeb6991d01 Mon Sep 17 00:00:00 2001 From: ILOVEPIE Date: Mon, 11 Mar 2019 20:18:26 +0000 Subject: [PATCH 1/7] SVT Support --- templates/Dockerfile-patch-SVT | 15 +++++++++++++++ templates/Dockerfile-patch-SVT-enable | 2 ++ 2 files changed, 17 insertions(+) create mode 100644 templates/Dockerfile-patch-SVT create mode 100644 templates/Dockerfile-patch-SVT-enable diff --git a/templates/Dockerfile-patch-SVT b/templates/Dockerfile-patch-SVT new file mode 100644 index 000000000..26ca3d754 --- /dev/null +++ b/templates/Dockerfile-patch-SVT @@ -0,0 +1,15 @@ +# SVT Codecs +# Add https://github.com/OpenVisualCloud/SVT-VP9 later +RUN \ + DIR=/tmp/svt && mkdir -p ${DIR} && cd ${DIR} && \ + git clone https://github.com/OpenVisualCloud/SVT-AV1 && \ + git clone https://github.com/intel/SVT-HEVC && \ + cd SVT-AV1 && cd Build && cmake .. && make -j `nproc` && make install && \ + cd SVT-HEVC && cd Build && cmake .. && make -j `nproc` && make install + +# Add ${DIR2}/SVT-VP9/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch later +RUN \ + DIR=/tmp/ffmpeg && DIR2=/tmp/svt && mkdir -p ${DIR} && mkdir -p ${DIR2} && cd ${DIR} && \ + git apply ${DIR2}/SVT-HEVC/ffmpeg_plugin/0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch && \ + git apply ${DIR2}/SVT-HEVC/ffmpeg_plugin/0002-doc-Add-libsvt_hevc-encoder-docs.patch && \ + git apply ${DIR2}/SVT-AV1/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-av1-with-svt-hevc.patch diff --git a/templates/Dockerfile-patch-SVT-enable b/templates/Dockerfile-patch-SVT-enable new file mode 100644 index 000000000..c4fcfe4f0 --- /dev/null +++ b/templates/Dockerfile-patch-SVT-enable @@ -0,0 +1,2 @@ +--enable-libsvthevc \ +--enable-libsvtav1 \ From 020b8bc8f591723326edb238b57aff66e2c029a4 Mon Sep 17 00:00:00 2001 From: ILOVEPIE Date: Mon, 11 Mar 2019 21:33:35 +0000 Subject: [PATCH 2/7] SVT Support 2 --- docker-images/2.8/alpine/Dockerfile | 1 + docker-images/2.8/centos/Dockerfile | 1 + docker-images/2.8/scratch/Dockerfile | 1 + docker-images/2.8/ubuntu/Dockerfile | 1 + docker-images/2.8/vaapi/Dockerfile | 1 + docker-images/3.0/alpine/Dockerfile | 1 + docker-images/3.0/centos/Dockerfile | 1 + docker-images/3.0/scratch/Dockerfile | 1 + docker-images/3.0/ubuntu/Dockerfile | 1 + docker-images/3.0/vaapi/Dockerfile | 1 + docker-images/3.1/alpine/Dockerfile | 1 + docker-images/3.1/centos/Dockerfile | 1 + docker-images/3.1/scratch/Dockerfile | 1 + docker-images/3.1/ubuntu/Dockerfile | 1 + docker-images/3.1/vaapi/Dockerfile | 1 + docker-images/3.2/alpine/Dockerfile | 1 + docker-images/3.2/centos/Dockerfile | 1 + docker-images/3.2/scratch/Dockerfile | 1 + docker-images/3.2/ubuntu/Dockerfile | 1 + docker-images/3.2/vaapi/Dockerfile | 1 + docker-images/3.3/alpine/Dockerfile | 1 + docker-images/3.3/centos/Dockerfile | 1 + docker-images/3.3/scratch/Dockerfile | 1 + docker-images/3.3/ubuntu/Dockerfile | 1 + docker-images/3.3/vaapi/Dockerfile | 1 + docker-images/3.4/alpine/Dockerfile | 1 + docker-images/3.4/centos/Dockerfile | 1 + docker-images/3.4/scratch/Dockerfile | 1 + docker-images/3.4/ubuntu/Dockerfile | 1 + docker-images/3.4/vaapi/Dockerfile | 1 + docker-images/4.0/alpine/Dockerfile | 1 + docker-images/4.0/centos/Dockerfile | 1 + docker-images/4.0/scratch/Dockerfile | 1 + docker-images/4.0/ubuntu/Dockerfile | 1 + docker-images/4.0/vaapi/Dockerfile | 1 + docker-images/4.1/alpine/Dockerfile | 20 +++++++++++++++++++- docker-images/4.1/centos/Dockerfile | 20 +++++++++++++++++++- docker-images/4.1/scratch/Dockerfile | 20 +++++++++++++++++++- docker-images/4.1/ubuntu/Dockerfile | 20 +++++++++++++++++++- docker-images/4.1/vaapi/Dockerfile | 20 +++++++++++++++++++- docker-images/snapshot/alpine/Dockerfile | 18 ++++++++++++++++++ docker-images/snapshot/centos/Dockerfile | 18 ++++++++++++++++++ docker-images/snapshot/scratch/Dockerfile | 18 ++++++++++++++++++ docker-images/snapshot/ubuntu/Dockerfile | 18 ++++++++++++++++++ docker-images/snapshot/vaapi/Dockerfile | 18 ++++++++++++++++++ templates/Dockerfile-run | 1 + update.py | 9 ++++++++- 47 files changed, 229 insertions(+), 6 deletions(-) diff --git a/docker-images/2.8/alpine/Dockerfile b/docker-images/2.8/alpine/Dockerfile index 59ad71318..55e0a1398 100644 --- a/docker-images/2.8/alpine/Dockerfile +++ b/docker-images/2.8/alpine/Dockerfile @@ -340,6 +340,7 @@ RUN \ --enable-libfdk_aac \ \ \ + \ --enable-postproc \ --enable-small \ --enable-version3 \ diff --git a/docker-images/2.8/centos/Dockerfile b/docker-images/2.8/centos/Dockerfile index aaf2ebc76..ee862a1c4 100644 --- a/docker-images/2.8/centos/Dockerfile +++ b/docker-images/2.8/centos/Dockerfile @@ -341,6 +341,7 @@ RUN \ --enable-libfdk_aac \ \ \ + \ --enable-postproc \ --enable-small \ --enable-version3 \ diff --git a/docker-images/2.8/scratch/Dockerfile b/docker-images/2.8/scratch/Dockerfile index 81c6d4c8e..562adff8d 100644 --- a/docker-images/2.8/scratch/Dockerfile +++ b/docker-images/2.8/scratch/Dockerfile @@ -337,6 +337,7 @@ RUN \ --enable-libfdk_aac \ \ \ + \ --enable-postproc \ --enable-small \ --enable-version3 \ diff --git a/docker-images/2.8/ubuntu/Dockerfile b/docker-images/2.8/ubuntu/Dockerfile index 5da5ef811..61946110a 100644 --- a/docker-images/2.8/ubuntu/Dockerfile +++ b/docker-images/2.8/ubuntu/Dockerfile @@ -342,6 +342,7 @@ RUN \ --enable-libfdk_aac \ \ \ + \ --enable-postproc \ --enable-small \ --enable-version3 \ diff --git a/docker-images/2.8/vaapi/Dockerfile b/docker-images/2.8/vaapi/Dockerfile index 4992cad4f..7889efc9b 100644 --- a/docker-images/2.8/vaapi/Dockerfile +++ b/docker-images/2.8/vaapi/Dockerfile @@ -343,6 +343,7 @@ RUN \ --enable-libfdk_aac \ \ \ + \ --enable-postproc \ --enable-small \ --enable-version3 \ diff --git a/docker-images/3.0/alpine/Dockerfile b/docker-images/3.0/alpine/Dockerfile index 5f7c5c8e5..f51bac009 100644 --- a/docker-images/3.0/alpine/Dockerfile +++ b/docker-images/3.0/alpine/Dockerfile @@ -340,6 +340,7 @@ RUN \ --enable-libfdk_aac \ --enable-libkvazaar \ \ + \ --enable-postproc \ --enable-small \ --enable-version3 \ diff --git a/docker-images/3.0/centos/Dockerfile b/docker-images/3.0/centos/Dockerfile index 101f74b0b..c04249f48 100644 --- a/docker-images/3.0/centos/Dockerfile +++ b/docker-images/3.0/centos/Dockerfile @@ -341,6 +341,7 @@ RUN \ --enable-libfdk_aac \ --enable-libkvazaar \ \ + \ --enable-postproc \ --enable-small \ --enable-version3 \ diff --git a/docker-images/3.0/scratch/Dockerfile b/docker-images/3.0/scratch/Dockerfile index cf009e0dc..1e1b7eb28 100644 --- a/docker-images/3.0/scratch/Dockerfile +++ b/docker-images/3.0/scratch/Dockerfile @@ -337,6 +337,7 @@ RUN \ --enable-libfdk_aac \ --enable-libkvazaar \ \ + \ --enable-postproc \ --enable-small \ --enable-version3 \ diff --git a/docker-images/3.0/ubuntu/Dockerfile b/docker-images/3.0/ubuntu/Dockerfile index 76258f0d5..e92c881c2 100644 --- a/docker-images/3.0/ubuntu/Dockerfile +++ b/docker-images/3.0/ubuntu/Dockerfile @@ -342,6 +342,7 @@ RUN \ --enable-libfdk_aac \ --enable-libkvazaar \ \ + \ --enable-postproc \ --enable-small \ --enable-version3 \ diff --git a/docker-images/3.0/vaapi/Dockerfile b/docker-images/3.0/vaapi/Dockerfile index 131eb882c..8d4f572a0 100644 --- a/docker-images/3.0/vaapi/Dockerfile +++ b/docker-images/3.0/vaapi/Dockerfile @@ -344,6 +344,7 @@ RUN \ --enable-libfdk_aac \ --enable-libkvazaar \ \ + \ --enable-postproc \ --enable-small \ --enable-version3 \ diff --git a/docker-images/3.1/alpine/Dockerfile b/docker-images/3.1/alpine/Dockerfile index 487dd5fb5..13074aa96 100644 --- a/docker-images/3.1/alpine/Dockerfile +++ b/docker-images/3.1/alpine/Dockerfile @@ -340,6 +340,7 @@ RUN \ --enable-libfdk_aac \ --enable-libkvazaar \ \ + \ --enable-postproc \ --enable-small \ --enable-version3 \ diff --git a/docker-images/3.1/centos/Dockerfile b/docker-images/3.1/centos/Dockerfile index 6756f0dc7..79192204b 100644 --- a/docker-images/3.1/centos/Dockerfile +++ b/docker-images/3.1/centos/Dockerfile @@ -341,6 +341,7 @@ RUN \ --enable-libfdk_aac \ --enable-libkvazaar \ \ + \ --enable-postproc \ --enable-small \ --enable-version3 \ diff --git a/docker-images/3.1/scratch/Dockerfile b/docker-images/3.1/scratch/Dockerfile index 254f7c921..f976a64e8 100644 --- a/docker-images/3.1/scratch/Dockerfile +++ b/docker-images/3.1/scratch/Dockerfile @@ -337,6 +337,7 @@ RUN \ --enable-libfdk_aac \ --enable-libkvazaar \ \ + \ --enable-postproc \ --enable-small \ --enable-version3 \ diff --git a/docker-images/3.1/ubuntu/Dockerfile b/docker-images/3.1/ubuntu/Dockerfile index 1cc4e7578..7490f1964 100644 --- a/docker-images/3.1/ubuntu/Dockerfile +++ b/docker-images/3.1/ubuntu/Dockerfile @@ -342,6 +342,7 @@ RUN \ --enable-libfdk_aac \ --enable-libkvazaar \ \ + \ --enable-postproc \ --enable-small \ --enable-version3 \ diff --git a/docker-images/3.1/vaapi/Dockerfile b/docker-images/3.1/vaapi/Dockerfile index 900e2766f..2583d9fbe 100644 --- a/docker-images/3.1/vaapi/Dockerfile +++ b/docker-images/3.1/vaapi/Dockerfile @@ -344,6 +344,7 @@ RUN \ --enable-libfdk_aac \ --enable-libkvazaar \ \ + \ --enable-postproc \ --enable-small \ --enable-version3 \ diff --git a/docker-images/3.2/alpine/Dockerfile b/docker-images/3.2/alpine/Dockerfile index b768e53b1..f30b574a5 100644 --- a/docker-images/3.2/alpine/Dockerfile +++ b/docker-images/3.2/alpine/Dockerfile @@ -340,6 +340,7 @@ RUN \ --enable-libfdk_aac \ --enable-libkvazaar \ \ + \ --enable-postproc \ --enable-small \ --enable-version3 \ diff --git a/docker-images/3.2/centos/Dockerfile b/docker-images/3.2/centos/Dockerfile index 737a67252..91deca96d 100644 --- a/docker-images/3.2/centos/Dockerfile +++ b/docker-images/3.2/centos/Dockerfile @@ -341,6 +341,7 @@ RUN \ --enable-libfdk_aac \ --enable-libkvazaar \ \ + \ --enable-postproc \ --enable-small \ --enable-version3 \ diff --git a/docker-images/3.2/scratch/Dockerfile b/docker-images/3.2/scratch/Dockerfile index fc989637f..c6ccc2b18 100644 --- a/docker-images/3.2/scratch/Dockerfile +++ b/docker-images/3.2/scratch/Dockerfile @@ -337,6 +337,7 @@ RUN \ --enable-libfdk_aac \ --enable-libkvazaar \ \ + \ --enable-postproc \ --enable-small \ --enable-version3 \ diff --git a/docker-images/3.2/ubuntu/Dockerfile b/docker-images/3.2/ubuntu/Dockerfile index f380390b9..c583b0e5d 100644 --- a/docker-images/3.2/ubuntu/Dockerfile +++ b/docker-images/3.2/ubuntu/Dockerfile @@ -342,6 +342,7 @@ RUN \ --enable-libfdk_aac \ --enable-libkvazaar \ \ + \ --enable-postproc \ --enable-small \ --enable-version3 \ diff --git a/docker-images/3.2/vaapi/Dockerfile b/docker-images/3.2/vaapi/Dockerfile index 85f891cfe..7cb601d53 100644 --- a/docker-images/3.2/vaapi/Dockerfile +++ b/docker-images/3.2/vaapi/Dockerfile @@ -344,6 +344,7 @@ RUN \ --enable-libfdk_aac \ --enable-libkvazaar \ \ + \ --enable-postproc \ --enable-small \ --enable-version3 \ diff --git a/docker-images/3.3/alpine/Dockerfile b/docker-images/3.3/alpine/Dockerfile index 2543f1aec..210b3a912 100644 --- a/docker-images/3.3/alpine/Dockerfile +++ b/docker-images/3.3/alpine/Dockerfile @@ -340,6 +340,7 @@ RUN \ --enable-libfdk_aac \ --enable-libkvazaar \ \ + \ --enable-postproc \ --enable-small \ --enable-version3 \ diff --git a/docker-images/3.3/centos/Dockerfile b/docker-images/3.3/centos/Dockerfile index 33e630187..71130d39e 100644 --- a/docker-images/3.3/centos/Dockerfile +++ b/docker-images/3.3/centos/Dockerfile @@ -341,6 +341,7 @@ RUN \ --enable-libfdk_aac \ --enable-libkvazaar \ \ + \ --enable-postproc \ --enable-small \ --enable-version3 \ diff --git a/docker-images/3.3/scratch/Dockerfile b/docker-images/3.3/scratch/Dockerfile index 9ad2d1b39..f848edce7 100644 --- a/docker-images/3.3/scratch/Dockerfile +++ b/docker-images/3.3/scratch/Dockerfile @@ -337,6 +337,7 @@ RUN \ --enable-libfdk_aac \ --enable-libkvazaar \ \ + \ --enable-postproc \ --enable-small \ --enable-version3 \ diff --git a/docker-images/3.3/ubuntu/Dockerfile b/docker-images/3.3/ubuntu/Dockerfile index eb2143ef8..8ee3142cf 100644 --- a/docker-images/3.3/ubuntu/Dockerfile +++ b/docker-images/3.3/ubuntu/Dockerfile @@ -342,6 +342,7 @@ RUN \ --enable-libfdk_aac \ --enable-libkvazaar \ \ + \ --enable-postproc \ --enable-small \ --enable-version3 \ diff --git a/docker-images/3.3/vaapi/Dockerfile b/docker-images/3.3/vaapi/Dockerfile index 88332ff94..bbbec066a 100644 --- a/docker-images/3.3/vaapi/Dockerfile +++ b/docker-images/3.3/vaapi/Dockerfile @@ -344,6 +344,7 @@ RUN \ --enable-libfdk_aac \ --enable-libkvazaar \ \ + \ --enable-postproc \ --enable-small \ --enable-version3 \ diff --git a/docker-images/3.4/alpine/Dockerfile b/docker-images/3.4/alpine/Dockerfile index 2f1b9cbc6..d9c642efe 100644 --- a/docker-images/3.4/alpine/Dockerfile +++ b/docker-images/3.4/alpine/Dockerfile @@ -340,6 +340,7 @@ RUN \ --enable-libfdk_aac \ --enable-libkvazaar \ \ + \ --enable-postproc \ --enable-small \ --enable-version3 \ diff --git a/docker-images/3.4/centos/Dockerfile b/docker-images/3.4/centos/Dockerfile index 5356e5a67..e33d1409a 100644 --- a/docker-images/3.4/centos/Dockerfile +++ b/docker-images/3.4/centos/Dockerfile @@ -341,6 +341,7 @@ RUN \ --enable-libfdk_aac \ --enable-libkvazaar \ \ + \ --enable-postproc \ --enable-small \ --enable-version3 \ diff --git a/docker-images/3.4/scratch/Dockerfile b/docker-images/3.4/scratch/Dockerfile index 258d4abdb..926f40be7 100644 --- a/docker-images/3.4/scratch/Dockerfile +++ b/docker-images/3.4/scratch/Dockerfile @@ -337,6 +337,7 @@ RUN \ --enable-libfdk_aac \ --enable-libkvazaar \ \ + \ --enable-postproc \ --enable-small \ --enable-version3 \ diff --git a/docker-images/3.4/ubuntu/Dockerfile b/docker-images/3.4/ubuntu/Dockerfile index 33cfe54ec..ef55a26cc 100644 --- a/docker-images/3.4/ubuntu/Dockerfile +++ b/docker-images/3.4/ubuntu/Dockerfile @@ -342,6 +342,7 @@ RUN \ --enable-libfdk_aac \ --enable-libkvazaar \ \ + \ --enable-postproc \ --enable-small \ --enable-version3 \ diff --git a/docker-images/3.4/vaapi/Dockerfile b/docker-images/3.4/vaapi/Dockerfile index c5ab51b56..a8ed7cf05 100644 --- a/docker-images/3.4/vaapi/Dockerfile +++ b/docker-images/3.4/vaapi/Dockerfile @@ -344,6 +344,7 @@ RUN \ --enable-libfdk_aac \ --enable-libkvazaar \ \ + \ --enable-postproc \ --enable-small \ --enable-version3 \ diff --git a/docker-images/4.0/alpine/Dockerfile b/docker-images/4.0/alpine/Dockerfile index 4f3cea8aa..474d7c7a7 100644 --- a/docker-images/4.0/alpine/Dockerfile +++ b/docker-images/4.0/alpine/Dockerfile @@ -344,6 +344,7 @@ RUN \ --enable-libfdk_aac \ --enable-libkvazaar \ --enable-libaom --extra-libs=-lpthread \ + \ --enable-postproc \ --enable-small \ --enable-version3 \ diff --git a/docker-images/4.0/centos/Dockerfile b/docker-images/4.0/centos/Dockerfile index 2e3c9ab2a..dc21da089 100644 --- a/docker-images/4.0/centos/Dockerfile +++ b/docker-images/4.0/centos/Dockerfile @@ -345,6 +345,7 @@ RUN \ --enable-libfdk_aac \ --enable-libkvazaar \ \ + \ --enable-postproc \ --enable-small \ --enable-version3 \ diff --git a/docker-images/4.0/scratch/Dockerfile b/docker-images/4.0/scratch/Dockerfile index 878b60be7..9ec8eb6fc 100644 --- a/docker-images/4.0/scratch/Dockerfile +++ b/docker-images/4.0/scratch/Dockerfile @@ -341,6 +341,7 @@ RUN \ --enable-libfdk_aac \ --enable-libkvazaar \ --enable-libaom --extra-libs=-lpthread \ + \ --enable-postproc \ --enable-small \ --enable-version3 \ diff --git a/docker-images/4.0/ubuntu/Dockerfile b/docker-images/4.0/ubuntu/Dockerfile index 0397334af..9a6b7dcb3 100644 --- a/docker-images/4.0/ubuntu/Dockerfile +++ b/docker-images/4.0/ubuntu/Dockerfile @@ -346,6 +346,7 @@ RUN \ --enable-libfdk_aac \ --enable-libkvazaar \ --enable-libaom --extra-libs=-lpthread \ + \ --enable-postproc \ --enable-small \ --enable-version3 \ diff --git a/docker-images/4.0/vaapi/Dockerfile b/docker-images/4.0/vaapi/Dockerfile index f6d1d5acd..2b40f0984 100644 --- a/docker-images/4.0/vaapi/Dockerfile +++ b/docker-images/4.0/vaapi/Dockerfile @@ -348,6 +348,7 @@ RUN \ --enable-libfdk_aac \ --enable-libkvazaar \ --enable-libaom --extra-libs=-lpthread \ + \ --enable-postproc \ --enable-small \ --enable-version3 \ diff --git a/docker-images/4.1/alpine/Dockerfile b/docker-images/4.1/alpine/Dockerfile index 1ad99e164..fc24ae29e 100644 --- a/docker-images/4.1/alpine/Dockerfile +++ b/docker-images/4.1/alpine/Dockerfile @@ -18,7 +18,7 @@ ARG LD_LIBRARY_PATH=/opt/ffmpeg/lib ARG PREFIX=/opt/ffmpeg ARG MAKEFLAGS="-j2" -ENV FFMPEG_VERSION=4.1 \ +ENV FFMPEG_VERSION=4.1.1 \ FDKAAC_VERSION=0.1.5 \ LAME_VERSION=3.99.5 \ LIBASS_VERSION=0.13.7 \ @@ -310,6 +310,21 @@ RUN \ curl -sLO https://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \ tar -jx --strip-components=1 -f ffmpeg-${FFMPEG_VERSION}.tar.bz2 +# SVT Codecs +# Add https://github.com/OpenVisualCloud/SVT-VP9 later +RUN \ + DIR=/tmp/svt && mkdir -p ${DIR} && cd ${DIR} && \ + git clone https://github.com/OpenVisualCloud/SVT-AV1 && \ + git clone https://github.com/intel/SVT-HEVC && \ + cd SVT-AV1 && cd Build && cmake .. && make -j `nproc` && make install && \ + cd SVT-HEVC && cd Build && cmake .. && make -j `nproc` && make install + +# Add ${DIR2}/SVT-VP9/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch later +RUN \ + DIR=/tmp/ffmpeg && DIR2=/tmp/svt && mkdir -p ${DIR} && mkdir -p ${DIR2} && cd ${DIR} && \ + git apply ${DIR2}/SVT-HEVC/ffmpeg_plugin/0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch && \ + git apply ${DIR2}/SVT-HEVC/ffmpeg_plugin/0002-doc-Add-libsvt_hevc-encoder-docs.patch && \ + git apply ${DIR2}/SVT-AV1/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-av1-with-svt-hevc.patch RUN \ @@ -340,6 +355,9 @@ RUN \ --enable-libfdk_aac \ --enable-libkvazaar \ --enable-libaom --extra-libs=-lpthread \ + --enable-libsvthevc \ +--enable-libsvtav1 \ + \ --enable-postproc \ --enable-small \ --enable-version3 \ diff --git a/docker-images/4.1/centos/Dockerfile b/docker-images/4.1/centos/Dockerfile index b4e4a0576..e57c3254e 100644 --- a/docker-images/4.1/centos/Dockerfile +++ b/docker-images/4.1/centos/Dockerfile @@ -20,7 +20,7 @@ ARG LD_LIBRARY_PATH=/opt/ffmpeg/lib ARG PREFIX=/opt/ffmpeg ARG MAKEFLAGS="-j2" -ENV FFMPEG_VERSION=4.1 \ +ENV FFMPEG_VERSION=4.1.1 \ FDKAAC_VERSION=0.1.5 \ LAME_VERSION=3.99.5 \ LIBASS_VERSION=0.13.7 \ @@ -311,6 +311,21 @@ RUN \ curl -sLO https://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \ tar -jx --strip-components=1 -f ffmpeg-${FFMPEG_VERSION}.tar.bz2 +# SVT Codecs +# Add https://github.com/OpenVisualCloud/SVT-VP9 later +RUN \ + DIR=/tmp/svt && mkdir -p ${DIR} && cd ${DIR} && \ + git clone https://github.com/OpenVisualCloud/SVT-AV1 && \ + git clone https://github.com/intel/SVT-HEVC && \ + cd SVT-AV1 && cd Build && cmake .. && make -j `nproc` && make install && \ + cd SVT-HEVC && cd Build && cmake .. && make -j `nproc` && make install + +# Add ${DIR2}/SVT-VP9/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch later +RUN \ + DIR=/tmp/ffmpeg && DIR2=/tmp/svt && mkdir -p ${DIR} && mkdir -p ${DIR2} && cd ${DIR} && \ + git apply ${DIR2}/SVT-HEVC/ffmpeg_plugin/0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch && \ + git apply ${DIR2}/SVT-HEVC/ffmpeg_plugin/0002-doc-Add-libsvt_hevc-encoder-docs.patch && \ + git apply ${DIR2}/SVT-AV1/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-av1-with-svt-hevc.patch RUN \ @@ -341,6 +356,9 @@ RUN \ --enable-libfdk_aac \ --enable-libkvazaar \ \ + --enable-libsvthevc \ +--enable-libsvtav1 \ + \ --enable-postproc \ --enable-small \ --enable-version3 \ diff --git a/docker-images/4.1/scratch/Dockerfile b/docker-images/4.1/scratch/Dockerfile index 81bb62251..63d795cf0 100644 --- a/docker-images/4.1/scratch/Dockerfile +++ b/docker-images/4.1/scratch/Dockerfile @@ -13,7 +13,7 @@ ARG LD_LIBRARY_PATH=/opt/ffmpeg/lib ARG PREFIX=/opt/ffmpeg ARG MAKEFLAGS="-j2" -ENV FFMPEG_VERSION=4.1 \ +ENV FFMPEG_VERSION=4.1.1 \ FDKAAC_VERSION=0.1.5 \ LAME_VERSION=3.99.5 \ LIBASS_VERSION=0.13.7 \ @@ -307,6 +307,21 @@ RUN \ curl -sLO https://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \ tar -jx --strip-components=1 -f ffmpeg-${FFMPEG_VERSION}.tar.bz2 +# SVT Codecs +# Add https://github.com/OpenVisualCloud/SVT-VP9 later +RUN \ + DIR=/tmp/svt && mkdir -p ${DIR} && cd ${DIR} && \ + git clone https://github.com/OpenVisualCloud/SVT-AV1 && \ + git clone https://github.com/intel/SVT-HEVC && \ + cd SVT-AV1 && cd Build && cmake .. && make -j `nproc` && make install && \ + cd SVT-HEVC && cd Build && cmake .. && make -j `nproc` && make install + +# Add ${DIR2}/SVT-VP9/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch later +RUN \ + DIR=/tmp/ffmpeg && DIR2=/tmp/svt && mkdir -p ${DIR} && mkdir -p ${DIR2} && cd ${DIR} && \ + git apply ${DIR2}/SVT-HEVC/ffmpeg_plugin/0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch && \ + git apply ${DIR2}/SVT-HEVC/ffmpeg_plugin/0002-doc-Add-libsvt_hevc-encoder-docs.patch && \ + git apply ${DIR2}/SVT-AV1/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-av1-with-svt-hevc.patch RUN \ @@ -337,6 +352,9 @@ RUN \ --enable-libfdk_aac \ --enable-libkvazaar \ --enable-libaom --extra-libs=-lpthread \ + --enable-libsvthevc \ +--enable-libsvtav1 \ + \ --enable-postproc \ --enable-small \ --enable-version3 \ diff --git a/docker-images/4.1/ubuntu/Dockerfile b/docker-images/4.1/ubuntu/Dockerfile index 1e344ca4d..1421d7419 100644 --- a/docker-images/4.1/ubuntu/Dockerfile +++ b/docker-images/4.1/ubuntu/Dockerfile @@ -21,7 +21,7 @@ ARG LD_LIBRARY_PATH=/opt/ffmpeg/lib ARG PREFIX=/opt/ffmpeg ARG MAKEFLAGS="-j2" -ENV FFMPEG_VERSION=4.1 \ +ENV FFMPEG_VERSION=4.1.1 \ FDKAAC_VERSION=0.1.5 \ LAME_VERSION=3.99.5 \ LIBASS_VERSION=0.13.7 \ @@ -312,6 +312,21 @@ RUN \ curl -sLO https://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \ tar -jx --strip-components=1 -f ffmpeg-${FFMPEG_VERSION}.tar.bz2 +# SVT Codecs +# Add https://github.com/OpenVisualCloud/SVT-VP9 later +RUN \ + DIR=/tmp/svt && mkdir -p ${DIR} && cd ${DIR} && \ + git clone https://github.com/OpenVisualCloud/SVT-AV1 && \ + git clone https://github.com/intel/SVT-HEVC && \ + cd SVT-AV1 && cd Build && cmake .. && make -j `nproc` && make install && \ + cd SVT-HEVC && cd Build && cmake .. && make -j `nproc` && make install + +# Add ${DIR2}/SVT-VP9/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch later +RUN \ + DIR=/tmp/ffmpeg && DIR2=/tmp/svt && mkdir -p ${DIR} && mkdir -p ${DIR2} && cd ${DIR} && \ + git apply ${DIR2}/SVT-HEVC/ffmpeg_plugin/0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch && \ + git apply ${DIR2}/SVT-HEVC/ffmpeg_plugin/0002-doc-Add-libsvt_hevc-encoder-docs.patch && \ + git apply ${DIR2}/SVT-AV1/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-av1-with-svt-hevc.patch RUN \ @@ -342,6 +357,9 @@ RUN \ --enable-libfdk_aac \ --enable-libkvazaar \ --enable-libaom --extra-libs=-lpthread \ + --enable-libsvthevc \ +--enable-libsvtav1 \ + \ --enable-postproc \ --enable-small \ --enable-version3 \ diff --git a/docker-images/4.1/vaapi/Dockerfile b/docker-images/4.1/vaapi/Dockerfile index f1b9fe75c..40d4abaa6 100644 --- a/docker-images/4.1/vaapi/Dockerfile +++ b/docker-images/4.1/vaapi/Dockerfile @@ -21,7 +21,7 @@ ARG LD_LIBRARY_PATH=/opt/ffmpeg/lib ARG PREFIX=/opt/ffmpeg ARG MAKEFLAGS="-j2" -ENV FFMPEG_VERSION=4.1 \ +ENV FFMPEG_VERSION=4.1.1 \ FDKAAC_VERSION=0.1.5 \ LAME_VERSION=3.99.5 \ LIBASS_VERSION=0.13.7 \ @@ -313,6 +313,21 @@ RUN \ curl -sLO https://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \ tar -jx --strip-components=1 -f ffmpeg-${FFMPEG_VERSION}.tar.bz2 +# SVT Codecs +# Add https://github.com/OpenVisualCloud/SVT-VP9 later +RUN \ + DIR=/tmp/svt && mkdir -p ${DIR} && cd ${DIR} && \ + git clone https://github.com/OpenVisualCloud/SVT-AV1 && \ + git clone https://github.com/intel/SVT-HEVC && \ + cd SVT-AV1 && cd Build && cmake .. && make -j `nproc` && make install && \ + cd SVT-HEVC && cd Build && cmake .. && make -j `nproc` && make install + +# Add ${DIR2}/SVT-VP9/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch later +RUN \ + DIR=/tmp/ffmpeg && DIR2=/tmp/svt && mkdir -p ${DIR} && mkdir -p ${DIR2} && cd ${DIR} && \ + git apply ${DIR2}/SVT-HEVC/ffmpeg_plugin/0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch && \ + git apply ${DIR2}/SVT-HEVC/ffmpeg_plugin/0002-doc-Add-libsvt_hevc-encoder-docs.patch && \ + git apply ${DIR2}/SVT-AV1/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-av1-with-svt-hevc.patch RUN \ @@ -344,6 +359,9 @@ RUN \ --enable-libfdk_aac \ --enable-libkvazaar \ --enable-libaom --extra-libs=-lpthread \ + --enable-libsvthevc \ +--enable-libsvtav1 \ + \ --enable-postproc \ --enable-small \ --enable-version3 \ diff --git a/docker-images/snapshot/alpine/Dockerfile b/docker-images/snapshot/alpine/Dockerfile index f314f76a8..8d84d0e92 100644 --- a/docker-images/snapshot/alpine/Dockerfile +++ b/docker-images/snapshot/alpine/Dockerfile @@ -310,6 +310,21 @@ RUN \ curl -sLO https://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \ tar -jx --strip-components=1 -f ffmpeg-${FFMPEG_VERSION}.tar.bz2 +# SVT Codecs +# Add https://github.com/OpenVisualCloud/SVT-VP9 later +RUN \ + DIR=/tmp/svt && mkdir -p ${DIR} && cd ${DIR} && \ + git clone https://github.com/OpenVisualCloud/SVT-AV1 && \ + git clone https://github.com/intel/SVT-HEVC && \ + cd SVT-AV1 && cd Build && cmake .. && make -j `nproc` && make install && \ + cd SVT-HEVC && cd Build && cmake .. && make -j `nproc` && make install + +# Add ${DIR2}/SVT-VP9/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch later +RUN \ + DIR=/tmp/ffmpeg && DIR2=/tmp/svt && mkdir -p ${DIR} && mkdir -p ${DIR2} && cd ${DIR} && \ + git apply ${DIR2}/SVT-HEVC/ffmpeg_plugin/0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch && \ + git apply ${DIR2}/SVT-HEVC/ffmpeg_plugin/0002-doc-Add-libsvt_hevc-encoder-docs.patch && \ + git apply ${DIR2}/SVT-AV1/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-av1-with-svt-hevc.patch RUN \ @@ -340,6 +355,9 @@ RUN \ --enable-libfdk_aac \ --enable-libkvazaar \ --enable-libaom --extra-libs=-lpthread \ + --enable-libsvthevc \ +--enable-libsvtav1 \ + \ --enable-postproc \ --enable-small \ --enable-version3 \ diff --git a/docker-images/snapshot/centos/Dockerfile b/docker-images/snapshot/centos/Dockerfile index 8af713c3f..10b3bc44e 100644 --- a/docker-images/snapshot/centos/Dockerfile +++ b/docker-images/snapshot/centos/Dockerfile @@ -311,6 +311,21 @@ RUN \ curl -sLO https://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \ tar -jx --strip-components=1 -f ffmpeg-${FFMPEG_VERSION}.tar.bz2 +# SVT Codecs +# Add https://github.com/OpenVisualCloud/SVT-VP9 later +RUN \ + DIR=/tmp/svt && mkdir -p ${DIR} && cd ${DIR} && \ + git clone https://github.com/OpenVisualCloud/SVT-AV1 && \ + git clone https://github.com/intel/SVT-HEVC && \ + cd SVT-AV1 && cd Build && cmake .. && make -j `nproc` && make install && \ + cd SVT-HEVC && cd Build && cmake .. && make -j `nproc` && make install + +# Add ${DIR2}/SVT-VP9/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch later +RUN \ + DIR=/tmp/ffmpeg && DIR2=/tmp/svt && mkdir -p ${DIR} && mkdir -p ${DIR2} && cd ${DIR} && \ + git apply ${DIR2}/SVT-HEVC/ffmpeg_plugin/0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch && \ + git apply ${DIR2}/SVT-HEVC/ffmpeg_plugin/0002-doc-Add-libsvt_hevc-encoder-docs.patch && \ + git apply ${DIR2}/SVT-AV1/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-av1-with-svt-hevc.patch RUN \ @@ -341,6 +356,9 @@ RUN \ --enable-libfdk_aac \ --enable-libkvazaar \ \ + --enable-libsvthevc \ +--enable-libsvtav1 \ + \ --enable-postproc \ --enable-small \ --enable-version3 \ diff --git a/docker-images/snapshot/scratch/Dockerfile b/docker-images/snapshot/scratch/Dockerfile index ee4bdeb19..fa14a9f32 100644 --- a/docker-images/snapshot/scratch/Dockerfile +++ b/docker-images/snapshot/scratch/Dockerfile @@ -307,6 +307,21 @@ RUN \ curl -sLO https://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \ tar -jx --strip-components=1 -f ffmpeg-${FFMPEG_VERSION}.tar.bz2 +# SVT Codecs +# Add https://github.com/OpenVisualCloud/SVT-VP9 later +RUN \ + DIR=/tmp/svt && mkdir -p ${DIR} && cd ${DIR} && \ + git clone https://github.com/OpenVisualCloud/SVT-AV1 && \ + git clone https://github.com/intel/SVT-HEVC && \ + cd SVT-AV1 && cd Build && cmake .. && make -j `nproc` && make install && \ + cd SVT-HEVC && cd Build && cmake .. && make -j `nproc` && make install + +# Add ${DIR2}/SVT-VP9/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch later +RUN \ + DIR=/tmp/ffmpeg && DIR2=/tmp/svt && mkdir -p ${DIR} && mkdir -p ${DIR2} && cd ${DIR} && \ + git apply ${DIR2}/SVT-HEVC/ffmpeg_plugin/0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch && \ + git apply ${DIR2}/SVT-HEVC/ffmpeg_plugin/0002-doc-Add-libsvt_hevc-encoder-docs.patch && \ + git apply ${DIR2}/SVT-AV1/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-av1-with-svt-hevc.patch RUN \ @@ -337,6 +352,9 @@ RUN \ --enable-libfdk_aac \ --enable-libkvazaar \ --enable-libaom --extra-libs=-lpthread \ + --enable-libsvthevc \ +--enable-libsvtav1 \ + \ --enable-postproc \ --enable-small \ --enable-version3 \ diff --git a/docker-images/snapshot/ubuntu/Dockerfile b/docker-images/snapshot/ubuntu/Dockerfile index 46bd966b8..ee650059e 100644 --- a/docker-images/snapshot/ubuntu/Dockerfile +++ b/docker-images/snapshot/ubuntu/Dockerfile @@ -312,6 +312,21 @@ RUN \ curl -sLO https://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \ tar -jx --strip-components=1 -f ffmpeg-${FFMPEG_VERSION}.tar.bz2 +# SVT Codecs +# Add https://github.com/OpenVisualCloud/SVT-VP9 later +RUN \ + DIR=/tmp/svt && mkdir -p ${DIR} && cd ${DIR} && \ + git clone https://github.com/OpenVisualCloud/SVT-AV1 && \ + git clone https://github.com/intel/SVT-HEVC && \ + cd SVT-AV1 && cd Build && cmake .. && make -j `nproc` && make install && \ + cd SVT-HEVC && cd Build && cmake .. && make -j `nproc` && make install + +# Add ${DIR2}/SVT-VP9/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch later +RUN \ + DIR=/tmp/ffmpeg && DIR2=/tmp/svt && mkdir -p ${DIR} && mkdir -p ${DIR2} && cd ${DIR} && \ + git apply ${DIR2}/SVT-HEVC/ffmpeg_plugin/0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch && \ + git apply ${DIR2}/SVT-HEVC/ffmpeg_plugin/0002-doc-Add-libsvt_hevc-encoder-docs.patch && \ + git apply ${DIR2}/SVT-AV1/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-av1-with-svt-hevc.patch RUN \ @@ -342,6 +357,9 @@ RUN \ --enable-libfdk_aac \ --enable-libkvazaar \ --enable-libaom --extra-libs=-lpthread \ + --enable-libsvthevc \ +--enable-libsvtav1 \ + \ --enable-postproc \ --enable-small \ --enable-version3 \ diff --git a/docker-images/snapshot/vaapi/Dockerfile b/docker-images/snapshot/vaapi/Dockerfile index 41e008093..da1e75a7c 100644 --- a/docker-images/snapshot/vaapi/Dockerfile +++ b/docker-images/snapshot/vaapi/Dockerfile @@ -313,6 +313,21 @@ RUN \ curl -sLO https://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \ tar -jx --strip-components=1 -f ffmpeg-${FFMPEG_VERSION}.tar.bz2 +# SVT Codecs +# Add https://github.com/OpenVisualCloud/SVT-VP9 later +RUN \ + DIR=/tmp/svt && mkdir -p ${DIR} && cd ${DIR} && \ + git clone https://github.com/OpenVisualCloud/SVT-AV1 && \ + git clone https://github.com/intel/SVT-HEVC && \ + cd SVT-AV1 && cd Build && cmake .. && make -j `nproc` && make install && \ + cd SVT-HEVC && cd Build && cmake .. && make -j `nproc` && make install + +# Add ${DIR2}/SVT-VP9/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch later +RUN \ + DIR=/tmp/ffmpeg && DIR2=/tmp/svt && mkdir -p ${DIR} && mkdir -p ${DIR2} && cd ${DIR} && \ + git apply ${DIR2}/SVT-HEVC/ffmpeg_plugin/0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch && \ + git apply ${DIR2}/SVT-HEVC/ffmpeg_plugin/0002-doc-Add-libsvt_hevc-encoder-docs.patch && \ + git apply ${DIR2}/SVT-AV1/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-av1-with-svt-hevc.patch RUN \ @@ -344,6 +359,9 @@ RUN \ --enable-libfdk_aac \ --enable-libkvazaar \ --enable-libaom --extra-libs=-lpthread \ + --enable-libsvthevc \ +--enable-libsvtav1 \ + \ --enable-postproc \ --enable-small \ --enable-version3 \ diff --git a/templates/Dockerfile-run b/templates/Dockerfile-run index 4c767bd10..0950d9f95 100644 --- a/templates/Dockerfile-run +++ b/templates/Dockerfile-run @@ -265,6 +265,7 @@ RUN \ --enable-libfdk_aac \ --enable-libkvazaar \ --enable-libaom --extra-libs=-lpthread \ + %%ENABLE_PATCH_CODECS%% \ --enable-postproc \ --enable-small \ --enable-version3 \ diff --git a/update.py b/update.py index f481e3c19..a95baac4b 100755 --- a/update.py +++ b/update.py @@ -80,11 +80,18 @@ docker_content = docker_content.replace('libva2', 'libva1') patch = '' + patch2 = '' + if (version[0] > '4' or (version[0] == '4' and version[2] >= '1')) or version == 'snapshot': + with open('templates/Dockerfile-patch-SVT', 'r') as tmpfile: + patch += tmpfile.read() + with open('templates/Dockerfile-patch-SVT-enable', 'r') as tmpfile: + patch2 += tmpfile.read() if version[0:3] == '4.0': with open('templates/Dockerfile-patch-4.0', 'r') as tmpfile: - patch = tmpfile.read() + patch += tmpfile.read() docker_content = docker_content.replace('%%FFMPEG_PATCH%%', patch) + docker_content = docker_content.replace('%%ENABLE_PATCH_CODECS%%', patch2) d = os.path.dirname(dockerfile) if not os.path.exists(d): From a89783654d291adb07a3082a8369055bba47d0b8 Mon Sep 17 00:00:00 2001 From: ILOVEPIE Date: Mon, 11 Mar 2019 22:18:52 +0000 Subject: [PATCH 3/7] SVT Support 3 --- docker-images/4.1/alpine/Dockerfile | 4 ++-- docker-images/4.1/centos/Dockerfile | 4 ++-- docker-images/4.1/scratch/Dockerfile | 4 ++-- docker-images/4.1/ubuntu/Dockerfile | 4 ++-- docker-images/4.1/vaapi/Dockerfile | 4 ++-- docker-images/snapshot/alpine/Dockerfile | 4 ++-- docker-images/snapshot/centos/Dockerfile | 4 ++-- docker-images/snapshot/scratch/Dockerfile | 4 ++-- docker-images/snapshot/ubuntu/Dockerfile | 4 ++-- docker-images/snapshot/vaapi/Dockerfile | 4 ++-- templates/Dockerfile-patch-SVT | 4 ++-- 11 files changed, 22 insertions(+), 22 deletions(-) diff --git a/docker-images/4.1/alpine/Dockerfile b/docker-images/4.1/alpine/Dockerfile index fc24ae29e..2840102f2 100644 --- a/docker-images/4.1/alpine/Dockerfile +++ b/docker-images/4.1/alpine/Dockerfile @@ -316,8 +316,8 @@ RUN \ DIR=/tmp/svt && mkdir -p ${DIR} && cd ${DIR} && \ git clone https://github.com/OpenVisualCloud/SVT-AV1 && \ git clone https://github.com/intel/SVT-HEVC && \ - cd SVT-AV1 && cd Build && cmake .. && make -j `nproc` && make install && \ - cd SVT-HEVC && cd Build && cmake .. && make -j `nproc` && make install + cd ${DIR}/SVT-AV1 && cd Build/linux && build.sh release && cd linux && make install && \ + cd ${DIR}/SVT-HEVC && cd Build/linux && build.sh release && cd linux && make install # Add ${DIR2}/SVT-VP9/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch later RUN \ diff --git a/docker-images/4.1/centos/Dockerfile b/docker-images/4.1/centos/Dockerfile index e57c3254e..e809b341d 100644 --- a/docker-images/4.1/centos/Dockerfile +++ b/docker-images/4.1/centos/Dockerfile @@ -317,8 +317,8 @@ RUN \ DIR=/tmp/svt && mkdir -p ${DIR} && cd ${DIR} && \ git clone https://github.com/OpenVisualCloud/SVT-AV1 && \ git clone https://github.com/intel/SVT-HEVC && \ - cd SVT-AV1 && cd Build && cmake .. && make -j `nproc` && make install && \ - cd SVT-HEVC && cd Build && cmake .. && make -j `nproc` && make install + cd ${DIR}/SVT-AV1 && cd Build/linux && build.sh release && cd linux && make install && \ + cd ${DIR}/SVT-HEVC && cd Build/linux && build.sh release && cd linux && make install # Add ${DIR2}/SVT-VP9/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch later RUN \ diff --git a/docker-images/4.1/scratch/Dockerfile b/docker-images/4.1/scratch/Dockerfile index 63d795cf0..06aadea80 100644 --- a/docker-images/4.1/scratch/Dockerfile +++ b/docker-images/4.1/scratch/Dockerfile @@ -313,8 +313,8 @@ RUN \ DIR=/tmp/svt && mkdir -p ${DIR} && cd ${DIR} && \ git clone https://github.com/OpenVisualCloud/SVT-AV1 && \ git clone https://github.com/intel/SVT-HEVC && \ - cd SVT-AV1 && cd Build && cmake .. && make -j `nproc` && make install && \ - cd SVT-HEVC && cd Build && cmake .. && make -j `nproc` && make install + cd ${DIR}/SVT-AV1 && cd Build/linux && build.sh release && cd linux && make install && \ + cd ${DIR}/SVT-HEVC && cd Build/linux && build.sh release && cd linux && make install # Add ${DIR2}/SVT-VP9/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch later RUN \ diff --git a/docker-images/4.1/ubuntu/Dockerfile b/docker-images/4.1/ubuntu/Dockerfile index 1421d7419..2e4df1fb8 100644 --- a/docker-images/4.1/ubuntu/Dockerfile +++ b/docker-images/4.1/ubuntu/Dockerfile @@ -318,8 +318,8 @@ RUN \ DIR=/tmp/svt && mkdir -p ${DIR} && cd ${DIR} && \ git clone https://github.com/OpenVisualCloud/SVT-AV1 && \ git clone https://github.com/intel/SVT-HEVC && \ - cd SVT-AV1 && cd Build && cmake .. && make -j `nproc` && make install && \ - cd SVT-HEVC && cd Build && cmake .. && make -j `nproc` && make install + cd ${DIR}/SVT-AV1 && cd Build/linux && build.sh release && cd linux && make install && \ + cd ${DIR}/SVT-HEVC && cd Build/linux && build.sh release && cd linux && make install # Add ${DIR2}/SVT-VP9/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch later RUN \ diff --git a/docker-images/4.1/vaapi/Dockerfile b/docker-images/4.1/vaapi/Dockerfile index 40d4abaa6..6ee4392c0 100644 --- a/docker-images/4.1/vaapi/Dockerfile +++ b/docker-images/4.1/vaapi/Dockerfile @@ -319,8 +319,8 @@ RUN \ DIR=/tmp/svt && mkdir -p ${DIR} && cd ${DIR} && \ git clone https://github.com/OpenVisualCloud/SVT-AV1 && \ git clone https://github.com/intel/SVT-HEVC && \ - cd SVT-AV1 && cd Build && cmake .. && make -j `nproc` && make install && \ - cd SVT-HEVC && cd Build && cmake .. && make -j `nproc` && make install + cd ${DIR}/SVT-AV1 && cd Build/linux && build.sh release && cd linux && make install && \ + cd ${DIR}/SVT-HEVC && cd Build/linux && build.sh release && cd linux && make install # Add ${DIR2}/SVT-VP9/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch later RUN \ diff --git a/docker-images/snapshot/alpine/Dockerfile b/docker-images/snapshot/alpine/Dockerfile index 8d84d0e92..dd13e8eb5 100644 --- a/docker-images/snapshot/alpine/Dockerfile +++ b/docker-images/snapshot/alpine/Dockerfile @@ -316,8 +316,8 @@ RUN \ DIR=/tmp/svt && mkdir -p ${DIR} && cd ${DIR} && \ git clone https://github.com/OpenVisualCloud/SVT-AV1 && \ git clone https://github.com/intel/SVT-HEVC && \ - cd SVT-AV1 && cd Build && cmake .. && make -j `nproc` && make install && \ - cd SVT-HEVC && cd Build && cmake .. && make -j `nproc` && make install + cd ${DIR}/SVT-AV1 && cd Build/linux && build.sh release && cd linux && make install && \ + cd ${DIR}/SVT-HEVC && cd Build/linux && build.sh release && cd linux && make install # Add ${DIR2}/SVT-VP9/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch later RUN \ diff --git a/docker-images/snapshot/centos/Dockerfile b/docker-images/snapshot/centos/Dockerfile index 10b3bc44e..f887a25d4 100644 --- a/docker-images/snapshot/centos/Dockerfile +++ b/docker-images/snapshot/centos/Dockerfile @@ -317,8 +317,8 @@ RUN \ DIR=/tmp/svt && mkdir -p ${DIR} && cd ${DIR} && \ git clone https://github.com/OpenVisualCloud/SVT-AV1 && \ git clone https://github.com/intel/SVT-HEVC && \ - cd SVT-AV1 && cd Build && cmake .. && make -j `nproc` && make install && \ - cd SVT-HEVC && cd Build && cmake .. && make -j `nproc` && make install + cd ${DIR}/SVT-AV1 && cd Build/linux && build.sh release && cd linux && make install && \ + cd ${DIR}/SVT-HEVC && cd Build/linux && build.sh release && cd linux && make install # Add ${DIR2}/SVT-VP9/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch later RUN \ diff --git a/docker-images/snapshot/scratch/Dockerfile b/docker-images/snapshot/scratch/Dockerfile index fa14a9f32..a6f55ad0d 100644 --- a/docker-images/snapshot/scratch/Dockerfile +++ b/docker-images/snapshot/scratch/Dockerfile @@ -313,8 +313,8 @@ RUN \ DIR=/tmp/svt && mkdir -p ${DIR} && cd ${DIR} && \ git clone https://github.com/OpenVisualCloud/SVT-AV1 && \ git clone https://github.com/intel/SVT-HEVC && \ - cd SVT-AV1 && cd Build && cmake .. && make -j `nproc` && make install && \ - cd SVT-HEVC && cd Build && cmake .. && make -j `nproc` && make install + cd ${DIR}/SVT-AV1 && cd Build/linux && build.sh release && cd linux && make install && \ + cd ${DIR}/SVT-HEVC && cd Build/linux && build.sh release && cd linux && make install # Add ${DIR2}/SVT-VP9/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch later RUN \ diff --git a/docker-images/snapshot/ubuntu/Dockerfile b/docker-images/snapshot/ubuntu/Dockerfile index ee650059e..8231afa1c 100644 --- a/docker-images/snapshot/ubuntu/Dockerfile +++ b/docker-images/snapshot/ubuntu/Dockerfile @@ -318,8 +318,8 @@ RUN \ DIR=/tmp/svt && mkdir -p ${DIR} && cd ${DIR} && \ git clone https://github.com/OpenVisualCloud/SVT-AV1 && \ git clone https://github.com/intel/SVT-HEVC && \ - cd SVT-AV1 && cd Build && cmake .. && make -j `nproc` && make install && \ - cd SVT-HEVC && cd Build && cmake .. && make -j `nproc` && make install + cd ${DIR}/SVT-AV1 && cd Build/linux && build.sh release && cd linux && make install && \ + cd ${DIR}/SVT-HEVC && cd Build/linux && build.sh release && cd linux && make install # Add ${DIR2}/SVT-VP9/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch later RUN \ diff --git a/docker-images/snapshot/vaapi/Dockerfile b/docker-images/snapshot/vaapi/Dockerfile index da1e75a7c..08c6fd251 100644 --- a/docker-images/snapshot/vaapi/Dockerfile +++ b/docker-images/snapshot/vaapi/Dockerfile @@ -319,8 +319,8 @@ RUN \ DIR=/tmp/svt && mkdir -p ${DIR} && cd ${DIR} && \ git clone https://github.com/OpenVisualCloud/SVT-AV1 && \ git clone https://github.com/intel/SVT-HEVC && \ - cd SVT-AV1 && cd Build && cmake .. && make -j `nproc` && make install && \ - cd SVT-HEVC && cd Build && cmake .. && make -j `nproc` && make install + cd ${DIR}/SVT-AV1 && cd Build/linux && build.sh release && cd linux && make install && \ + cd ${DIR}/SVT-HEVC && cd Build/linux && build.sh release && cd linux && make install # Add ${DIR2}/SVT-VP9/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch later RUN \ diff --git a/templates/Dockerfile-patch-SVT b/templates/Dockerfile-patch-SVT index 26ca3d754..221f2456d 100644 --- a/templates/Dockerfile-patch-SVT +++ b/templates/Dockerfile-patch-SVT @@ -4,8 +4,8 @@ RUN \ DIR=/tmp/svt && mkdir -p ${DIR} && cd ${DIR} && \ git clone https://github.com/OpenVisualCloud/SVT-AV1 && \ git clone https://github.com/intel/SVT-HEVC && \ - cd SVT-AV1 && cd Build && cmake .. && make -j `nproc` && make install && \ - cd SVT-HEVC && cd Build && cmake .. && make -j `nproc` && make install + cd ${DIR}/SVT-AV1 && cd Build/linux && build.sh release && cd linux && make install && \ + cd ${DIR}/SVT-HEVC && cd Build/linux && build.sh release && cd linux && make install # Add ${DIR2}/SVT-VP9/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch later RUN \ From 345dcdf9ac5578784c65dc2b69093b3bbbb8c50f Mon Sep 17 00:00:00 2001 From: ILOVEPIE Date: Mon, 11 Mar 2019 22:28:56 +0000 Subject: [PATCH 4/7] SVT Support 4 --- docker-images/4.1/alpine/Dockerfile | 4 ++-- docker-images/4.1/centos/Dockerfile | 4 ++-- docker-images/4.1/scratch/Dockerfile | 4 ++-- docker-images/4.1/ubuntu/Dockerfile | 4 ++-- docker-images/4.1/vaapi/Dockerfile | 4 ++-- docker-images/snapshot/alpine/Dockerfile | 4 ++-- docker-images/snapshot/centos/Dockerfile | 4 ++-- docker-images/snapshot/scratch/Dockerfile | 4 ++-- docker-images/snapshot/ubuntu/Dockerfile | 4 ++-- docker-images/snapshot/vaapi/Dockerfile | 4 ++-- templates/Dockerfile-patch-SVT | 4 ++-- 11 files changed, 22 insertions(+), 22 deletions(-) diff --git a/docker-images/4.1/alpine/Dockerfile b/docker-images/4.1/alpine/Dockerfile index 2840102f2..8e807f602 100644 --- a/docker-images/4.1/alpine/Dockerfile +++ b/docker-images/4.1/alpine/Dockerfile @@ -316,8 +316,8 @@ RUN \ DIR=/tmp/svt && mkdir -p ${DIR} && cd ${DIR} && \ git clone https://github.com/OpenVisualCloud/SVT-AV1 && \ git clone https://github.com/intel/SVT-HEVC && \ - cd ${DIR}/SVT-AV1 && cd Build/linux && build.sh release && cd linux && make install && \ - cd ${DIR}/SVT-HEVC && cd Build/linux && build.sh release && cd linux && make install + cd ${DIR}/SVT-AV1 && cd Build/linux && build.sh release && cd release && make install && \ + cd ${DIR}/SVT-HEVC && cd Build/linux && build.sh release && cd release && make install # Add ${DIR2}/SVT-VP9/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch later RUN \ diff --git a/docker-images/4.1/centos/Dockerfile b/docker-images/4.1/centos/Dockerfile index e809b341d..989d0149f 100644 --- a/docker-images/4.1/centos/Dockerfile +++ b/docker-images/4.1/centos/Dockerfile @@ -317,8 +317,8 @@ RUN \ DIR=/tmp/svt && mkdir -p ${DIR} && cd ${DIR} && \ git clone https://github.com/OpenVisualCloud/SVT-AV1 && \ git clone https://github.com/intel/SVT-HEVC && \ - cd ${DIR}/SVT-AV1 && cd Build/linux && build.sh release && cd linux && make install && \ - cd ${DIR}/SVT-HEVC && cd Build/linux && build.sh release && cd linux && make install + cd ${DIR}/SVT-AV1 && cd Build/linux && build.sh release && cd release && make install && \ + cd ${DIR}/SVT-HEVC && cd Build/linux && build.sh release && cd release && make install # Add ${DIR2}/SVT-VP9/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch later RUN \ diff --git a/docker-images/4.1/scratch/Dockerfile b/docker-images/4.1/scratch/Dockerfile index 06aadea80..1c8ee4d39 100644 --- a/docker-images/4.1/scratch/Dockerfile +++ b/docker-images/4.1/scratch/Dockerfile @@ -313,8 +313,8 @@ RUN \ DIR=/tmp/svt && mkdir -p ${DIR} && cd ${DIR} && \ git clone https://github.com/OpenVisualCloud/SVT-AV1 && \ git clone https://github.com/intel/SVT-HEVC && \ - cd ${DIR}/SVT-AV1 && cd Build/linux && build.sh release && cd linux && make install && \ - cd ${DIR}/SVT-HEVC && cd Build/linux && build.sh release && cd linux && make install + cd ${DIR}/SVT-AV1 && cd Build/linux && build.sh release && cd release && make install && \ + cd ${DIR}/SVT-HEVC && cd Build/linux && build.sh release && cd release && make install # Add ${DIR2}/SVT-VP9/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch later RUN \ diff --git a/docker-images/4.1/ubuntu/Dockerfile b/docker-images/4.1/ubuntu/Dockerfile index 2e4df1fb8..39ed10546 100644 --- a/docker-images/4.1/ubuntu/Dockerfile +++ b/docker-images/4.1/ubuntu/Dockerfile @@ -318,8 +318,8 @@ RUN \ DIR=/tmp/svt && mkdir -p ${DIR} && cd ${DIR} && \ git clone https://github.com/OpenVisualCloud/SVT-AV1 && \ git clone https://github.com/intel/SVT-HEVC && \ - cd ${DIR}/SVT-AV1 && cd Build/linux && build.sh release && cd linux && make install && \ - cd ${DIR}/SVT-HEVC && cd Build/linux && build.sh release && cd linux && make install + cd ${DIR}/SVT-AV1 && cd Build/linux && build.sh release && cd release && make install && \ + cd ${DIR}/SVT-HEVC && cd Build/linux && build.sh release && cd release && make install # Add ${DIR2}/SVT-VP9/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch later RUN \ diff --git a/docker-images/4.1/vaapi/Dockerfile b/docker-images/4.1/vaapi/Dockerfile index 6ee4392c0..29f30f8cd 100644 --- a/docker-images/4.1/vaapi/Dockerfile +++ b/docker-images/4.1/vaapi/Dockerfile @@ -319,8 +319,8 @@ RUN \ DIR=/tmp/svt && mkdir -p ${DIR} && cd ${DIR} && \ git clone https://github.com/OpenVisualCloud/SVT-AV1 && \ git clone https://github.com/intel/SVT-HEVC && \ - cd ${DIR}/SVT-AV1 && cd Build/linux && build.sh release && cd linux && make install && \ - cd ${DIR}/SVT-HEVC && cd Build/linux && build.sh release && cd linux && make install + cd ${DIR}/SVT-AV1 && cd Build/linux && build.sh release && cd release && make install && \ + cd ${DIR}/SVT-HEVC && cd Build/linux && build.sh release && cd release && make install # Add ${DIR2}/SVT-VP9/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch later RUN \ diff --git a/docker-images/snapshot/alpine/Dockerfile b/docker-images/snapshot/alpine/Dockerfile index dd13e8eb5..e10d4dd98 100644 --- a/docker-images/snapshot/alpine/Dockerfile +++ b/docker-images/snapshot/alpine/Dockerfile @@ -316,8 +316,8 @@ RUN \ DIR=/tmp/svt && mkdir -p ${DIR} && cd ${DIR} && \ git clone https://github.com/OpenVisualCloud/SVT-AV1 && \ git clone https://github.com/intel/SVT-HEVC && \ - cd ${DIR}/SVT-AV1 && cd Build/linux && build.sh release && cd linux && make install && \ - cd ${DIR}/SVT-HEVC && cd Build/linux && build.sh release && cd linux && make install + cd ${DIR}/SVT-AV1 && cd Build/linux && build.sh release && cd release && make install && \ + cd ${DIR}/SVT-HEVC && cd Build/linux && build.sh release && cd release && make install # Add ${DIR2}/SVT-VP9/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch later RUN \ diff --git a/docker-images/snapshot/centos/Dockerfile b/docker-images/snapshot/centos/Dockerfile index f887a25d4..4f78c2c8e 100644 --- a/docker-images/snapshot/centos/Dockerfile +++ b/docker-images/snapshot/centos/Dockerfile @@ -317,8 +317,8 @@ RUN \ DIR=/tmp/svt && mkdir -p ${DIR} && cd ${DIR} && \ git clone https://github.com/OpenVisualCloud/SVT-AV1 && \ git clone https://github.com/intel/SVT-HEVC && \ - cd ${DIR}/SVT-AV1 && cd Build/linux && build.sh release && cd linux && make install && \ - cd ${DIR}/SVT-HEVC && cd Build/linux && build.sh release && cd linux && make install + cd ${DIR}/SVT-AV1 && cd Build/linux && build.sh release && cd release && make install && \ + cd ${DIR}/SVT-HEVC && cd Build/linux && build.sh release && cd release && make install # Add ${DIR2}/SVT-VP9/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch later RUN \ diff --git a/docker-images/snapshot/scratch/Dockerfile b/docker-images/snapshot/scratch/Dockerfile index a6f55ad0d..b33fdc766 100644 --- a/docker-images/snapshot/scratch/Dockerfile +++ b/docker-images/snapshot/scratch/Dockerfile @@ -313,8 +313,8 @@ RUN \ DIR=/tmp/svt && mkdir -p ${DIR} && cd ${DIR} && \ git clone https://github.com/OpenVisualCloud/SVT-AV1 && \ git clone https://github.com/intel/SVT-HEVC && \ - cd ${DIR}/SVT-AV1 && cd Build/linux && build.sh release && cd linux && make install && \ - cd ${DIR}/SVT-HEVC && cd Build/linux && build.sh release && cd linux && make install + cd ${DIR}/SVT-AV1 && cd Build/linux && build.sh release && cd release && make install && \ + cd ${DIR}/SVT-HEVC && cd Build/linux && build.sh release && cd release && make install # Add ${DIR2}/SVT-VP9/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch later RUN \ diff --git a/docker-images/snapshot/ubuntu/Dockerfile b/docker-images/snapshot/ubuntu/Dockerfile index 8231afa1c..3c3b84c45 100644 --- a/docker-images/snapshot/ubuntu/Dockerfile +++ b/docker-images/snapshot/ubuntu/Dockerfile @@ -318,8 +318,8 @@ RUN \ DIR=/tmp/svt && mkdir -p ${DIR} && cd ${DIR} && \ git clone https://github.com/OpenVisualCloud/SVT-AV1 && \ git clone https://github.com/intel/SVT-HEVC && \ - cd ${DIR}/SVT-AV1 && cd Build/linux && build.sh release && cd linux && make install && \ - cd ${DIR}/SVT-HEVC && cd Build/linux && build.sh release && cd linux && make install + cd ${DIR}/SVT-AV1 && cd Build/linux && build.sh release && cd release && make install && \ + cd ${DIR}/SVT-HEVC && cd Build/linux && build.sh release && cd release && make install # Add ${DIR2}/SVT-VP9/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch later RUN \ diff --git a/docker-images/snapshot/vaapi/Dockerfile b/docker-images/snapshot/vaapi/Dockerfile index 08c6fd251..0f45246ef 100644 --- a/docker-images/snapshot/vaapi/Dockerfile +++ b/docker-images/snapshot/vaapi/Dockerfile @@ -319,8 +319,8 @@ RUN \ DIR=/tmp/svt && mkdir -p ${DIR} && cd ${DIR} && \ git clone https://github.com/OpenVisualCloud/SVT-AV1 && \ git clone https://github.com/intel/SVT-HEVC && \ - cd ${DIR}/SVT-AV1 && cd Build/linux && build.sh release && cd linux && make install && \ - cd ${DIR}/SVT-HEVC && cd Build/linux && build.sh release && cd linux && make install + cd ${DIR}/SVT-AV1 && cd Build/linux && build.sh release && cd release && make install && \ + cd ${DIR}/SVT-HEVC && cd Build/linux && build.sh release && cd release && make install # Add ${DIR2}/SVT-VP9/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch later RUN \ diff --git a/templates/Dockerfile-patch-SVT b/templates/Dockerfile-patch-SVT index 221f2456d..c0aad7eed 100644 --- a/templates/Dockerfile-patch-SVT +++ b/templates/Dockerfile-patch-SVT @@ -4,8 +4,8 @@ RUN \ DIR=/tmp/svt && mkdir -p ${DIR} && cd ${DIR} && \ git clone https://github.com/OpenVisualCloud/SVT-AV1 && \ git clone https://github.com/intel/SVT-HEVC && \ - cd ${DIR}/SVT-AV1 && cd Build/linux && build.sh release && cd linux && make install && \ - cd ${DIR}/SVT-HEVC && cd Build/linux && build.sh release && cd linux && make install + cd ${DIR}/SVT-AV1 && cd Build/linux && build.sh release && cd release && make install && \ + cd ${DIR}/SVT-HEVC && cd Build/linux && build.sh release && cd release && make install # Add ${DIR2}/SVT-VP9/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch later RUN \ From 2295f2a659f34e4468dba0e154a0da120aacc0a7 Mon Sep 17 00:00:00 2001 From: ILOVEPIE Date: Mon, 11 Mar 2019 22:53:03 +0000 Subject: [PATCH 5/7] SVT Support 5 --- docker-images/4.1/alpine/Dockerfile | 4 ++-- docker-images/4.1/centos/Dockerfile | 4 ++-- docker-images/4.1/scratch/Dockerfile | 4 ++-- docker-images/4.1/ubuntu/Dockerfile | 4 ++-- docker-images/4.1/vaapi/Dockerfile | 4 ++-- docker-images/snapshot/alpine/Dockerfile | 4 ++-- docker-images/snapshot/centos/Dockerfile | 4 ++-- docker-images/snapshot/scratch/Dockerfile | 4 ++-- docker-images/snapshot/ubuntu/Dockerfile | 4 ++-- docker-images/snapshot/vaapi/Dockerfile | 4 ++-- templates/Dockerfile-patch-SVT | 4 ++-- 11 files changed, 22 insertions(+), 22 deletions(-) diff --git a/docker-images/4.1/alpine/Dockerfile b/docker-images/4.1/alpine/Dockerfile index 8e807f602..07ab336ef 100644 --- a/docker-images/4.1/alpine/Dockerfile +++ b/docker-images/4.1/alpine/Dockerfile @@ -316,8 +316,8 @@ RUN \ DIR=/tmp/svt && mkdir -p ${DIR} && cd ${DIR} && \ git clone https://github.com/OpenVisualCloud/SVT-AV1 && \ git clone https://github.com/intel/SVT-HEVC && \ - cd ${DIR}/SVT-AV1 && cd Build/linux && build.sh release && cd release && make install && \ - cd ${DIR}/SVT-HEVC && cd Build/linux && build.sh release && cd release && make install + cd ${DIR}/SVT-AV1 && cd Build/linux && ./build.sh release && cd release && make install && \ + cd ${DIR}/SVT-HEVC && cd Build/linux && ./build.sh release && cd release && make install # Add ${DIR2}/SVT-VP9/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch later RUN \ diff --git a/docker-images/4.1/centos/Dockerfile b/docker-images/4.1/centos/Dockerfile index 989d0149f..eb2ff1fcf 100644 --- a/docker-images/4.1/centos/Dockerfile +++ b/docker-images/4.1/centos/Dockerfile @@ -317,8 +317,8 @@ RUN \ DIR=/tmp/svt && mkdir -p ${DIR} && cd ${DIR} && \ git clone https://github.com/OpenVisualCloud/SVT-AV1 && \ git clone https://github.com/intel/SVT-HEVC && \ - cd ${DIR}/SVT-AV1 && cd Build/linux && build.sh release && cd release && make install && \ - cd ${DIR}/SVT-HEVC && cd Build/linux && build.sh release && cd release && make install + cd ${DIR}/SVT-AV1 && cd Build/linux && ./build.sh release && cd release && make install && \ + cd ${DIR}/SVT-HEVC && cd Build/linux && ./build.sh release && cd release && make install # Add ${DIR2}/SVT-VP9/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch later RUN \ diff --git a/docker-images/4.1/scratch/Dockerfile b/docker-images/4.1/scratch/Dockerfile index 1c8ee4d39..9dcaa859b 100644 --- a/docker-images/4.1/scratch/Dockerfile +++ b/docker-images/4.1/scratch/Dockerfile @@ -313,8 +313,8 @@ RUN \ DIR=/tmp/svt && mkdir -p ${DIR} && cd ${DIR} && \ git clone https://github.com/OpenVisualCloud/SVT-AV1 && \ git clone https://github.com/intel/SVT-HEVC && \ - cd ${DIR}/SVT-AV1 && cd Build/linux && build.sh release && cd release && make install && \ - cd ${DIR}/SVT-HEVC && cd Build/linux && build.sh release && cd release && make install + cd ${DIR}/SVT-AV1 && cd Build/linux && ./build.sh release && cd release && make install && \ + cd ${DIR}/SVT-HEVC && cd Build/linux && ./build.sh release && cd release && make install # Add ${DIR2}/SVT-VP9/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch later RUN \ diff --git a/docker-images/4.1/ubuntu/Dockerfile b/docker-images/4.1/ubuntu/Dockerfile index 39ed10546..9ad2e373b 100644 --- a/docker-images/4.1/ubuntu/Dockerfile +++ b/docker-images/4.1/ubuntu/Dockerfile @@ -318,8 +318,8 @@ RUN \ DIR=/tmp/svt && mkdir -p ${DIR} && cd ${DIR} && \ git clone https://github.com/OpenVisualCloud/SVT-AV1 && \ git clone https://github.com/intel/SVT-HEVC && \ - cd ${DIR}/SVT-AV1 && cd Build/linux && build.sh release && cd release && make install && \ - cd ${DIR}/SVT-HEVC && cd Build/linux && build.sh release && cd release && make install + cd ${DIR}/SVT-AV1 && cd Build/linux && ./build.sh release && cd release && make install && \ + cd ${DIR}/SVT-HEVC && cd Build/linux && ./build.sh release && cd release && make install # Add ${DIR2}/SVT-VP9/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch later RUN \ diff --git a/docker-images/4.1/vaapi/Dockerfile b/docker-images/4.1/vaapi/Dockerfile index 29f30f8cd..b953bf8bf 100644 --- a/docker-images/4.1/vaapi/Dockerfile +++ b/docker-images/4.1/vaapi/Dockerfile @@ -319,8 +319,8 @@ RUN \ DIR=/tmp/svt && mkdir -p ${DIR} && cd ${DIR} && \ git clone https://github.com/OpenVisualCloud/SVT-AV1 && \ git clone https://github.com/intel/SVT-HEVC && \ - cd ${DIR}/SVT-AV1 && cd Build/linux && build.sh release && cd release && make install && \ - cd ${DIR}/SVT-HEVC && cd Build/linux && build.sh release && cd release && make install + cd ${DIR}/SVT-AV1 && cd Build/linux && ./build.sh release && cd release && make install && \ + cd ${DIR}/SVT-HEVC && cd Build/linux && ./build.sh release && cd release && make install # Add ${DIR2}/SVT-VP9/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch later RUN \ diff --git a/docker-images/snapshot/alpine/Dockerfile b/docker-images/snapshot/alpine/Dockerfile index e10d4dd98..2243684eb 100644 --- a/docker-images/snapshot/alpine/Dockerfile +++ b/docker-images/snapshot/alpine/Dockerfile @@ -316,8 +316,8 @@ RUN \ DIR=/tmp/svt && mkdir -p ${DIR} && cd ${DIR} && \ git clone https://github.com/OpenVisualCloud/SVT-AV1 && \ git clone https://github.com/intel/SVT-HEVC && \ - cd ${DIR}/SVT-AV1 && cd Build/linux && build.sh release && cd release && make install && \ - cd ${DIR}/SVT-HEVC && cd Build/linux && build.sh release && cd release && make install + cd ${DIR}/SVT-AV1 && cd Build/linux && ./build.sh release && cd release && make install && \ + cd ${DIR}/SVT-HEVC && cd Build/linux && ./build.sh release && cd release && make install # Add ${DIR2}/SVT-VP9/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch later RUN \ diff --git a/docker-images/snapshot/centos/Dockerfile b/docker-images/snapshot/centos/Dockerfile index 4f78c2c8e..989f902a9 100644 --- a/docker-images/snapshot/centos/Dockerfile +++ b/docker-images/snapshot/centos/Dockerfile @@ -317,8 +317,8 @@ RUN \ DIR=/tmp/svt && mkdir -p ${DIR} && cd ${DIR} && \ git clone https://github.com/OpenVisualCloud/SVT-AV1 && \ git clone https://github.com/intel/SVT-HEVC && \ - cd ${DIR}/SVT-AV1 && cd Build/linux && build.sh release && cd release && make install && \ - cd ${DIR}/SVT-HEVC && cd Build/linux && build.sh release && cd release && make install + cd ${DIR}/SVT-AV1 && cd Build/linux && ./build.sh release && cd release && make install && \ + cd ${DIR}/SVT-HEVC && cd Build/linux && ./build.sh release && cd release && make install # Add ${DIR2}/SVT-VP9/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch later RUN \ diff --git a/docker-images/snapshot/scratch/Dockerfile b/docker-images/snapshot/scratch/Dockerfile index b33fdc766..56ed52189 100644 --- a/docker-images/snapshot/scratch/Dockerfile +++ b/docker-images/snapshot/scratch/Dockerfile @@ -313,8 +313,8 @@ RUN \ DIR=/tmp/svt && mkdir -p ${DIR} && cd ${DIR} && \ git clone https://github.com/OpenVisualCloud/SVT-AV1 && \ git clone https://github.com/intel/SVT-HEVC && \ - cd ${DIR}/SVT-AV1 && cd Build/linux && build.sh release && cd release && make install && \ - cd ${DIR}/SVT-HEVC && cd Build/linux && build.sh release && cd release && make install + cd ${DIR}/SVT-AV1 && cd Build/linux && ./build.sh release && cd release && make install && \ + cd ${DIR}/SVT-HEVC && cd Build/linux && ./build.sh release && cd release && make install # Add ${DIR2}/SVT-VP9/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch later RUN \ diff --git a/docker-images/snapshot/ubuntu/Dockerfile b/docker-images/snapshot/ubuntu/Dockerfile index 3c3b84c45..337174185 100644 --- a/docker-images/snapshot/ubuntu/Dockerfile +++ b/docker-images/snapshot/ubuntu/Dockerfile @@ -318,8 +318,8 @@ RUN \ DIR=/tmp/svt && mkdir -p ${DIR} && cd ${DIR} && \ git clone https://github.com/OpenVisualCloud/SVT-AV1 && \ git clone https://github.com/intel/SVT-HEVC && \ - cd ${DIR}/SVT-AV1 && cd Build/linux && build.sh release && cd release && make install && \ - cd ${DIR}/SVT-HEVC && cd Build/linux && build.sh release && cd release && make install + cd ${DIR}/SVT-AV1 && cd Build/linux && ./build.sh release && cd release && make install && \ + cd ${DIR}/SVT-HEVC && cd Build/linux && ./build.sh release && cd release && make install # Add ${DIR2}/SVT-VP9/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch later RUN \ diff --git a/docker-images/snapshot/vaapi/Dockerfile b/docker-images/snapshot/vaapi/Dockerfile index 0f45246ef..3554e24e8 100644 --- a/docker-images/snapshot/vaapi/Dockerfile +++ b/docker-images/snapshot/vaapi/Dockerfile @@ -319,8 +319,8 @@ RUN \ DIR=/tmp/svt && mkdir -p ${DIR} && cd ${DIR} && \ git clone https://github.com/OpenVisualCloud/SVT-AV1 && \ git clone https://github.com/intel/SVT-HEVC && \ - cd ${DIR}/SVT-AV1 && cd Build/linux && build.sh release && cd release && make install && \ - cd ${DIR}/SVT-HEVC && cd Build/linux && build.sh release && cd release && make install + cd ${DIR}/SVT-AV1 && cd Build/linux && ./build.sh release && cd release && make install && \ + cd ${DIR}/SVT-HEVC && cd Build/linux && ./build.sh release && cd release && make install # Add ${DIR2}/SVT-VP9/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch later RUN \ diff --git a/templates/Dockerfile-patch-SVT b/templates/Dockerfile-patch-SVT index c0aad7eed..35c0594ac 100644 --- a/templates/Dockerfile-patch-SVT +++ b/templates/Dockerfile-patch-SVT @@ -4,8 +4,8 @@ RUN \ DIR=/tmp/svt && mkdir -p ${DIR} && cd ${DIR} && \ git clone https://github.com/OpenVisualCloud/SVT-AV1 && \ git clone https://github.com/intel/SVT-HEVC && \ - cd ${DIR}/SVT-AV1 && cd Build/linux && build.sh release && cd release && make install && \ - cd ${DIR}/SVT-HEVC && cd Build/linux && build.sh release && cd release && make install + cd ${DIR}/SVT-AV1 && cd Build/linux && ./build.sh release && cd release && make install && \ + cd ${DIR}/SVT-HEVC && cd Build/linux && ./build.sh release && cd release && make install # Add ${DIR2}/SVT-VP9/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch later RUN \ From a5577f431e1a232bbea8ba4ce9a8dab69fcdae30 Mon Sep 17 00:00:00 2001 From: ILOVEPIE Date: Mon, 11 Mar 2019 23:34:39 +0000 Subject: [PATCH 6/7] SVT Support 6 --- docker-images/4.1/alpine/Dockerfile | 5 ++--- docker-images/4.1/centos/Dockerfile | 5 ++--- docker-images/4.1/scratch/Dockerfile | 5 ++--- docker-images/4.1/ubuntu/Dockerfile | 5 ++--- docker-images/4.1/vaapi/Dockerfile | 5 ++--- docker-images/snapshot/alpine/Dockerfile | 5 ++--- docker-images/snapshot/centos/Dockerfile | 5 ++--- docker-images/snapshot/scratch/Dockerfile | 5 ++--- docker-images/snapshot/ubuntu/Dockerfile | 5 ++--- docker-images/snapshot/vaapi/Dockerfile | 5 ++--- templates/Dockerfile-patch-SVT | 5 ++--- 11 files changed, 22 insertions(+), 33 deletions(-) diff --git a/docker-images/4.1/alpine/Dockerfile b/docker-images/4.1/alpine/Dockerfile index 07ab336ef..3aab35ae9 100644 --- a/docker-images/4.1/alpine/Dockerfile +++ b/docker-images/4.1/alpine/Dockerfile @@ -316,14 +316,13 @@ RUN \ DIR=/tmp/svt && mkdir -p ${DIR} && cd ${DIR} && \ git clone https://github.com/OpenVisualCloud/SVT-AV1 && \ git clone https://github.com/intel/SVT-HEVC && \ - cd ${DIR}/SVT-AV1 && cd Build/linux && ./build.sh release && cd release && make install && \ - cd ${DIR}/SVT-HEVC && cd Build/linux && ./build.sh release && cd release && make install + cd ${DIR}/SVT-AV1 && cd Build/linux && sed -i "/cmake/ s|\\\\$|-DCMAKE_INSTALL_PREFIX=${PREFIX} \\\|g" ./build.sh && ./build.sh release && cd release && make install && \ + cd ${DIR}/SVT-HEVC && cd Build/linux && sed -i "/cmake/ s|\\\\$|-DCMAKE_INSTALL_PREFIX=${PREFIX} \\\|g" ./build.sh && ./build.sh release && cd release && make install # Add ${DIR2}/SVT-VP9/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch later RUN \ DIR=/tmp/ffmpeg && DIR2=/tmp/svt && mkdir -p ${DIR} && mkdir -p ${DIR2} && cd ${DIR} && \ git apply ${DIR2}/SVT-HEVC/ffmpeg_plugin/0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch && \ - git apply ${DIR2}/SVT-HEVC/ffmpeg_plugin/0002-doc-Add-libsvt_hevc-encoder-docs.patch && \ git apply ${DIR2}/SVT-AV1/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-av1-with-svt-hevc.patch diff --git a/docker-images/4.1/centos/Dockerfile b/docker-images/4.1/centos/Dockerfile index eb2ff1fcf..479a854e5 100644 --- a/docker-images/4.1/centos/Dockerfile +++ b/docker-images/4.1/centos/Dockerfile @@ -317,14 +317,13 @@ RUN \ DIR=/tmp/svt && mkdir -p ${DIR} && cd ${DIR} && \ git clone https://github.com/OpenVisualCloud/SVT-AV1 && \ git clone https://github.com/intel/SVT-HEVC && \ - cd ${DIR}/SVT-AV1 && cd Build/linux && ./build.sh release && cd release && make install && \ - cd ${DIR}/SVT-HEVC && cd Build/linux && ./build.sh release && cd release && make install + cd ${DIR}/SVT-AV1 && cd Build/linux && sed -i "/cmake/ s|\\\\$|-DCMAKE_INSTALL_PREFIX=${PREFIX} \\\|g" ./build.sh && ./build.sh release && cd release && make install && \ + cd ${DIR}/SVT-HEVC && cd Build/linux && sed -i "/cmake/ s|\\\\$|-DCMAKE_INSTALL_PREFIX=${PREFIX} \\\|g" ./build.sh && ./build.sh release && cd release && make install # Add ${DIR2}/SVT-VP9/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch later RUN \ DIR=/tmp/ffmpeg && DIR2=/tmp/svt && mkdir -p ${DIR} && mkdir -p ${DIR2} && cd ${DIR} && \ git apply ${DIR2}/SVT-HEVC/ffmpeg_plugin/0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch && \ - git apply ${DIR2}/SVT-HEVC/ffmpeg_plugin/0002-doc-Add-libsvt_hevc-encoder-docs.patch && \ git apply ${DIR2}/SVT-AV1/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-av1-with-svt-hevc.patch diff --git a/docker-images/4.1/scratch/Dockerfile b/docker-images/4.1/scratch/Dockerfile index 9dcaa859b..6e3cbd302 100644 --- a/docker-images/4.1/scratch/Dockerfile +++ b/docker-images/4.1/scratch/Dockerfile @@ -313,14 +313,13 @@ RUN \ DIR=/tmp/svt && mkdir -p ${DIR} && cd ${DIR} && \ git clone https://github.com/OpenVisualCloud/SVT-AV1 && \ git clone https://github.com/intel/SVT-HEVC && \ - cd ${DIR}/SVT-AV1 && cd Build/linux && ./build.sh release && cd release && make install && \ - cd ${DIR}/SVT-HEVC && cd Build/linux && ./build.sh release && cd release && make install + cd ${DIR}/SVT-AV1 && cd Build/linux && sed -i "/cmake/ s|\\\\$|-DCMAKE_INSTALL_PREFIX=${PREFIX} \\\|g" ./build.sh && ./build.sh release && cd release && make install && \ + cd ${DIR}/SVT-HEVC && cd Build/linux && sed -i "/cmake/ s|\\\\$|-DCMAKE_INSTALL_PREFIX=${PREFIX} \\\|g" ./build.sh && ./build.sh release && cd release && make install # Add ${DIR2}/SVT-VP9/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch later RUN \ DIR=/tmp/ffmpeg && DIR2=/tmp/svt && mkdir -p ${DIR} && mkdir -p ${DIR2} && cd ${DIR} && \ git apply ${DIR2}/SVT-HEVC/ffmpeg_plugin/0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch && \ - git apply ${DIR2}/SVT-HEVC/ffmpeg_plugin/0002-doc-Add-libsvt_hevc-encoder-docs.patch && \ git apply ${DIR2}/SVT-AV1/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-av1-with-svt-hevc.patch diff --git a/docker-images/4.1/ubuntu/Dockerfile b/docker-images/4.1/ubuntu/Dockerfile index 9ad2e373b..722ecfb97 100644 --- a/docker-images/4.1/ubuntu/Dockerfile +++ b/docker-images/4.1/ubuntu/Dockerfile @@ -318,14 +318,13 @@ RUN \ DIR=/tmp/svt && mkdir -p ${DIR} && cd ${DIR} && \ git clone https://github.com/OpenVisualCloud/SVT-AV1 && \ git clone https://github.com/intel/SVT-HEVC && \ - cd ${DIR}/SVT-AV1 && cd Build/linux && ./build.sh release && cd release && make install && \ - cd ${DIR}/SVT-HEVC && cd Build/linux && ./build.sh release && cd release && make install + cd ${DIR}/SVT-AV1 && cd Build/linux && sed -i "/cmake/ s|\\\\$|-DCMAKE_INSTALL_PREFIX=${PREFIX} \\\|g" ./build.sh && ./build.sh release && cd release && make install && \ + cd ${DIR}/SVT-HEVC && cd Build/linux && sed -i "/cmake/ s|\\\\$|-DCMAKE_INSTALL_PREFIX=${PREFIX} \\\|g" ./build.sh && ./build.sh release && cd release && make install # Add ${DIR2}/SVT-VP9/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch later RUN \ DIR=/tmp/ffmpeg && DIR2=/tmp/svt && mkdir -p ${DIR} && mkdir -p ${DIR2} && cd ${DIR} && \ git apply ${DIR2}/SVT-HEVC/ffmpeg_plugin/0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch && \ - git apply ${DIR2}/SVT-HEVC/ffmpeg_plugin/0002-doc-Add-libsvt_hevc-encoder-docs.patch && \ git apply ${DIR2}/SVT-AV1/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-av1-with-svt-hevc.patch diff --git a/docker-images/4.1/vaapi/Dockerfile b/docker-images/4.1/vaapi/Dockerfile index b953bf8bf..5cf7c336b 100644 --- a/docker-images/4.1/vaapi/Dockerfile +++ b/docker-images/4.1/vaapi/Dockerfile @@ -319,14 +319,13 @@ RUN \ DIR=/tmp/svt && mkdir -p ${DIR} && cd ${DIR} && \ git clone https://github.com/OpenVisualCloud/SVT-AV1 && \ git clone https://github.com/intel/SVT-HEVC && \ - cd ${DIR}/SVT-AV1 && cd Build/linux && ./build.sh release && cd release && make install && \ - cd ${DIR}/SVT-HEVC && cd Build/linux && ./build.sh release && cd release && make install + cd ${DIR}/SVT-AV1 && cd Build/linux && sed -i "/cmake/ s|\\\\$|-DCMAKE_INSTALL_PREFIX=${PREFIX} \\\|g" ./build.sh && ./build.sh release && cd release && make install && \ + cd ${DIR}/SVT-HEVC && cd Build/linux && sed -i "/cmake/ s|\\\\$|-DCMAKE_INSTALL_PREFIX=${PREFIX} \\\|g" ./build.sh && ./build.sh release && cd release && make install # Add ${DIR2}/SVT-VP9/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch later RUN \ DIR=/tmp/ffmpeg && DIR2=/tmp/svt && mkdir -p ${DIR} && mkdir -p ${DIR2} && cd ${DIR} && \ git apply ${DIR2}/SVT-HEVC/ffmpeg_plugin/0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch && \ - git apply ${DIR2}/SVT-HEVC/ffmpeg_plugin/0002-doc-Add-libsvt_hevc-encoder-docs.patch && \ git apply ${DIR2}/SVT-AV1/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-av1-with-svt-hevc.patch diff --git a/docker-images/snapshot/alpine/Dockerfile b/docker-images/snapshot/alpine/Dockerfile index 2243684eb..54c712173 100644 --- a/docker-images/snapshot/alpine/Dockerfile +++ b/docker-images/snapshot/alpine/Dockerfile @@ -316,14 +316,13 @@ RUN \ DIR=/tmp/svt && mkdir -p ${DIR} && cd ${DIR} && \ git clone https://github.com/OpenVisualCloud/SVT-AV1 && \ git clone https://github.com/intel/SVT-HEVC && \ - cd ${DIR}/SVT-AV1 && cd Build/linux && ./build.sh release && cd release && make install && \ - cd ${DIR}/SVT-HEVC && cd Build/linux && ./build.sh release && cd release && make install + cd ${DIR}/SVT-AV1 && cd Build/linux && sed -i "/cmake/ s|\\\\$|-DCMAKE_INSTALL_PREFIX=${PREFIX} \\\|g" ./build.sh && ./build.sh release && cd release && make install && \ + cd ${DIR}/SVT-HEVC && cd Build/linux && sed -i "/cmake/ s|\\\\$|-DCMAKE_INSTALL_PREFIX=${PREFIX} \\\|g" ./build.sh && ./build.sh release && cd release && make install # Add ${DIR2}/SVT-VP9/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch later RUN \ DIR=/tmp/ffmpeg && DIR2=/tmp/svt && mkdir -p ${DIR} && mkdir -p ${DIR2} && cd ${DIR} && \ git apply ${DIR2}/SVT-HEVC/ffmpeg_plugin/0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch && \ - git apply ${DIR2}/SVT-HEVC/ffmpeg_plugin/0002-doc-Add-libsvt_hevc-encoder-docs.patch && \ git apply ${DIR2}/SVT-AV1/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-av1-with-svt-hevc.patch diff --git a/docker-images/snapshot/centos/Dockerfile b/docker-images/snapshot/centos/Dockerfile index 989f902a9..f1568302c 100644 --- a/docker-images/snapshot/centos/Dockerfile +++ b/docker-images/snapshot/centos/Dockerfile @@ -317,14 +317,13 @@ RUN \ DIR=/tmp/svt && mkdir -p ${DIR} && cd ${DIR} && \ git clone https://github.com/OpenVisualCloud/SVT-AV1 && \ git clone https://github.com/intel/SVT-HEVC && \ - cd ${DIR}/SVT-AV1 && cd Build/linux && ./build.sh release && cd release && make install && \ - cd ${DIR}/SVT-HEVC && cd Build/linux && ./build.sh release && cd release && make install + cd ${DIR}/SVT-AV1 && cd Build/linux && sed -i "/cmake/ s|\\\\$|-DCMAKE_INSTALL_PREFIX=${PREFIX} \\\|g" ./build.sh && ./build.sh release && cd release && make install && \ + cd ${DIR}/SVT-HEVC && cd Build/linux && sed -i "/cmake/ s|\\\\$|-DCMAKE_INSTALL_PREFIX=${PREFIX} \\\|g" ./build.sh && ./build.sh release && cd release && make install # Add ${DIR2}/SVT-VP9/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch later RUN \ DIR=/tmp/ffmpeg && DIR2=/tmp/svt && mkdir -p ${DIR} && mkdir -p ${DIR2} && cd ${DIR} && \ git apply ${DIR2}/SVT-HEVC/ffmpeg_plugin/0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch && \ - git apply ${DIR2}/SVT-HEVC/ffmpeg_plugin/0002-doc-Add-libsvt_hevc-encoder-docs.patch && \ git apply ${DIR2}/SVT-AV1/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-av1-with-svt-hevc.patch diff --git a/docker-images/snapshot/scratch/Dockerfile b/docker-images/snapshot/scratch/Dockerfile index 56ed52189..c4198691b 100644 --- a/docker-images/snapshot/scratch/Dockerfile +++ b/docker-images/snapshot/scratch/Dockerfile @@ -313,14 +313,13 @@ RUN \ DIR=/tmp/svt && mkdir -p ${DIR} && cd ${DIR} && \ git clone https://github.com/OpenVisualCloud/SVT-AV1 && \ git clone https://github.com/intel/SVT-HEVC && \ - cd ${DIR}/SVT-AV1 && cd Build/linux && ./build.sh release && cd release && make install && \ - cd ${DIR}/SVT-HEVC && cd Build/linux && ./build.sh release && cd release && make install + cd ${DIR}/SVT-AV1 && cd Build/linux && sed -i "/cmake/ s|\\\\$|-DCMAKE_INSTALL_PREFIX=${PREFIX} \\\|g" ./build.sh && ./build.sh release && cd release && make install && \ + cd ${DIR}/SVT-HEVC && cd Build/linux && sed -i "/cmake/ s|\\\\$|-DCMAKE_INSTALL_PREFIX=${PREFIX} \\\|g" ./build.sh && ./build.sh release && cd release && make install # Add ${DIR2}/SVT-VP9/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch later RUN \ DIR=/tmp/ffmpeg && DIR2=/tmp/svt && mkdir -p ${DIR} && mkdir -p ${DIR2} && cd ${DIR} && \ git apply ${DIR2}/SVT-HEVC/ffmpeg_plugin/0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch && \ - git apply ${DIR2}/SVT-HEVC/ffmpeg_plugin/0002-doc-Add-libsvt_hevc-encoder-docs.patch && \ git apply ${DIR2}/SVT-AV1/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-av1-with-svt-hevc.patch diff --git a/docker-images/snapshot/ubuntu/Dockerfile b/docker-images/snapshot/ubuntu/Dockerfile index 337174185..d02d15e90 100644 --- a/docker-images/snapshot/ubuntu/Dockerfile +++ b/docker-images/snapshot/ubuntu/Dockerfile @@ -318,14 +318,13 @@ RUN \ DIR=/tmp/svt && mkdir -p ${DIR} && cd ${DIR} && \ git clone https://github.com/OpenVisualCloud/SVT-AV1 && \ git clone https://github.com/intel/SVT-HEVC && \ - cd ${DIR}/SVT-AV1 && cd Build/linux && ./build.sh release && cd release && make install && \ - cd ${DIR}/SVT-HEVC && cd Build/linux && ./build.sh release && cd release && make install + cd ${DIR}/SVT-AV1 && cd Build/linux && sed -i "/cmake/ s|\\\\$|-DCMAKE_INSTALL_PREFIX=${PREFIX} \\\|g" ./build.sh && ./build.sh release && cd release && make install && \ + cd ${DIR}/SVT-HEVC && cd Build/linux && sed -i "/cmake/ s|\\\\$|-DCMAKE_INSTALL_PREFIX=${PREFIX} \\\|g" ./build.sh && ./build.sh release && cd release && make install # Add ${DIR2}/SVT-VP9/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch later RUN \ DIR=/tmp/ffmpeg && DIR2=/tmp/svt && mkdir -p ${DIR} && mkdir -p ${DIR2} && cd ${DIR} && \ git apply ${DIR2}/SVT-HEVC/ffmpeg_plugin/0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch && \ - git apply ${DIR2}/SVT-HEVC/ffmpeg_plugin/0002-doc-Add-libsvt_hevc-encoder-docs.patch && \ git apply ${DIR2}/SVT-AV1/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-av1-with-svt-hevc.patch diff --git a/docker-images/snapshot/vaapi/Dockerfile b/docker-images/snapshot/vaapi/Dockerfile index 3554e24e8..0679c3189 100644 --- a/docker-images/snapshot/vaapi/Dockerfile +++ b/docker-images/snapshot/vaapi/Dockerfile @@ -319,14 +319,13 @@ RUN \ DIR=/tmp/svt && mkdir -p ${DIR} && cd ${DIR} && \ git clone https://github.com/OpenVisualCloud/SVT-AV1 && \ git clone https://github.com/intel/SVT-HEVC && \ - cd ${DIR}/SVT-AV1 && cd Build/linux && ./build.sh release && cd release && make install && \ - cd ${DIR}/SVT-HEVC && cd Build/linux && ./build.sh release && cd release && make install + cd ${DIR}/SVT-AV1 && cd Build/linux && sed -i "/cmake/ s|\\\\$|-DCMAKE_INSTALL_PREFIX=${PREFIX} \\\|g" ./build.sh && ./build.sh release && cd release && make install && \ + cd ${DIR}/SVT-HEVC && cd Build/linux && sed -i "/cmake/ s|\\\\$|-DCMAKE_INSTALL_PREFIX=${PREFIX} \\\|g" ./build.sh && ./build.sh release && cd release && make install # Add ${DIR2}/SVT-VP9/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch later RUN \ DIR=/tmp/ffmpeg && DIR2=/tmp/svt && mkdir -p ${DIR} && mkdir -p ${DIR2} && cd ${DIR} && \ git apply ${DIR2}/SVT-HEVC/ffmpeg_plugin/0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch && \ - git apply ${DIR2}/SVT-HEVC/ffmpeg_plugin/0002-doc-Add-libsvt_hevc-encoder-docs.patch && \ git apply ${DIR2}/SVT-AV1/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-av1-with-svt-hevc.patch diff --git a/templates/Dockerfile-patch-SVT b/templates/Dockerfile-patch-SVT index 35c0594ac..7df3925fd 100644 --- a/templates/Dockerfile-patch-SVT +++ b/templates/Dockerfile-patch-SVT @@ -4,12 +4,11 @@ RUN \ DIR=/tmp/svt && mkdir -p ${DIR} && cd ${DIR} && \ git clone https://github.com/OpenVisualCloud/SVT-AV1 && \ git clone https://github.com/intel/SVT-HEVC && \ - cd ${DIR}/SVT-AV1 && cd Build/linux && ./build.sh release && cd release && make install && \ - cd ${DIR}/SVT-HEVC && cd Build/linux && ./build.sh release && cd release && make install + cd ${DIR}/SVT-AV1 && cd Build/linux && sed -i "/cmake/ s|\\\\$|-DCMAKE_INSTALL_PREFIX=${PREFIX} \\\|g" ./build.sh && ./build.sh release && cd release && make install && \ + cd ${DIR}/SVT-HEVC && cd Build/linux && sed -i "/cmake/ s|\\\\$|-DCMAKE_INSTALL_PREFIX=${PREFIX} \\\|g" ./build.sh && ./build.sh release && cd release && make install # Add ${DIR2}/SVT-VP9/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch later RUN \ DIR=/tmp/ffmpeg && DIR2=/tmp/svt && mkdir -p ${DIR} && mkdir -p ${DIR2} && cd ${DIR} && \ git apply ${DIR2}/SVT-HEVC/ffmpeg_plugin/0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch && \ - git apply ${DIR2}/SVT-HEVC/ffmpeg_plugin/0002-doc-Add-libsvt_hevc-encoder-docs.patch && \ git apply ${DIR2}/SVT-AV1/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-av1-with-svt-hevc.patch From d46632b110e00ea8f76d1deb0c045b54419132c1 Mon Sep 17 00:00:00 2001 From: Patrick Martin Date: Fri, 15 Mar 2019 17:17:23 -0600 Subject: [PATCH 7/7] SVT Support 7 Experimenting to see what fixes the pkg-config issue. --- docker-images/4.1/alpine/Dockerfile | 12 +++++++----- docker-images/4.1/centos/Dockerfile | 12 +++++++----- docker-images/4.1/scratch/Dockerfile | 12 +++++++----- docker-images/4.1/ubuntu/Dockerfile | 12 +++++++----- docker-images/4.1/vaapi/Dockerfile | 12 +++++++----- docker-images/snapshot/alpine/Dockerfile | 12 +++++++----- docker-images/snapshot/centos/Dockerfile | 12 +++++++----- docker-images/snapshot/scratch/Dockerfile | 12 +++++++----- docker-images/snapshot/ubuntu/Dockerfile | 12 +++++++----- docker-images/snapshot/vaapi/Dockerfile | 12 +++++++----- templates/Dockerfile-patch-SVT | 12 +++++++----- update.py | 6 +++--- 12 files changed, 80 insertions(+), 58 deletions(-) diff --git a/docker-images/4.1/alpine/Dockerfile b/docker-images/4.1/alpine/Dockerfile index 3aab35ae9..2a9068705 100644 --- a/docker-images/4.1/alpine/Dockerfile +++ b/docker-images/4.1/alpine/Dockerfile @@ -311,19 +311,21 @@ RUN \ tar -jx --strip-components=1 -f ffmpeg-${FFMPEG_VERSION}.tar.bz2 # SVT Codecs -# Add https://github.com/OpenVisualCloud/SVT-VP9 later RUN \ DIR=/tmp/svt && mkdir -p ${DIR} && cd ${DIR} && \ git clone https://github.com/OpenVisualCloud/SVT-AV1 && \ git clone https://github.com/intel/SVT-HEVC && \ - cd ${DIR}/SVT-AV1 && cd Build/linux && sed -i "/cmake/ s|\\\\$|-DCMAKE_INSTALL_PREFIX=${PREFIX} \\\|g" ./build.sh && ./build.sh release && cd release && make install && \ - cd ${DIR}/SVT-HEVC && cd Build/linux && sed -i "/cmake/ s|\\\\$|-DCMAKE_INSTALL_PREFIX=${PREFIX} \\\|g" ./build.sh && ./build.sh release && cd release && make install + git clone https://github.com/OpenVisualCloud/SVT-VP9 && \ + cd ${DIR}/SVT-AV1 && cd Build/linux && sed -i "/cmake/ s|\\\\$|-DCMAKE_INSTALL_PREFIX=${PREFIX} \\\|g" ./build.sh && ./build.sh release && cd release && make && make install && \ + cd ${DIR}/SVT-HEVC && cd Build/linux && sed -i "/cmake/ s|\\\\$|-DCMAKE_INSTALL_PREFIX=${PREFIX} \\\|g" ./build.sh && ./build.sh release && cd release && make && make install +# cd ${DIR}/SVT-VP9 && cd Build/linux && sed -i "/cmake/ s|\\\\$|-DCMAKE_INSTALL_PREFIX=${PREFIX} \\\|g" ./build.sh && ./build.sh release && cd release && make && make install -# Add ${DIR2}/SVT-VP9/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch later +# Apply patches RUN \ - DIR=/tmp/ffmpeg && DIR2=/tmp/svt && mkdir -p ${DIR} && mkdir -p ${DIR2} && cd ${DIR} && \ + DIR=/tmp/ffmpeg && DIR2=/tmp/svt && mkdir -p ${DIR} && mkdir -p ${DIR2} && cd ${DIR} && \ git apply ${DIR2}/SVT-HEVC/ffmpeg_plugin/0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch && \ git apply ${DIR2}/SVT-AV1/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-av1-with-svt-hevc.patch +# git apply ${DIR2}/SVT-VP9/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch RUN \ diff --git a/docker-images/4.1/centos/Dockerfile b/docker-images/4.1/centos/Dockerfile index 479a854e5..f9564545e 100644 --- a/docker-images/4.1/centos/Dockerfile +++ b/docker-images/4.1/centos/Dockerfile @@ -312,19 +312,21 @@ RUN \ tar -jx --strip-components=1 -f ffmpeg-${FFMPEG_VERSION}.tar.bz2 # SVT Codecs -# Add https://github.com/OpenVisualCloud/SVT-VP9 later RUN \ DIR=/tmp/svt && mkdir -p ${DIR} && cd ${DIR} && \ git clone https://github.com/OpenVisualCloud/SVT-AV1 && \ git clone https://github.com/intel/SVT-HEVC && \ - cd ${DIR}/SVT-AV1 && cd Build/linux && sed -i "/cmake/ s|\\\\$|-DCMAKE_INSTALL_PREFIX=${PREFIX} \\\|g" ./build.sh && ./build.sh release && cd release && make install && \ - cd ${DIR}/SVT-HEVC && cd Build/linux && sed -i "/cmake/ s|\\\\$|-DCMAKE_INSTALL_PREFIX=${PREFIX} \\\|g" ./build.sh && ./build.sh release && cd release && make install + git clone https://github.com/OpenVisualCloud/SVT-VP9 && \ + cd ${DIR}/SVT-AV1 && cd Build/linux && sed -i "/cmake/ s|\\\\$|-DCMAKE_INSTALL_PREFIX=${PREFIX} \\\|g" ./build.sh && ./build.sh release && cd release && make && make install && \ + cd ${DIR}/SVT-HEVC && cd Build/linux && sed -i "/cmake/ s|\\\\$|-DCMAKE_INSTALL_PREFIX=${PREFIX} \\\|g" ./build.sh && ./build.sh release && cd release && make && make install +# cd ${DIR}/SVT-VP9 && cd Build/linux && sed -i "/cmake/ s|\\\\$|-DCMAKE_INSTALL_PREFIX=${PREFIX} \\\|g" ./build.sh && ./build.sh release && cd release && make && make install -# Add ${DIR2}/SVT-VP9/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch later +# Apply patches RUN \ - DIR=/tmp/ffmpeg && DIR2=/tmp/svt && mkdir -p ${DIR} && mkdir -p ${DIR2} && cd ${DIR} && \ + DIR=/tmp/ffmpeg && DIR2=/tmp/svt && mkdir -p ${DIR} && mkdir -p ${DIR2} && cd ${DIR} && \ git apply ${DIR2}/SVT-HEVC/ffmpeg_plugin/0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch && \ git apply ${DIR2}/SVT-AV1/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-av1-with-svt-hevc.patch +# git apply ${DIR2}/SVT-VP9/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch RUN \ diff --git a/docker-images/4.1/scratch/Dockerfile b/docker-images/4.1/scratch/Dockerfile index 6e3cbd302..6f1389614 100644 --- a/docker-images/4.1/scratch/Dockerfile +++ b/docker-images/4.1/scratch/Dockerfile @@ -308,19 +308,21 @@ RUN \ tar -jx --strip-components=1 -f ffmpeg-${FFMPEG_VERSION}.tar.bz2 # SVT Codecs -# Add https://github.com/OpenVisualCloud/SVT-VP9 later RUN \ DIR=/tmp/svt && mkdir -p ${DIR} && cd ${DIR} && \ git clone https://github.com/OpenVisualCloud/SVT-AV1 && \ git clone https://github.com/intel/SVT-HEVC && \ - cd ${DIR}/SVT-AV1 && cd Build/linux && sed -i "/cmake/ s|\\\\$|-DCMAKE_INSTALL_PREFIX=${PREFIX} \\\|g" ./build.sh && ./build.sh release && cd release && make install && \ - cd ${DIR}/SVT-HEVC && cd Build/linux && sed -i "/cmake/ s|\\\\$|-DCMAKE_INSTALL_PREFIX=${PREFIX} \\\|g" ./build.sh && ./build.sh release && cd release && make install + git clone https://github.com/OpenVisualCloud/SVT-VP9 && \ + cd ${DIR}/SVT-AV1 && cd Build/linux && sed -i "/cmake/ s|\\\\$|-DCMAKE_INSTALL_PREFIX=${PREFIX} \\\|g" ./build.sh && ./build.sh release && cd release && make && make install && \ + cd ${DIR}/SVT-HEVC && cd Build/linux && sed -i "/cmake/ s|\\\\$|-DCMAKE_INSTALL_PREFIX=${PREFIX} \\\|g" ./build.sh && ./build.sh release && cd release && make && make install +# cd ${DIR}/SVT-VP9 && cd Build/linux && sed -i "/cmake/ s|\\\\$|-DCMAKE_INSTALL_PREFIX=${PREFIX} \\\|g" ./build.sh && ./build.sh release && cd release && make && make install -# Add ${DIR2}/SVT-VP9/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch later +# Apply patches RUN \ - DIR=/tmp/ffmpeg && DIR2=/tmp/svt && mkdir -p ${DIR} && mkdir -p ${DIR2} && cd ${DIR} && \ + DIR=/tmp/ffmpeg && DIR2=/tmp/svt && mkdir -p ${DIR} && mkdir -p ${DIR2} && cd ${DIR} && \ git apply ${DIR2}/SVT-HEVC/ffmpeg_plugin/0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch && \ git apply ${DIR2}/SVT-AV1/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-av1-with-svt-hevc.patch +# git apply ${DIR2}/SVT-VP9/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch RUN \ diff --git a/docker-images/4.1/ubuntu/Dockerfile b/docker-images/4.1/ubuntu/Dockerfile index 722ecfb97..621efa4f3 100644 --- a/docker-images/4.1/ubuntu/Dockerfile +++ b/docker-images/4.1/ubuntu/Dockerfile @@ -313,19 +313,21 @@ RUN \ tar -jx --strip-components=1 -f ffmpeg-${FFMPEG_VERSION}.tar.bz2 # SVT Codecs -# Add https://github.com/OpenVisualCloud/SVT-VP9 later RUN \ DIR=/tmp/svt && mkdir -p ${DIR} && cd ${DIR} && \ git clone https://github.com/OpenVisualCloud/SVT-AV1 && \ git clone https://github.com/intel/SVT-HEVC && \ - cd ${DIR}/SVT-AV1 && cd Build/linux && sed -i "/cmake/ s|\\\\$|-DCMAKE_INSTALL_PREFIX=${PREFIX} \\\|g" ./build.sh && ./build.sh release && cd release && make install && \ - cd ${DIR}/SVT-HEVC && cd Build/linux && sed -i "/cmake/ s|\\\\$|-DCMAKE_INSTALL_PREFIX=${PREFIX} \\\|g" ./build.sh && ./build.sh release && cd release && make install + git clone https://github.com/OpenVisualCloud/SVT-VP9 && \ + cd ${DIR}/SVT-AV1 && cd Build/linux && sed -i "/cmake/ s|\\\\$|-DCMAKE_INSTALL_PREFIX=${PREFIX} \\\|g" ./build.sh && ./build.sh release && cd release && make && make install && \ + cd ${DIR}/SVT-HEVC && cd Build/linux && sed -i "/cmake/ s|\\\\$|-DCMAKE_INSTALL_PREFIX=${PREFIX} \\\|g" ./build.sh && ./build.sh release && cd release && make && make install +# cd ${DIR}/SVT-VP9 && cd Build/linux && sed -i "/cmake/ s|\\\\$|-DCMAKE_INSTALL_PREFIX=${PREFIX} \\\|g" ./build.sh && ./build.sh release && cd release && make && make install -# Add ${DIR2}/SVT-VP9/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch later +# Apply patches RUN \ - DIR=/tmp/ffmpeg && DIR2=/tmp/svt && mkdir -p ${DIR} && mkdir -p ${DIR2} && cd ${DIR} && \ + DIR=/tmp/ffmpeg && DIR2=/tmp/svt && mkdir -p ${DIR} && mkdir -p ${DIR2} && cd ${DIR} && \ git apply ${DIR2}/SVT-HEVC/ffmpeg_plugin/0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch && \ git apply ${DIR2}/SVT-AV1/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-av1-with-svt-hevc.patch +# git apply ${DIR2}/SVT-VP9/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch RUN \ diff --git a/docker-images/4.1/vaapi/Dockerfile b/docker-images/4.1/vaapi/Dockerfile index 5cf7c336b..b8211ad5d 100644 --- a/docker-images/4.1/vaapi/Dockerfile +++ b/docker-images/4.1/vaapi/Dockerfile @@ -314,19 +314,21 @@ RUN \ tar -jx --strip-components=1 -f ffmpeg-${FFMPEG_VERSION}.tar.bz2 # SVT Codecs -# Add https://github.com/OpenVisualCloud/SVT-VP9 later RUN \ DIR=/tmp/svt && mkdir -p ${DIR} && cd ${DIR} && \ git clone https://github.com/OpenVisualCloud/SVT-AV1 && \ git clone https://github.com/intel/SVT-HEVC && \ - cd ${DIR}/SVT-AV1 && cd Build/linux && sed -i "/cmake/ s|\\\\$|-DCMAKE_INSTALL_PREFIX=${PREFIX} \\\|g" ./build.sh && ./build.sh release && cd release && make install && \ - cd ${DIR}/SVT-HEVC && cd Build/linux && sed -i "/cmake/ s|\\\\$|-DCMAKE_INSTALL_PREFIX=${PREFIX} \\\|g" ./build.sh && ./build.sh release && cd release && make install + git clone https://github.com/OpenVisualCloud/SVT-VP9 && \ + cd ${DIR}/SVT-AV1 && cd Build/linux && sed -i "/cmake/ s|\\\\$|-DCMAKE_INSTALL_PREFIX=${PREFIX} \\\|g" ./build.sh && ./build.sh release && cd release && make && make install && \ + cd ${DIR}/SVT-HEVC && cd Build/linux && sed -i "/cmake/ s|\\\\$|-DCMAKE_INSTALL_PREFIX=${PREFIX} \\\|g" ./build.sh && ./build.sh release && cd release && make && make install +# cd ${DIR}/SVT-VP9 && cd Build/linux && sed -i "/cmake/ s|\\\\$|-DCMAKE_INSTALL_PREFIX=${PREFIX} \\\|g" ./build.sh && ./build.sh release && cd release && make && make install -# Add ${DIR2}/SVT-VP9/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch later +# Apply patches RUN \ - DIR=/tmp/ffmpeg && DIR2=/tmp/svt && mkdir -p ${DIR} && mkdir -p ${DIR2} && cd ${DIR} && \ + DIR=/tmp/ffmpeg && DIR2=/tmp/svt && mkdir -p ${DIR} && mkdir -p ${DIR2} && cd ${DIR} && \ git apply ${DIR2}/SVT-HEVC/ffmpeg_plugin/0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch && \ git apply ${DIR2}/SVT-AV1/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-av1-with-svt-hevc.patch +# git apply ${DIR2}/SVT-VP9/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch RUN \ diff --git a/docker-images/snapshot/alpine/Dockerfile b/docker-images/snapshot/alpine/Dockerfile index 54c712173..58993bbe9 100644 --- a/docker-images/snapshot/alpine/Dockerfile +++ b/docker-images/snapshot/alpine/Dockerfile @@ -311,19 +311,21 @@ RUN \ tar -jx --strip-components=1 -f ffmpeg-${FFMPEG_VERSION}.tar.bz2 # SVT Codecs -# Add https://github.com/OpenVisualCloud/SVT-VP9 later RUN \ DIR=/tmp/svt && mkdir -p ${DIR} && cd ${DIR} && \ git clone https://github.com/OpenVisualCloud/SVT-AV1 && \ git clone https://github.com/intel/SVT-HEVC && \ - cd ${DIR}/SVT-AV1 && cd Build/linux && sed -i "/cmake/ s|\\\\$|-DCMAKE_INSTALL_PREFIX=${PREFIX} \\\|g" ./build.sh && ./build.sh release && cd release && make install && \ - cd ${DIR}/SVT-HEVC && cd Build/linux && sed -i "/cmake/ s|\\\\$|-DCMAKE_INSTALL_PREFIX=${PREFIX} \\\|g" ./build.sh && ./build.sh release && cd release && make install + git clone https://github.com/OpenVisualCloud/SVT-VP9 && \ + cd ${DIR}/SVT-AV1 && cd Build/linux && sed -i "/cmake/ s|\\\\$|-DCMAKE_INSTALL_PREFIX=${PREFIX} \\\|g" ./build.sh && ./build.sh release && cd release && make && make install && \ + cd ${DIR}/SVT-HEVC && cd Build/linux && sed -i "/cmake/ s|\\\\$|-DCMAKE_INSTALL_PREFIX=${PREFIX} \\\|g" ./build.sh && ./build.sh release && cd release && make && make install +# cd ${DIR}/SVT-VP9 && cd Build/linux && sed -i "/cmake/ s|\\\\$|-DCMAKE_INSTALL_PREFIX=${PREFIX} \\\|g" ./build.sh && ./build.sh release && cd release && make && make install -# Add ${DIR2}/SVT-VP9/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch later +# Apply patches RUN \ - DIR=/tmp/ffmpeg && DIR2=/tmp/svt && mkdir -p ${DIR} && mkdir -p ${DIR2} && cd ${DIR} && \ + DIR=/tmp/ffmpeg && DIR2=/tmp/svt && mkdir -p ${DIR} && mkdir -p ${DIR2} && cd ${DIR} && \ git apply ${DIR2}/SVT-HEVC/ffmpeg_plugin/0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch && \ git apply ${DIR2}/SVT-AV1/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-av1-with-svt-hevc.patch +# git apply ${DIR2}/SVT-VP9/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch RUN \ diff --git a/docker-images/snapshot/centos/Dockerfile b/docker-images/snapshot/centos/Dockerfile index f1568302c..ee0fe0519 100644 --- a/docker-images/snapshot/centos/Dockerfile +++ b/docker-images/snapshot/centos/Dockerfile @@ -312,19 +312,21 @@ RUN \ tar -jx --strip-components=1 -f ffmpeg-${FFMPEG_VERSION}.tar.bz2 # SVT Codecs -# Add https://github.com/OpenVisualCloud/SVT-VP9 later RUN \ DIR=/tmp/svt && mkdir -p ${DIR} && cd ${DIR} && \ git clone https://github.com/OpenVisualCloud/SVT-AV1 && \ git clone https://github.com/intel/SVT-HEVC && \ - cd ${DIR}/SVT-AV1 && cd Build/linux && sed -i "/cmake/ s|\\\\$|-DCMAKE_INSTALL_PREFIX=${PREFIX} \\\|g" ./build.sh && ./build.sh release && cd release && make install && \ - cd ${DIR}/SVT-HEVC && cd Build/linux && sed -i "/cmake/ s|\\\\$|-DCMAKE_INSTALL_PREFIX=${PREFIX} \\\|g" ./build.sh && ./build.sh release && cd release && make install + git clone https://github.com/OpenVisualCloud/SVT-VP9 && \ + cd ${DIR}/SVT-AV1 && cd Build/linux && sed -i "/cmake/ s|\\\\$|-DCMAKE_INSTALL_PREFIX=${PREFIX} \\\|g" ./build.sh && ./build.sh release && cd release && make && make install && \ + cd ${DIR}/SVT-HEVC && cd Build/linux && sed -i "/cmake/ s|\\\\$|-DCMAKE_INSTALL_PREFIX=${PREFIX} \\\|g" ./build.sh && ./build.sh release && cd release && make && make install +# cd ${DIR}/SVT-VP9 && cd Build/linux && sed -i "/cmake/ s|\\\\$|-DCMAKE_INSTALL_PREFIX=${PREFIX} \\\|g" ./build.sh && ./build.sh release && cd release && make && make install -# Add ${DIR2}/SVT-VP9/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch later +# Apply patches RUN \ - DIR=/tmp/ffmpeg && DIR2=/tmp/svt && mkdir -p ${DIR} && mkdir -p ${DIR2} && cd ${DIR} && \ + DIR=/tmp/ffmpeg && DIR2=/tmp/svt && mkdir -p ${DIR} && mkdir -p ${DIR2} && cd ${DIR} && \ git apply ${DIR2}/SVT-HEVC/ffmpeg_plugin/0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch && \ git apply ${DIR2}/SVT-AV1/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-av1-with-svt-hevc.patch +# git apply ${DIR2}/SVT-VP9/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch RUN \ diff --git a/docker-images/snapshot/scratch/Dockerfile b/docker-images/snapshot/scratch/Dockerfile index c4198691b..6a85c41f3 100644 --- a/docker-images/snapshot/scratch/Dockerfile +++ b/docker-images/snapshot/scratch/Dockerfile @@ -308,19 +308,21 @@ RUN \ tar -jx --strip-components=1 -f ffmpeg-${FFMPEG_VERSION}.tar.bz2 # SVT Codecs -# Add https://github.com/OpenVisualCloud/SVT-VP9 later RUN \ DIR=/tmp/svt && mkdir -p ${DIR} && cd ${DIR} && \ git clone https://github.com/OpenVisualCloud/SVT-AV1 && \ git clone https://github.com/intel/SVT-HEVC && \ - cd ${DIR}/SVT-AV1 && cd Build/linux && sed -i "/cmake/ s|\\\\$|-DCMAKE_INSTALL_PREFIX=${PREFIX} \\\|g" ./build.sh && ./build.sh release && cd release && make install && \ - cd ${DIR}/SVT-HEVC && cd Build/linux && sed -i "/cmake/ s|\\\\$|-DCMAKE_INSTALL_PREFIX=${PREFIX} \\\|g" ./build.sh && ./build.sh release && cd release && make install + git clone https://github.com/OpenVisualCloud/SVT-VP9 && \ + cd ${DIR}/SVT-AV1 && cd Build/linux && sed -i "/cmake/ s|\\\\$|-DCMAKE_INSTALL_PREFIX=${PREFIX} \\\|g" ./build.sh && ./build.sh release && cd release && make && make install && \ + cd ${DIR}/SVT-HEVC && cd Build/linux && sed -i "/cmake/ s|\\\\$|-DCMAKE_INSTALL_PREFIX=${PREFIX} \\\|g" ./build.sh && ./build.sh release && cd release && make && make install +# cd ${DIR}/SVT-VP9 && cd Build/linux && sed -i "/cmake/ s|\\\\$|-DCMAKE_INSTALL_PREFIX=${PREFIX} \\\|g" ./build.sh && ./build.sh release && cd release && make && make install -# Add ${DIR2}/SVT-VP9/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch later +# Apply patches RUN \ - DIR=/tmp/ffmpeg && DIR2=/tmp/svt && mkdir -p ${DIR} && mkdir -p ${DIR2} && cd ${DIR} && \ + DIR=/tmp/ffmpeg && DIR2=/tmp/svt && mkdir -p ${DIR} && mkdir -p ${DIR2} && cd ${DIR} && \ git apply ${DIR2}/SVT-HEVC/ffmpeg_plugin/0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch && \ git apply ${DIR2}/SVT-AV1/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-av1-with-svt-hevc.patch +# git apply ${DIR2}/SVT-VP9/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch RUN \ diff --git a/docker-images/snapshot/ubuntu/Dockerfile b/docker-images/snapshot/ubuntu/Dockerfile index d02d15e90..b37c18f39 100644 --- a/docker-images/snapshot/ubuntu/Dockerfile +++ b/docker-images/snapshot/ubuntu/Dockerfile @@ -313,19 +313,21 @@ RUN \ tar -jx --strip-components=1 -f ffmpeg-${FFMPEG_VERSION}.tar.bz2 # SVT Codecs -# Add https://github.com/OpenVisualCloud/SVT-VP9 later RUN \ DIR=/tmp/svt && mkdir -p ${DIR} && cd ${DIR} && \ git clone https://github.com/OpenVisualCloud/SVT-AV1 && \ git clone https://github.com/intel/SVT-HEVC && \ - cd ${DIR}/SVT-AV1 && cd Build/linux && sed -i "/cmake/ s|\\\\$|-DCMAKE_INSTALL_PREFIX=${PREFIX} \\\|g" ./build.sh && ./build.sh release && cd release && make install && \ - cd ${DIR}/SVT-HEVC && cd Build/linux && sed -i "/cmake/ s|\\\\$|-DCMAKE_INSTALL_PREFIX=${PREFIX} \\\|g" ./build.sh && ./build.sh release && cd release && make install + git clone https://github.com/OpenVisualCloud/SVT-VP9 && \ + cd ${DIR}/SVT-AV1 && cd Build/linux && sed -i "/cmake/ s|\\\\$|-DCMAKE_INSTALL_PREFIX=${PREFIX} \\\|g" ./build.sh && ./build.sh release && cd release && make && make install && \ + cd ${DIR}/SVT-HEVC && cd Build/linux && sed -i "/cmake/ s|\\\\$|-DCMAKE_INSTALL_PREFIX=${PREFIX} \\\|g" ./build.sh && ./build.sh release && cd release && make && make install +# cd ${DIR}/SVT-VP9 && cd Build/linux && sed -i "/cmake/ s|\\\\$|-DCMAKE_INSTALL_PREFIX=${PREFIX} \\\|g" ./build.sh && ./build.sh release && cd release && make && make install -# Add ${DIR2}/SVT-VP9/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch later +# Apply patches RUN \ - DIR=/tmp/ffmpeg && DIR2=/tmp/svt && mkdir -p ${DIR} && mkdir -p ${DIR2} && cd ${DIR} && \ + DIR=/tmp/ffmpeg && DIR2=/tmp/svt && mkdir -p ${DIR} && mkdir -p ${DIR2} && cd ${DIR} && \ git apply ${DIR2}/SVT-HEVC/ffmpeg_plugin/0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch && \ git apply ${DIR2}/SVT-AV1/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-av1-with-svt-hevc.patch +# git apply ${DIR2}/SVT-VP9/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch RUN \ diff --git a/docker-images/snapshot/vaapi/Dockerfile b/docker-images/snapshot/vaapi/Dockerfile index 0679c3189..a62bf8d9e 100644 --- a/docker-images/snapshot/vaapi/Dockerfile +++ b/docker-images/snapshot/vaapi/Dockerfile @@ -314,19 +314,21 @@ RUN \ tar -jx --strip-components=1 -f ffmpeg-${FFMPEG_VERSION}.tar.bz2 # SVT Codecs -# Add https://github.com/OpenVisualCloud/SVT-VP9 later RUN \ DIR=/tmp/svt && mkdir -p ${DIR} && cd ${DIR} && \ git clone https://github.com/OpenVisualCloud/SVT-AV1 && \ git clone https://github.com/intel/SVT-HEVC && \ - cd ${DIR}/SVT-AV1 && cd Build/linux && sed -i "/cmake/ s|\\\\$|-DCMAKE_INSTALL_PREFIX=${PREFIX} \\\|g" ./build.sh && ./build.sh release && cd release && make install && \ - cd ${DIR}/SVT-HEVC && cd Build/linux && sed -i "/cmake/ s|\\\\$|-DCMAKE_INSTALL_PREFIX=${PREFIX} \\\|g" ./build.sh && ./build.sh release && cd release && make install + git clone https://github.com/OpenVisualCloud/SVT-VP9 && \ + cd ${DIR}/SVT-AV1 && cd Build/linux && sed -i "/cmake/ s|\\\\$|-DCMAKE_INSTALL_PREFIX=${PREFIX} \\\|g" ./build.sh && ./build.sh release && cd release && make && make install && \ + cd ${DIR}/SVT-HEVC && cd Build/linux && sed -i "/cmake/ s|\\\\$|-DCMAKE_INSTALL_PREFIX=${PREFIX} \\\|g" ./build.sh && ./build.sh release && cd release && make && make install +# cd ${DIR}/SVT-VP9 && cd Build/linux && sed -i "/cmake/ s|\\\\$|-DCMAKE_INSTALL_PREFIX=${PREFIX} \\\|g" ./build.sh && ./build.sh release && cd release && make && make install -# Add ${DIR2}/SVT-VP9/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch later +# Apply patches RUN \ - DIR=/tmp/ffmpeg && DIR2=/tmp/svt && mkdir -p ${DIR} && mkdir -p ${DIR2} && cd ${DIR} && \ + DIR=/tmp/ffmpeg && DIR2=/tmp/svt && mkdir -p ${DIR} && mkdir -p ${DIR2} && cd ${DIR} && \ git apply ${DIR2}/SVT-HEVC/ffmpeg_plugin/0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch && \ git apply ${DIR2}/SVT-AV1/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-av1-with-svt-hevc.patch +# git apply ${DIR2}/SVT-VP9/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch RUN \ diff --git a/templates/Dockerfile-patch-SVT b/templates/Dockerfile-patch-SVT index 7df3925fd..d98514cfd 100644 --- a/templates/Dockerfile-patch-SVT +++ b/templates/Dockerfile-patch-SVT @@ -1,14 +1,16 @@ # SVT Codecs -# Add https://github.com/OpenVisualCloud/SVT-VP9 later RUN \ DIR=/tmp/svt && mkdir -p ${DIR} && cd ${DIR} && \ git clone https://github.com/OpenVisualCloud/SVT-AV1 && \ git clone https://github.com/intel/SVT-HEVC && \ - cd ${DIR}/SVT-AV1 && cd Build/linux && sed -i "/cmake/ s|\\\\$|-DCMAKE_INSTALL_PREFIX=${PREFIX} \\\|g" ./build.sh && ./build.sh release && cd release && make install && \ - cd ${DIR}/SVT-HEVC && cd Build/linux && sed -i "/cmake/ s|\\\\$|-DCMAKE_INSTALL_PREFIX=${PREFIX} \\\|g" ./build.sh && ./build.sh release && cd release && make install + git clone https://github.com/OpenVisualCloud/SVT-VP9 && \ + cd ${DIR}/SVT-AV1 && cd Build/linux && sed -i "/cmake/ s|\\\\$|-DCMAKE_INSTALL_PREFIX=${PREFIX} \\\|g" ./build.sh && ./build.sh release && cd release && make && make install && \ + cd ${DIR}/SVT-HEVC && cd Build/linux && sed -i "/cmake/ s|\\\\$|-DCMAKE_INSTALL_PREFIX=${PREFIX} \\\|g" ./build.sh && ./build.sh release && cd release && make && make install +# cd ${DIR}/SVT-VP9 && cd Build/linux && sed -i "/cmake/ s|\\\\$|-DCMAKE_INSTALL_PREFIX=${PREFIX} \\\|g" ./build.sh && ./build.sh release && cd release && make && make install -# Add ${DIR2}/SVT-VP9/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch later +# Apply patches RUN \ - DIR=/tmp/ffmpeg && DIR2=/tmp/svt && mkdir -p ${DIR} && mkdir -p ${DIR2} && cd ${DIR} && \ + DIR=/tmp/ffmpeg && DIR2=/tmp/svt && mkdir -p ${DIR} && mkdir -p ${DIR2} && cd ${DIR} && \ git apply ${DIR2}/SVT-HEVC/ffmpeg_plugin/0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch && \ git apply ${DIR2}/SVT-AV1/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-av1-with-svt-hevc.patch +# git apply ${DIR2}/SVT-VP9/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch diff --git a/update.py b/update.py index a95baac4b..cab4faf4e 100755 --- a/update.py +++ b/update.py @@ -80,18 +80,18 @@ docker_content = docker_content.replace('libva2', 'libva1') patch = '' - patch2 = '' + patch2 = '' if (version[0] > '4' or (version[0] == '4' and version[2] >= '1')) or version == 'snapshot': with open('templates/Dockerfile-patch-SVT', 'r') as tmpfile: patch += tmpfile.read() with open('templates/Dockerfile-patch-SVT-enable', 'r') as tmpfile: - patch2 += tmpfile.read() + patch2 += tmpfile.read() if version[0:3] == '4.0': with open('templates/Dockerfile-patch-4.0', 'r') as tmpfile: patch += tmpfile.read() docker_content = docker_content.replace('%%FFMPEG_PATCH%%', patch) - docker_content = docker_content.replace('%%ENABLE_PATCH_CODECS%%', patch2) + docker_content = docker_content.replace('%%ENABLE_PATCH_CODECS%%', patch2) d = os.path.dirname(dockerfile) if not os.path.exists(d):