Enable SVT-AV1 mp4 and mkv/webm container support

Signed-off-by: Zhizhen Tang <[email protected]>

Author: TangZhiZhen

xcode-server/ffmpeg-hw/Dockerfile

@@ -144,7 +144,7 @@ RUN  wget -O - ${X265_REPO} | tar xz && mv x265-${X265_VER} x265 && \
 
 # Fetch SVT-HEVC
 ARG SVT_HEVC_VER=252ff3d18bc1997a5af989ad4e67e025c93dbf68
-ARG SVT_HEVC_REPO=https://github.com/intel/SVT-HEVC
++ARG SVT_HEVC_REPO=https://github.com/OpenVisualCloud/SVT-HEVC.git
 
 RUN git clone ${SVT_HEVC_REPO} && \
     cd SVT-HEVC/Build/linux && \
@@ -156,12 +156,15 @@ RUN git clone ${SVT_HEVC_REPO} && \
     make install
 
 # Fetch SVT-AV1
-ARG SVT_AV1_VER=39aad81274a04053e2678ec7ec39cf6584bced66
-ARG SVT_AV1_REPO=https://github.com/OpenVisualCloud/SVT-AV1
+ARG SVT_AV1_VER=3009e99f32e3476e028aadd17a265630f80a8e36
+ARG SVT_AV1_REPO=https://github.com/OpenVisualCloud/SVT-AV1.git
+ARG SVT_AV1_MP4_PATCH_REPO=https://raw.githubusercontent.com/VCDP/CDN/master/0001-Enable-mp4-and-mkv-webm-container-support-on-SVT-AV1.patch
 
 RUN git clone ${SVT_AV1_REPO} && \
-    cd SVT-AV1/Build/linux && \
+    cd SVT-AV1 && \
     git checkout ${SVT_AV1_VER} && \
+    wget -O - ${SVT_AV1_MP4_PATCH_REPO} | patch -p1 && \
+    cd Build/linux && \
     mkdir -p ../../Bin/Release && \
     cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=lib/x86_64-linux-gnu -DCMAKE_ASM_NASM_COMPILER=yasm ../.. && \
     make -j8 && \
@@ -227,6 +230,7 @@ ARG FFMPEG_1TN_PATCH_REPO=https://patchwork.ffmpeg.org/patch/11625/raw
 ARG FFMPEG_THREAD_PATCH_REPO=https://patchwork.ffmpeg.org/patch/11035/raw
 ARG FFMPEG_HW_LOOP_PATCH_REPO=https://patchwork.ffmpeg.org/patch/8173/raw
 ARG FFMPEG_ENCODE_THREAD_PATCH_REPO=https://patchwork.ffmpeg.org/patch/11179/raw
+ARG FFMPEG_SVT_AV1_MP4_PATHC_REPO=https://raw.githubusercontent.com/VCDP/CDN/master/0001-Enable-SVT-AV1-mp4-and-mkv-webm-container-support-on-FFmpeg.patch
 # ARG FFMPEG_RTMP_WORKAROUD_REPO=https://raw.githubusercontent.com/VCDP/CDN/master/Check_rtmp_packet_timestamp_workaround_ffmpeg.patch
 
 
@@ -243,7 +247,8 @@ RUN wget -O - ${FFMPEG_REPO} | tar xz && mv FFmpeg-${FFMPEG_VER} FFmpeg && \
 # Patch FFmpeg source for SVT-HEVC and SVT-AV1
 RUN cd /home/FFmpeg && \
     patch -p1 < ../SVT-HEVC/ffmpeg_plugin/0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch && \
-    patch -p1 < ../SVT-AV1/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-av1-with-svt-hevc.patch
+    patch -p1 < ../SVT-AV1/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-av1-with-svt-hevc.patch && \
+    wget -O - ${FFMPEG_SVT_AV1_MP4_PATHC_REPO} | patch -p1
 
 # Compile FFmpeg
 RUN cd /home/FFmpeg && \

xcode-server/ffmpeg-sw/Dockerfile

@@ -144,7 +144,7 @@ RUN  wget -O - ${X265_REPO} | tar xz && mv x265-${X265_VER} x265 && \
 
 # Fetch SVT-HEVC
 ARG SVT_HEVC_VER=252ff3d18bc1997a5af989ad4e67e025c93dbf68
-ARG SVT_HEVC_REPO=https://github.com/intel/SVT-HEVC
+ARG SVT_HEVC_REPO=https://github.com/OpenVisualCloud/SVT-HEVC.git
 
 RUN git clone ${SVT_HEVC_REPO} && \
     cd SVT-HEVC/Build/linux && \
@@ -156,12 +156,15 @@ RUN git clone ${SVT_HEVC_REPO} && \
     make install
 
 # Fetch SVT-AV1
-ARG SVT_AV1_VER=39aad81274a04053e2678ec7ec39cf6584bced66
-ARG SVT_AV1_REPO=https://github.com/OpenVisualCloud/SVT-AV1
+ARG SVT_AV1_VER=3009e99f32e3476e028aadd17a265630f80a8e36
+ARG SVT_AV1_REPO=https://github.com/OpenVisualCloud/SVT-AV1.git
+ARG SVT_AV1_MP4_PATCH_REPO=https://raw.githubusercontent.com/VCDP/CDN/master/0001-Enable-mp4-and-mkv-webm-container-support-on-SVT-AV1.patch
 
 RUN git clone ${SVT_AV1_REPO} && \
-    cd SVT-AV1/Build/linux && \
+    cd SVT-AV1 && \
     git checkout ${SVT_AV1_VER} && \
+    wget -O - ${SVT_AV1_MP4_PATCH_REPO} | patch -p1 && \
+    cd Build/linux && \
     mkdir -p ../../Bin/Release && \
     cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=lib/x86_64-linux-gnu -DCMAKE_ASM_NASM_COMPILER=yasm ../.. && \
     make -j8 && \
@@ -176,6 +179,7 @@ ARG FFMPEG_FLV_PATCH_REPO=https://raw.githubusercontent.com/VCDP/CDN/master/The-
 ARG FFMPEG_1TN_PATCH_REPO=https://patchwork.ffmpeg.org/patch/11625/raw
 ARG FFMPEG_THREAD_PATCH_REPO=https://patchwork.ffmpeg.org/patch/11035/raw
 ARG FFMPEG_ENCODE_THREAD_PATCH_REPO=https://patchwork.ffmpeg.org/patch/11179/raw
+ARG FFMPEG_SVT_AV1_MP4_PATHC_REPO=https://raw.githubusercontent.com/VCDP/CDN/master/0001-Enable-SVT-AV1-mp4-and-mkv-webm-container-support-on-FFmpeg.patch
 # ARG FFMPEG_RTMP_WORKAROUD_REPO=https://raw.githubusercontent.com/VCDP/CDN/master/Check_rtmp_packet_timestamp_workaround_ffmpeg.patch
 
 
@@ -191,7 +195,8 @@ RUN wget -O - ${FFMPEG_REPO} | tar xz && mv FFmpeg-${FFMPEG_VER} FFmpeg && \
 # Patch FFmpeg source for SVT-HEVC and SVT-AV1
 RUN cd /home/FFmpeg && \
     patch -p1 < ../SVT-HEVC/ffmpeg_plugin/0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch && \
-    patch -p1 < ../SVT-AV1/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-av1-with-svt-hevc.patch
+    patch -p1 < ../SVT-AV1/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-av1-with-svt-hevc.patch && \
+    wget -O - ${FFMPEG_SVT_AV1_MP4_PATHC_REPO} | patch -p1
 
 # Compile FFmpeg
 RUN cd /home/FFmpeg && \