From d4c188cfb1875eec5dfc584898ada933e713c110 Mon Sep 17 00:00:00 2001 From: Lin Xie Date: Tue, 2 Apr 2019 09:23:01 +0800 Subject: [PATCH 1/2] Add ffmpeg buffer overflow fixing patch --- VCA2/centos-7.4/ffmpeg+gst+dev/Dockerfile | 4 +++- VCA2/centos-7.4/ffmpeg/Dockerfile | 4 +++- VCA2/centos-7.5/ffmpeg+gst+dev/Dockerfile | 4 +++- VCA2/centos-7.5/ffmpeg/Dockerfile | 4 +++- VCA2/centos-7.6/ffmpeg+gst+dev/Dockerfile | 4 +++- VCA2/centos-7.6/ffmpeg/Dockerfile | 4 +++- VCA2/ubuntu-16.04/ffmpeg+gst+dev/Dockerfile | 4 +++- VCA2/ubuntu-16.04/ffmpeg/Dockerfile | 4 +++- VCA2/ubuntu-18.04/ffmpeg+gst+dev/Dockerfile | 4 +++- VCA2/ubuntu-18.04/ffmpeg/Dockerfile | 4 +++- Xeon/centos-7.4/dldt+ffmpeg/Dockerfile | 4 +++- Xeon/centos-7.4/ffmpeg+gst+dev/Dockerfile | 4 +++- Xeon/centos-7.4/ffmpeg/Dockerfile | 4 +++- Xeon/centos-7.5/dldt+ffmpeg/Dockerfile | 4 +++- Xeon/centos-7.5/ffmpeg+gst+dev/Dockerfile | 4 +++- Xeon/centos-7.5/ffmpeg/Dockerfile | 4 +++- Xeon/centos-7.6/dldt+ffmpeg/Dockerfile | 4 +++- Xeon/centos-7.6/ffmpeg+gst+dev/Dockerfile | 4 +++- Xeon/centos-7.6/ffmpeg/Dockerfile | 4 +++- Xeon/ubuntu-16.04/dldt+ffmpeg/Dockerfile | 4 +++- Xeon/ubuntu-16.04/ffmpeg+gst+dev/Dockerfile | 4 +++- Xeon/ubuntu-16.04/ffmpeg/Dockerfile | 4 +++- Xeon/ubuntu-18.04/dldt+ffmpeg/Dockerfile | 4 +++- Xeon/ubuntu-18.04/ffmpeg+gst+dev/Dockerfile | 4 +++- Xeon/ubuntu-18.04/ffmpeg/Dockerfile | 4 +++- XeonE3/centos-7.4/ffmpeg+gst+dev/Dockerfile | 4 +++- XeonE3/centos-7.4/ffmpeg/Dockerfile | 4 +++- XeonE3/centos-7.5/ffmpeg+gst+dev/Dockerfile | 4 +++- XeonE3/centos-7.5/ffmpeg/Dockerfile | 4 +++- XeonE3/centos-7.6/ffmpeg+gst+dev/Dockerfile | 4 +++- XeonE3/centos-7.6/ffmpeg/Dockerfile | 4 +++- XeonE3/ubuntu-16.04/ffmpeg+gst+dev/Dockerfile | 4 +++- XeonE3/ubuntu-16.04/ffmpeg/Dockerfile | 4 +++- XeonE3/ubuntu-18.04/ffmpeg+gst+dev/Dockerfile | 4 +++- XeonE3/ubuntu-18.04/ffmpeg/Dockerfile | 4 +++- template/ffmpeg.m4 | 4 +++- 36 files changed, 108 insertions(+), 36 deletions(-) diff --git a/VCA2/centos-7.4/ffmpeg+gst+dev/Dockerfile b/VCA2/centos-7.4/ffmpeg+gst+dev/Dockerfile index 8e26aee82..c692f453e 100644 --- a/VCA2/centos-7.4/ffmpeg+gst+dev/Dockerfile +++ b/VCA2/centos-7.4/ffmpeg+gst+dev/Dockerfile @@ -506,6 +506,7 @@ ARG FFMPEG_MA_PATCH_REPO_06=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/ ARG FFMPEG_MA_PATCH_REPO_07=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0007-Refine-features-of-IE-filters.patch ARG FFMPEG_MA_PATCH_REPO_08=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0008-fixed-extra-comma-in-iemetadata.patch ARG FFMPEG_MA_PATCH_REPO_09=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0009-add-source-as-option-source-url-calculate-nano-times.patch +ARG FFMPEG_MA_PATCH_REPO_10=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0010-fixed-buffer-overflow-issue-in-iemetadata.patch RUN yum install -y -q libass-devel freetype-devel SDL2-devel libxcb-devel libvdpau-devel texinfo zlib-devel openssl-devel @@ -522,7 +523,8 @@ RUN wget -O - ${FFMPEG_REPO} | tar xz && mv FFmpeg-${FFMPEG_VER} FFmpeg && \ wget -O - ${FFMPEG_MA_PATCH_REPO_06} | patch -p1 && \ wget -O - ${FFMPEG_MA_PATCH_REPO_07} | patch -p1 && \ wget -O - ${FFMPEG_MA_PATCH_REPO_08} | patch -p1 && \ - wget -O - ${FFMPEG_MA_PATCH_REPO_09} | patch -p1; + wget -O - ${FFMPEG_MA_PATCH_REPO_09} | patch -p1 && \ + wget -O - ${FFMPEG_MA_PATCH_REPO_10} | patch -p1; # Patch FFmpeg source for SVT-HEVC RUN cd /home/FFmpeg && \ diff --git a/VCA2/centos-7.4/ffmpeg/Dockerfile b/VCA2/centos-7.4/ffmpeg/Dockerfile index 472bde832..f3d9ee1d6 100644 --- a/VCA2/centos-7.4/ffmpeg/Dockerfile +++ b/VCA2/centos-7.4/ffmpeg/Dockerfile @@ -267,6 +267,7 @@ ARG FFMPEG_MA_PATCH_REPO_06=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/ ARG FFMPEG_MA_PATCH_REPO_07=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0007-Refine-features-of-IE-filters.patch ARG FFMPEG_MA_PATCH_REPO_08=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0008-fixed-extra-comma-in-iemetadata.patch ARG FFMPEG_MA_PATCH_REPO_09=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0009-add-source-as-option-source-url-calculate-nano-times.patch +ARG FFMPEG_MA_PATCH_REPO_10=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0010-fixed-buffer-overflow-issue-in-iemetadata.patch RUN yum install -y -q SDL2-devel libxcb-devel libvdpau-devel zlib-devel openssl-devel @@ -283,7 +284,8 @@ RUN wget -O - ${FFMPEG_REPO} | tar xz && mv FFmpeg-${FFMPEG_VER} FFmpeg && \ wget -O - ${FFMPEG_MA_PATCH_REPO_06} | patch -p1 && \ wget -O - ${FFMPEG_MA_PATCH_REPO_07} | patch -p1 && \ wget -O - ${FFMPEG_MA_PATCH_REPO_08} | patch -p1 && \ - wget -O - ${FFMPEG_MA_PATCH_REPO_09} | patch -p1; + wget -O - ${FFMPEG_MA_PATCH_REPO_09} | patch -p1 && \ + wget -O - ${FFMPEG_MA_PATCH_REPO_10} | patch -p1; # Patch FFmpeg source for SVT-HEVC RUN cd /home/FFmpeg && \ diff --git a/VCA2/centos-7.5/ffmpeg+gst+dev/Dockerfile b/VCA2/centos-7.5/ffmpeg+gst+dev/Dockerfile index fd65c4330..cdee0e1bc 100644 --- a/VCA2/centos-7.5/ffmpeg+gst+dev/Dockerfile +++ b/VCA2/centos-7.5/ffmpeg+gst+dev/Dockerfile @@ -506,6 +506,7 @@ ARG FFMPEG_MA_PATCH_REPO_06=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/ ARG FFMPEG_MA_PATCH_REPO_07=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0007-Refine-features-of-IE-filters.patch ARG FFMPEG_MA_PATCH_REPO_08=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0008-fixed-extra-comma-in-iemetadata.patch ARG FFMPEG_MA_PATCH_REPO_09=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0009-add-source-as-option-source-url-calculate-nano-times.patch +ARG FFMPEG_MA_PATCH_REPO_10=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0010-fixed-buffer-overflow-issue-in-iemetadata.patch RUN yum install -y -q libass-devel freetype-devel SDL2-devel libxcb-devel libvdpau-devel texinfo zlib-devel openssl-devel @@ -522,7 +523,8 @@ RUN wget -O - ${FFMPEG_REPO} | tar xz && mv FFmpeg-${FFMPEG_VER} FFmpeg && \ wget -O - ${FFMPEG_MA_PATCH_REPO_06} | patch -p1 && \ wget -O - ${FFMPEG_MA_PATCH_REPO_07} | patch -p1 && \ wget -O - ${FFMPEG_MA_PATCH_REPO_08} | patch -p1 && \ - wget -O - ${FFMPEG_MA_PATCH_REPO_09} | patch -p1; + wget -O - ${FFMPEG_MA_PATCH_REPO_09} | patch -p1 && \ + wget -O - ${FFMPEG_MA_PATCH_REPO_10} | patch -p1; # Patch FFmpeg source for SVT-HEVC RUN cd /home/FFmpeg && \ diff --git a/VCA2/centos-7.5/ffmpeg/Dockerfile b/VCA2/centos-7.5/ffmpeg/Dockerfile index d0a1415ba..254cba4c2 100644 --- a/VCA2/centos-7.5/ffmpeg/Dockerfile +++ b/VCA2/centos-7.5/ffmpeg/Dockerfile @@ -267,6 +267,7 @@ ARG FFMPEG_MA_PATCH_REPO_06=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/ ARG FFMPEG_MA_PATCH_REPO_07=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0007-Refine-features-of-IE-filters.patch ARG FFMPEG_MA_PATCH_REPO_08=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0008-fixed-extra-comma-in-iemetadata.patch ARG FFMPEG_MA_PATCH_REPO_09=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0009-add-source-as-option-source-url-calculate-nano-times.patch +ARG FFMPEG_MA_PATCH_REPO_10=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0010-fixed-buffer-overflow-issue-in-iemetadata.patch RUN yum install -y -q SDL2-devel libxcb-devel libvdpau-devel zlib-devel openssl-devel @@ -283,7 +284,8 @@ RUN wget -O - ${FFMPEG_REPO} | tar xz && mv FFmpeg-${FFMPEG_VER} FFmpeg && \ wget -O - ${FFMPEG_MA_PATCH_REPO_06} | patch -p1 && \ wget -O - ${FFMPEG_MA_PATCH_REPO_07} | patch -p1 && \ wget -O - ${FFMPEG_MA_PATCH_REPO_08} | patch -p1 && \ - wget -O - ${FFMPEG_MA_PATCH_REPO_09} | patch -p1; + wget -O - ${FFMPEG_MA_PATCH_REPO_09} | patch -p1 && \ + wget -O - ${FFMPEG_MA_PATCH_REPO_10} | patch -p1; # Patch FFmpeg source for SVT-HEVC RUN cd /home/FFmpeg && \ diff --git a/VCA2/centos-7.6/ffmpeg+gst+dev/Dockerfile b/VCA2/centos-7.6/ffmpeg+gst+dev/Dockerfile index c69b8c46e..8657f62b5 100644 --- a/VCA2/centos-7.6/ffmpeg+gst+dev/Dockerfile +++ b/VCA2/centos-7.6/ffmpeg+gst+dev/Dockerfile @@ -506,6 +506,7 @@ ARG FFMPEG_MA_PATCH_REPO_06=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/ ARG FFMPEG_MA_PATCH_REPO_07=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0007-Refine-features-of-IE-filters.patch ARG FFMPEG_MA_PATCH_REPO_08=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0008-fixed-extra-comma-in-iemetadata.patch ARG FFMPEG_MA_PATCH_REPO_09=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0009-add-source-as-option-source-url-calculate-nano-times.patch +ARG FFMPEG_MA_PATCH_REPO_10=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0010-fixed-buffer-overflow-issue-in-iemetadata.patch RUN yum install -y -q libass-devel freetype-devel SDL2-devel libxcb-devel libvdpau-devel texinfo zlib-devel openssl-devel @@ -522,7 +523,8 @@ RUN wget -O - ${FFMPEG_REPO} | tar xz && mv FFmpeg-${FFMPEG_VER} FFmpeg && \ wget -O - ${FFMPEG_MA_PATCH_REPO_06} | patch -p1 && \ wget -O - ${FFMPEG_MA_PATCH_REPO_07} | patch -p1 && \ wget -O - ${FFMPEG_MA_PATCH_REPO_08} | patch -p1 && \ - wget -O - ${FFMPEG_MA_PATCH_REPO_09} | patch -p1; + wget -O - ${FFMPEG_MA_PATCH_REPO_09} | patch -p1 && \ + wget -O - ${FFMPEG_MA_PATCH_REPO_10} | patch -p1; # Patch FFmpeg source for SVT-HEVC RUN cd /home/FFmpeg && \ diff --git a/VCA2/centos-7.6/ffmpeg/Dockerfile b/VCA2/centos-7.6/ffmpeg/Dockerfile index 39a56dfa6..3ce7bede6 100644 --- a/VCA2/centos-7.6/ffmpeg/Dockerfile +++ b/VCA2/centos-7.6/ffmpeg/Dockerfile @@ -267,6 +267,7 @@ ARG FFMPEG_MA_PATCH_REPO_06=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/ ARG FFMPEG_MA_PATCH_REPO_07=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0007-Refine-features-of-IE-filters.patch ARG FFMPEG_MA_PATCH_REPO_08=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0008-fixed-extra-comma-in-iemetadata.patch ARG FFMPEG_MA_PATCH_REPO_09=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0009-add-source-as-option-source-url-calculate-nano-times.patch +ARG FFMPEG_MA_PATCH_REPO_10=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0010-fixed-buffer-overflow-issue-in-iemetadata.patch RUN yum install -y -q SDL2-devel libxcb-devel libvdpau-devel zlib-devel openssl-devel @@ -283,7 +284,8 @@ RUN wget -O - ${FFMPEG_REPO} | tar xz && mv FFmpeg-${FFMPEG_VER} FFmpeg && \ wget -O - ${FFMPEG_MA_PATCH_REPO_06} | patch -p1 && \ wget -O - ${FFMPEG_MA_PATCH_REPO_07} | patch -p1 && \ wget -O - ${FFMPEG_MA_PATCH_REPO_08} | patch -p1 && \ - wget -O - ${FFMPEG_MA_PATCH_REPO_09} | patch -p1; + wget -O - ${FFMPEG_MA_PATCH_REPO_09} | patch -p1 && \ + wget -O - ${FFMPEG_MA_PATCH_REPO_10} | patch -p1; # Patch FFmpeg source for SVT-HEVC RUN cd /home/FFmpeg && \ diff --git a/VCA2/ubuntu-16.04/ffmpeg+gst+dev/Dockerfile b/VCA2/ubuntu-16.04/ffmpeg+gst+dev/Dockerfile index 5807a9f13..178dad99d 100644 --- a/VCA2/ubuntu-16.04/ffmpeg+gst+dev/Dockerfile +++ b/VCA2/ubuntu-16.04/ffmpeg+gst+dev/Dockerfile @@ -489,6 +489,7 @@ ARG FFMPEG_MA_PATCH_REPO_06=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/ ARG FFMPEG_MA_PATCH_REPO_07=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0007-Refine-features-of-IE-filters.patch ARG FFMPEG_MA_PATCH_REPO_08=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0008-fixed-extra-comma-in-iemetadata.patch ARG FFMPEG_MA_PATCH_REPO_09=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0009-add-source-as-option-source-url-calculate-nano-times.patch +ARG FFMPEG_MA_PATCH_REPO_10=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0010-fixed-buffer-overflow-issue-in-iemetadata.patch RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install -y -q --no-install-recommends libass-dev libfreetype6-dev libvdpau-dev libsdl2-dev libxcb1-dev libxcb-shm0-dev libxcb-xfixes0-dev texinfo zlib1g-dev libssl-dev @@ -505,7 +506,8 @@ RUN wget -O - ${FFMPEG_REPO} | tar xz && mv FFmpeg-${FFMPEG_VER} FFmpeg && \ wget -O - ${FFMPEG_MA_PATCH_REPO_06} | patch -p1 && \ wget -O - ${FFMPEG_MA_PATCH_REPO_07} | patch -p1 && \ wget -O - ${FFMPEG_MA_PATCH_REPO_08} | patch -p1 && \ - wget -O - ${FFMPEG_MA_PATCH_REPO_09} | patch -p1; + wget -O - ${FFMPEG_MA_PATCH_REPO_09} | patch -p1 && \ + wget -O - ${FFMPEG_MA_PATCH_REPO_10} | patch -p1; # Patch FFmpeg source for SVT-HEVC RUN cd /home/FFmpeg && \ diff --git a/VCA2/ubuntu-16.04/ffmpeg/Dockerfile b/VCA2/ubuntu-16.04/ffmpeg/Dockerfile index d5bf3463a..1caf5d9c2 100644 --- a/VCA2/ubuntu-16.04/ffmpeg/Dockerfile +++ b/VCA2/ubuntu-16.04/ffmpeg/Dockerfile @@ -259,6 +259,7 @@ ARG FFMPEG_MA_PATCH_REPO_06=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/ ARG FFMPEG_MA_PATCH_REPO_07=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0007-Refine-features-of-IE-filters.patch ARG FFMPEG_MA_PATCH_REPO_08=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0008-fixed-extra-comma-in-iemetadata.patch ARG FFMPEG_MA_PATCH_REPO_09=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0009-add-source-as-option-source-url-calculate-nano-times.patch +ARG FFMPEG_MA_PATCH_REPO_10=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0010-fixed-buffer-overflow-issue-in-iemetadata.patch RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install -y -q --no-install-recommends libvdpau-dev libsdl2-dev libxcb1-dev libxcb-shm0-dev libxcb-xfixes0-dev zlib1g-dev libssl-dev @@ -275,7 +276,8 @@ RUN wget -O - ${FFMPEG_REPO} | tar xz && mv FFmpeg-${FFMPEG_VER} FFmpeg && \ wget -O - ${FFMPEG_MA_PATCH_REPO_06} | patch -p1 && \ wget -O - ${FFMPEG_MA_PATCH_REPO_07} | patch -p1 && \ wget -O - ${FFMPEG_MA_PATCH_REPO_08} | patch -p1 && \ - wget -O - ${FFMPEG_MA_PATCH_REPO_09} | patch -p1; + wget -O - ${FFMPEG_MA_PATCH_REPO_09} | patch -p1 && \ + wget -O - ${FFMPEG_MA_PATCH_REPO_10} | patch -p1; # Patch FFmpeg source for SVT-HEVC RUN cd /home/FFmpeg && \ diff --git a/VCA2/ubuntu-18.04/ffmpeg+gst+dev/Dockerfile b/VCA2/ubuntu-18.04/ffmpeg+gst+dev/Dockerfile index dd35f1189..666272999 100644 --- a/VCA2/ubuntu-18.04/ffmpeg+gst+dev/Dockerfile +++ b/VCA2/ubuntu-18.04/ffmpeg+gst+dev/Dockerfile @@ -491,6 +491,7 @@ ARG FFMPEG_MA_PATCH_REPO_06=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/ ARG FFMPEG_MA_PATCH_REPO_07=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0007-Refine-features-of-IE-filters.patch ARG FFMPEG_MA_PATCH_REPO_08=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0008-fixed-extra-comma-in-iemetadata.patch ARG FFMPEG_MA_PATCH_REPO_09=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0009-add-source-as-option-source-url-calculate-nano-times.patch +ARG FFMPEG_MA_PATCH_REPO_10=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0010-fixed-buffer-overflow-issue-in-iemetadata.patch RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install -y -q --no-install-recommends libass-dev libfreetype6-dev libvdpau-dev libsdl2-dev libxcb1-dev libxcb-shm0-dev libxcb-xfixes0-dev texinfo zlib1g-dev libssl-dev @@ -507,7 +508,8 @@ RUN wget -O - ${FFMPEG_REPO} | tar xz && mv FFmpeg-${FFMPEG_VER} FFmpeg && \ wget -O - ${FFMPEG_MA_PATCH_REPO_06} | patch -p1 && \ wget -O - ${FFMPEG_MA_PATCH_REPO_07} | patch -p1 && \ wget -O - ${FFMPEG_MA_PATCH_REPO_08} | patch -p1 && \ - wget -O - ${FFMPEG_MA_PATCH_REPO_09} | patch -p1; + wget -O - ${FFMPEG_MA_PATCH_REPO_09} | patch -p1 && \ + wget -O - ${FFMPEG_MA_PATCH_REPO_10} | patch -p1; # Patch FFmpeg source for SVT-HEVC RUN cd /home/FFmpeg && \ diff --git a/VCA2/ubuntu-18.04/ffmpeg/Dockerfile b/VCA2/ubuntu-18.04/ffmpeg/Dockerfile index b2d39f483..3598e5bec 100644 --- a/VCA2/ubuntu-18.04/ffmpeg/Dockerfile +++ b/VCA2/ubuntu-18.04/ffmpeg/Dockerfile @@ -259,6 +259,7 @@ ARG FFMPEG_MA_PATCH_REPO_06=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/ ARG FFMPEG_MA_PATCH_REPO_07=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0007-Refine-features-of-IE-filters.patch ARG FFMPEG_MA_PATCH_REPO_08=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0008-fixed-extra-comma-in-iemetadata.patch ARG FFMPEG_MA_PATCH_REPO_09=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0009-add-source-as-option-source-url-calculate-nano-times.patch +ARG FFMPEG_MA_PATCH_REPO_10=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0010-fixed-buffer-overflow-issue-in-iemetadata.patch RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install -y -q --no-install-recommends libvdpau-dev libsdl2-dev libxcb1-dev libxcb-shm0-dev libxcb-xfixes0-dev zlib1g-dev libssl-dev @@ -275,7 +276,8 @@ RUN wget -O - ${FFMPEG_REPO} | tar xz && mv FFmpeg-${FFMPEG_VER} FFmpeg && \ wget -O - ${FFMPEG_MA_PATCH_REPO_06} | patch -p1 && \ wget -O - ${FFMPEG_MA_PATCH_REPO_07} | patch -p1 && \ wget -O - ${FFMPEG_MA_PATCH_REPO_08} | patch -p1 && \ - wget -O - ${FFMPEG_MA_PATCH_REPO_09} | patch -p1; + wget -O - ${FFMPEG_MA_PATCH_REPO_09} | patch -p1 && \ + wget -O - ${FFMPEG_MA_PATCH_REPO_10} | patch -p1; # Patch FFmpeg source for SVT-HEVC RUN cd /home/FFmpeg && \ diff --git a/Xeon/centos-7.4/dldt+ffmpeg/Dockerfile b/Xeon/centos-7.4/dldt+ffmpeg/Dockerfile index c6b44f471..bc122e874 100644 --- a/Xeon/centos-7.4/dldt+ffmpeg/Dockerfile +++ b/Xeon/centos-7.4/dldt+ffmpeg/Dockerfile @@ -296,6 +296,7 @@ ARG FFMPEG_MA_PATCH_REPO_06=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/ ARG FFMPEG_MA_PATCH_REPO_07=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0007-Refine-features-of-IE-filters.patch ARG FFMPEG_MA_PATCH_REPO_08=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0008-fixed-extra-comma-in-iemetadata.patch ARG FFMPEG_MA_PATCH_REPO_09=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0009-add-source-as-option-source-url-calculate-nano-times.patch +ARG FFMPEG_MA_PATCH_REPO_10=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0010-fixed-buffer-overflow-issue-in-iemetadata.patch RUN yum install -y -q zlib-devel openssl-devel @@ -312,7 +313,8 @@ RUN wget -O - ${FFMPEG_REPO} | tar xz && mv FFmpeg-${FFMPEG_VER} FFmpeg && \ wget -O - ${FFMPEG_MA_PATCH_REPO_06} | patch -p1 && \ wget -O - ${FFMPEG_MA_PATCH_REPO_07} | patch -p1 && \ wget -O - ${FFMPEG_MA_PATCH_REPO_08} | patch -p1 && \ - wget -O - ${FFMPEG_MA_PATCH_REPO_09} | patch -p1; + wget -O - ${FFMPEG_MA_PATCH_REPO_09} | patch -p1 && \ + wget -O - ${FFMPEG_MA_PATCH_REPO_10} | patch -p1; # Patch FFmpeg source for SVT-HEVC RUN cd /home/FFmpeg && \ diff --git a/Xeon/centos-7.4/ffmpeg+gst+dev/Dockerfile b/Xeon/centos-7.4/ffmpeg+gst+dev/Dockerfile index 1388453ec..aefe48c3f 100644 --- a/Xeon/centos-7.4/ffmpeg+gst+dev/Dockerfile +++ b/Xeon/centos-7.4/ffmpeg+gst+dev/Dockerfile @@ -498,6 +498,7 @@ ARG FFMPEG_MA_PATCH_REPO_06=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/ ARG FFMPEG_MA_PATCH_REPO_07=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0007-Refine-features-of-IE-filters.patch ARG FFMPEG_MA_PATCH_REPO_08=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0008-fixed-extra-comma-in-iemetadata.patch ARG FFMPEG_MA_PATCH_REPO_09=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0009-add-source-as-option-source-url-calculate-nano-times.patch +ARG FFMPEG_MA_PATCH_REPO_10=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0010-fixed-buffer-overflow-issue-in-iemetadata.patch RUN yum install -y -q libass-devel freetype-devel SDL2-devel libxcb-devel texinfo zlib-devel openssl-devel @@ -514,7 +515,8 @@ RUN wget -O - ${FFMPEG_REPO} | tar xz && mv FFmpeg-${FFMPEG_VER} FFmpeg && \ wget -O - ${FFMPEG_MA_PATCH_REPO_06} | patch -p1 && \ wget -O - ${FFMPEG_MA_PATCH_REPO_07} | patch -p1 && \ wget -O - ${FFMPEG_MA_PATCH_REPO_08} | patch -p1 && \ - wget -O - ${FFMPEG_MA_PATCH_REPO_09} | patch -p1; + wget -O - ${FFMPEG_MA_PATCH_REPO_09} | patch -p1 && \ + wget -O - ${FFMPEG_MA_PATCH_REPO_10} | patch -p1; # Patch FFmpeg source for SVT-HEVC RUN cd /home/FFmpeg && \ diff --git a/Xeon/centos-7.4/ffmpeg/Dockerfile b/Xeon/centos-7.4/ffmpeg/Dockerfile index faa8a535c..f296cef27 100644 --- a/Xeon/centos-7.4/ffmpeg/Dockerfile +++ b/Xeon/centos-7.4/ffmpeg/Dockerfile @@ -215,6 +215,7 @@ ARG FFMPEG_MA_PATCH_REPO_06=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/ ARG FFMPEG_MA_PATCH_REPO_07=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0007-Refine-features-of-IE-filters.patch ARG FFMPEG_MA_PATCH_REPO_08=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0008-fixed-extra-comma-in-iemetadata.patch ARG FFMPEG_MA_PATCH_REPO_09=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0009-add-source-as-option-source-url-calculate-nano-times.patch +ARG FFMPEG_MA_PATCH_REPO_10=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0010-fixed-buffer-overflow-issue-in-iemetadata.patch RUN yum install -y -q zlib-devel openssl-devel @@ -231,7 +232,8 @@ RUN wget -O - ${FFMPEG_REPO} | tar xz && mv FFmpeg-${FFMPEG_VER} FFmpeg && \ wget -O - ${FFMPEG_MA_PATCH_REPO_06} | patch -p1 && \ wget -O - ${FFMPEG_MA_PATCH_REPO_07} | patch -p1 && \ wget -O - ${FFMPEG_MA_PATCH_REPO_08} | patch -p1 && \ - wget -O - ${FFMPEG_MA_PATCH_REPO_09} | patch -p1; + wget -O - ${FFMPEG_MA_PATCH_REPO_09} | patch -p1 && \ + wget -O - ${FFMPEG_MA_PATCH_REPO_10} | patch -p1; # Patch FFmpeg source for SVT-HEVC RUN cd /home/FFmpeg && \ diff --git a/Xeon/centos-7.5/dldt+ffmpeg/Dockerfile b/Xeon/centos-7.5/dldt+ffmpeg/Dockerfile index ec12eae3b..e112d0407 100644 --- a/Xeon/centos-7.5/dldt+ffmpeg/Dockerfile +++ b/Xeon/centos-7.5/dldt+ffmpeg/Dockerfile @@ -296,6 +296,7 @@ ARG FFMPEG_MA_PATCH_REPO_06=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/ ARG FFMPEG_MA_PATCH_REPO_07=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0007-Refine-features-of-IE-filters.patch ARG FFMPEG_MA_PATCH_REPO_08=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0008-fixed-extra-comma-in-iemetadata.patch ARG FFMPEG_MA_PATCH_REPO_09=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0009-add-source-as-option-source-url-calculate-nano-times.patch +ARG FFMPEG_MA_PATCH_REPO_10=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0010-fixed-buffer-overflow-issue-in-iemetadata.patch RUN yum install -y -q zlib-devel openssl-devel @@ -312,7 +313,8 @@ RUN wget -O - ${FFMPEG_REPO} | tar xz && mv FFmpeg-${FFMPEG_VER} FFmpeg && \ wget -O - ${FFMPEG_MA_PATCH_REPO_06} | patch -p1 && \ wget -O - ${FFMPEG_MA_PATCH_REPO_07} | patch -p1 && \ wget -O - ${FFMPEG_MA_PATCH_REPO_08} | patch -p1 && \ - wget -O - ${FFMPEG_MA_PATCH_REPO_09} | patch -p1; + wget -O - ${FFMPEG_MA_PATCH_REPO_09} | patch -p1 && \ + wget -O - ${FFMPEG_MA_PATCH_REPO_10} | patch -p1; # Patch FFmpeg source for SVT-HEVC RUN cd /home/FFmpeg && \ diff --git a/Xeon/centos-7.5/ffmpeg+gst+dev/Dockerfile b/Xeon/centos-7.5/ffmpeg+gst+dev/Dockerfile index 912b59fb3..3e9fb1e64 100644 --- a/Xeon/centos-7.5/ffmpeg+gst+dev/Dockerfile +++ b/Xeon/centos-7.5/ffmpeg+gst+dev/Dockerfile @@ -497,6 +497,7 @@ ARG FFMPEG_MA_PATCH_REPO_06=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/ ARG FFMPEG_MA_PATCH_REPO_07=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0007-Refine-features-of-IE-filters.patch ARG FFMPEG_MA_PATCH_REPO_08=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0008-fixed-extra-comma-in-iemetadata.patch ARG FFMPEG_MA_PATCH_REPO_09=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0009-add-source-as-option-source-url-calculate-nano-times.patch +ARG FFMPEG_MA_PATCH_REPO_10=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0010-fixed-buffer-overflow-issue-in-iemetadata.patch RUN yum install -y -q libass-devel freetype-devel SDL2-devel libxcb-devel texinfo zlib-devel openssl-devel @@ -513,7 +514,8 @@ RUN wget -O - ${FFMPEG_REPO} | tar xz && mv FFmpeg-${FFMPEG_VER} FFmpeg && \ wget -O - ${FFMPEG_MA_PATCH_REPO_06} | patch -p1 && \ wget -O - ${FFMPEG_MA_PATCH_REPO_07} | patch -p1 && \ wget -O - ${FFMPEG_MA_PATCH_REPO_08} | patch -p1 && \ - wget -O - ${FFMPEG_MA_PATCH_REPO_09} | patch -p1; + wget -O - ${FFMPEG_MA_PATCH_REPO_09} | patch -p1 && \ + wget -O - ${FFMPEG_MA_PATCH_REPO_10} | patch -p1; # Patch FFmpeg source for SVT-HEVC RUN cd /home/FFmpeg && \ diff --git a/Xeon/centos-7.5/ffmpeg/Dockerfile b/Xeon/centos-7.5/ffmpeg/Dockerfile index a76d5270d..0564126a1 100644 --- a/Xeon/centos-7.5/ffmpeg/Dockerfile +++ b/Xeon/centos-7.5/ffmpeg/Dockerfile @@ -215,6 +215,7 @@ ARG FFMPEG_MA_PATCH_REPO_06=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/ ARG FFMPEG_MA_PATCH_REPO_07=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0007-Refine-features-of-IE-filters.patch ARG FFMPEG_MA_PATCH_REPO_08=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0008-fixed-extra-comma-in-iemetadata.patch ARG FFMPEG_MA_PATCH_REPO_09=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0009-add-source-as-option-source-url-calculate-nano-times.patch +ARG FFMPEG_MA_PATCH_REPO_10=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0010-fixed-buffer-overflow-issue-in-iemetadata.patch RUN yum install -y -q zlib-devel openssl-devel @@ -231,7 +232,8 @@ RUN wget -O - ${FFMPEG_REPO} | tar xz && mv FFmpeg-${FFMPEG_VER} FFmpeg && \ wget -O - ${FFMPEG_MA_PATCH_REPO_06} | patch -p1 && \ wget -O - ${FFMPEG_MA_PATCH_REPO_07} | patch -p1 && \ wget -O - ${FFMPEG_MA_PATCH_REPO_08} | patch -p1 && \ - wget -O - ${FFMPEG_MA_PATCH_REPO_09} | patch -p1; + wget -O - ${FFMPEG_MA_PATCH_REPO_09} | patch -p1 && \ + wget -O - ${FFMPEG_MA_PATCH_REPO_10} | patch -p1; # Patch FFmpeg source for SVT-HEVC RUN cd /home/FFmpeg && \ diff --git a/Xeon/centos-7.6/dldt+ffmpeg/Dockerfile b/Xeon/centos-7.6/dldt+ffmpeg/Dockerfile index c65be43b1..fc6f0a073 100644 --- a/Xeon/centos-7.6/dldt+ffmpeg/Dockerfile +++ b/Xeon/centos-7.6/dldt+ffmpeg/Dockerfile @@ -296,6 +296,7 @@ ARG FFMPEG_MA_PATCH_REPO_06=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/ ARG FFMPEG_MA_PATCH_REPO_07=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0007-Refine-features-of-IE-filters.patch ARG FFMPEG_MA_PATCH_REPO_08=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0008-fixed-extra-comma-in-iemetadata.patch ARG FFMPEG_MA_PATCH_REPO_09=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0009-add-source-as-option-source-url-calculate-nano-times.patch +ARG FFMPEG_MA_PATCH_REPO_10=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0010-fixed-buffer-overflow-issue-in-iemetadata.patch RUN yum install -y -q zlib-devel openssl-devel @@ -312,7 +313,8 @@ RUN wget -O - ${FFMPEG_REPO} | tar xz && mv FFmpeg-${FFMPEG_VER} FFmpeg && \ wget -O - ${FFMPEG_MA_PATCH_REPO_06} | patch -p1 && \ wget -O - ${FFMPEG_MA_PATCH_REPO_07} | patch -p1 && \ wget -O - ${FFMPEG_MA_PATCH_REPO_08} | patch -p1 && \ - wget -O - ${FFMPEG_MA_PATCH_REPO_09} | patch -p1; + wget -O - ${FFMPEG_MA_PATCH_REPO_09} | patch -p1 && \ + wget -O - ${FFMPEG_MA_PATCH_REPO_10} | patch -p1; # Patch FFmpeg source for SVT-HEVC RUN cd /home/FFmpeg && \ diff --git a/Xeon/centos-7.6/ffmpeg+gst+dev/Dockerfile b/Xeon/centos-7.6/ffmpeg+gst+dev/Dockerfile index da6a4317a..37d5e2219 100644 --- a/Xeon/centos-7.6/ffmpeg+gst+dev/Dockerfile +++ b/Xeon/centos-7.6/ffmpeg+gst+dev/Dockerfile @@ -497,6 +497,7 @@ ARG FFMPEG_MA_PATCH_REPO_06=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/ ARG FFMPEG_MA_PATCH_REPO_07=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0007-Refine-features-of-IE-filters.patch ARG FFMPEG_MA_PATCH_REPO_08=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0008-fixed-extra-comma-in-iemetadata.patch ARG FFMPEG_MA_PATCH_REPO_09=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0009-add-source-as-option-source-url-calculate-nano-times.patch +ARG FFMPEG_MA_PATCH_REPO_10=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0010-fixed-buffer-overflow-issue-in-iemetadata.patch RUN yum install -y -q libass-devel freetype-devel SDL2-devel libxcb-devel texinfo zlib-devel openssl-devel @@ -513,7 +514,8 @@ RUN wget -O - ${FFMPEG_REPO} | tar xz && mv FFmpeg-${FFMPEG_VER} FFmpeg && \ wget -O - ${FFMPEG_MA_PATCH_REPO_06} | patch -p1 && \ wget -O - ${FFMPEG_MA_PATCH_REPO_07} | patch -p1 && \ wget -O - ${FFMPEG_MA_PATCH_REPO_08} | patch -p1 && \ - wget -O - ${FFMPEG_MA_PATCH_REPO_09} | patch -p1; + wget -O - ${FFMPEG_MA_PATCH_REPO_09} | patch -p1 && \ + wget -O - ${FFMPEG_MA_PATCH_REPO_10} | patch -p1; # Patch FFmpeg source for SVT-HEVC RUN cd /home/FFmpeg && \ diff --git a/Xeon/centos-7.6/ffmpeg/Dockerfile b/Xeon/centos-7.6/ffmpeg/Dockerfile index b07118556..c2654151d 100644 --- a/Xeon/centos-7.6/ffmpeg/Dockerfile +++ b/Xeon/centos-7.6/ffmpeg/Dockerfile @@ -215,6 +215,7 @@ ARG FFMPEG_MA_PATCH_REPO_06=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/ ARG FFMPEG_MA_PATCH_REPO_07=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0007-Refine-features-of-IE-filters.patch ARG FFMPEG_MA_PATCH_REPO_08=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0008-fixed-extra-comma-in-iemetadata.patch ARG FFMPEG_MA_PATCH_REPO_09=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0009-add-source-as-option-source-url-calculate-nano-times.patch +ARG FFMPEG_MA_PATCH_REPO_10=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0010-fixed-buffer-overflow-issue-in-iemetadata.patch RUN yum install -y -q zlib-devel openssl-devel @@ -231,7 +232,8 @@ RUN wget -O - ${FFMPEG_REPO} | tar xz && mv FFmpeg-${FFMPEG_VER} FFmpeg && \ wget -O - ${FFMPEG_MA_PATCH_REPO_06} | patch -p1 && \ wget -O - ${FFMPEG_MA_PATCH_REPO_07} | patch -p1 && \ wget -O - ${FFMPEG_MA_PATCH_REPO_08} | patch -p1 && \ - wget -O - ${FFMPEG_MA_PATCH_REPO_09} | patch -p1; + wget -O - ${FFMPEG_MA_PATCH_REPO_09} | patch -p1 && \ + wget -O - ${FFMPEG_MA_PATCH_REPO_10} | patch -p1; # Patch FFmpeg source for SVT-HEVC RUN cd /home/FFmpeg && \ diff --git a/Xeon/ubuntu-16.04/dldt+ffmpeg/Dockerfile b/Xeon/ubuntu-16.04/dldt+ffmpeg/Dockerfile index 1e0dc731d..642ce2992 100644 --- a/Xeon/ubuntu-16.04/dldt+ffmpeg/Dockerfile +++ b/Xeon/ubuntu-16.04/dldt+ffmpeg/Dockerfile @@ -286,6 +286,7 @@ ARG FFMPEG_MA_PATCH_REPO_06=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/ ARG FFMPEG_MA_PATCH_REPO_07=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0007-Refine-features-of-IE-filters.patch ARG FFMPEG_MA_PATCH_REPO_08=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0008-fixed-extra-comma-in-iemetadata.patch ARG FFMPEG_MA_PATCH_REPO_09=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0009-add-source-as-option-source-url-calculate-nano-times.patch +ARG FFMPEG_MA_PATCH_REPO_10=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0010-fixed-buffer-overflow-issue-in-iemetadata.patch RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install -y -q --no-install-recommends zlib1g-dev libssl-dev @@ -302,7 +303,8 @@ RUN wget -O - ${FFMPEG_REPO} | tar xz && mv FFmpeg-${FFMPEG_VER} FFmpeg && \ wget -O - ${FFMPEG_MA_PATCH_REPO_06} | patch -p1 && \ wget -O - ${FFMPEG_MA_PATCH_REPO_07} | patch -p1 && \ wget -O - ${FFMPEG_MA_PATCH_REPO_08} | patch -p1 && \ - wget -O - ${FFMPEG_MA_PATCH_REPO_09} | patch -p1; + wget -O - ${FFMPEG_MA_PATCH_REPO_09} | patch -p1 && \ + wget -O - ${FFMPEG_MA_PATCH_REPO_10} | patch -p1; # Patch FFmpeg source for SVT-HEVC RUN cd /home/FFmpeg && \ diff --git a/Xeon/ubuntu-16.04/ffmpeg+gst+dev/Dockerfile b/Xeon/ubuntu-16.04/ffmpeg+gst+dev/Dockerfile index 0ab04c958..2c334ae3e 100644 --- a/Xeon/ubuntu-16.04/ffmpeg+gst+dev/Dockerfile +++ b/Xeon/ubuntu-16.04/ffmpeg+gst+dev/Dockerfile @@ -480,6 +480,7 @@ ARG FFMPEG_MA_PATCH_REPO_06=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/ ARG FFMPEG_MA_PATCH_REPO_07=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0007-Refine-features-of-IE-filters.patch ARG FFMPEG_MA_PATCH_REPO_08=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0008-fixed-extra-comma-in-iemetadata.patch ARG FFMPEG_MA_PATCH_REPO_09=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0009-add-source-as-option-source-url-calculate-nano-times.patch +ARG FFMPEG_MA_PATCH_REPO_10=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0010-fixed-buffer-overflow-issue-in-iemetadata.patch RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install -y -q --no-install-recommends libass-dev libfreetype6-dev libsdl2-dev libxcb1-dev libxcb-shm0-dev libxcb-xfixes0-dev texinfo zlib1g-dev libssl-dev @@ -496,7 +497,8 @@ RUN wget -O - ${FFMPEG_REPO} | tar xz && mv FFmpeg-${FFMPEG_VER} FFmpeg && \ wget -O - ${FFMPEG_MA_PATCH_REPO_06} | patch -p1 && \ wget -O - ${FFMPEG_MA_PATCH_REPO_07} | patch -p1 && \ wget -O - ${FFMPEG_MA_PATCH_REPO_08} | patch -p1 && \ - wget -O - ${FFMPEG_MA_PATCH_REPO_09} | patch -p1; + wget -O - ${FFMPEG_MA_PATCH_REPO_09} | patch -p1 && \ + wget -O - ${FFMPEG_MA_PATCH_REPO_10} | patch -p1; # Patch FFmpeg source for SVT-HEVC RUN cd /home/FFmpeg && \ diff --git a/Xeon/ubuntu-16.04/ffmpeg/Dockerfile b/Xeon/ubuntu-16.04/ffmpeg/Dockerfile index 43a5bca9c..e041aac56 100644 --- a/Xeon/ubuntu-16.04/ffmpeg/Dockerfile +++ b/Xeon/ubuntu-16.04/ffmpeg/Dockerfile @@ -206,6 +206,7 @@ ARG FFMPEG_MA_PATCH_REPO_06=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/ ARG FFMPEG_MA_PATCH_REPO_07=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0007-Refine-features-of-IE-filters.patch ARG FFMPEG_MA_PATCH_REPO_08=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0008-fixed-extra-comma-in-iemetadata.patch ARG FFMPEG_MA_PATCH_REPO_09=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0009-add-source-as-option-source-url-calculate-nano-times.patch +ARG FFMPEG_MA_PATCH_REPO_10=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0010-fixed-buffer-overflow-issue-in-iemetadata.patch RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install -y -q --no-install-recommends zlib1g-dev libssl-dev @@ -222,7 +223,8 @@ RUN wget -O - ${FFMPEG_REPO} | tar xz && mv FFmpeg-${FFMPEG_VER} FFmpeg && \ wget -O - ${FFMPEG_MA_PATCH_REPO_06} | patch -p1 && \ wget -O - ${FFMPEG_MA_PATCH_REPO_07} | patch -p1 && \ wget -O - ${FFMPEG_MA_PATCH_REPO_08} | patch -p1 && \ - wget -O - ${FFMPEG_MA_PATCH_REPO_09} | patch -p1; + wget -O - ${FFMPEG_MA_PATCH_REPO_09} | patch -p1 && \ + wget -O - ${FFMPEG_MA_PATCH_REPO_10} | patch -p1; # Patch FFmpeg source for SVT-HEVC RUN cd /home/FFmpeg && \ diff --git a/Xeon/ubuntu-18.04/dldt+ffmpeg/Dockerfile b/Xeon/ubuntu-18.04/dldt+ffmpeg/Dockerfile index 450b0306e..f5c36d351 100644 --- a/Xeon/ubuntu-18.04/dldt+ffmpeg/Dockerfile +++ b/Xeon/ubuntu-18.04/dldt+ffmpeg/Dockerfile @@ -287,6 +287,7 @@ ARG FFMPEG_MA_PATCH_REPO_06=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/ ARG FFMPEG_MA_PATCH_REPO_07=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0007-Refine-features-of-IE-filters.patch ARG FFMPEG_MA_PATCH_REPO_08=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0008-fixed-extra-comma-in-iemetadata.patch ARG FFMPEG_MA_PATCH_REPO_09=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0009-add-source-as-option-source-url-calculate-nano-times.patch +ARG FFMPEG_MA_PATCH_REPO_10=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0010-fixed-buffer-overflow-issue-in-iemetadata.patch RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install -y -q --no-install-recommends zlib1g-dev libssl-dev @@ -303,7 +304,8 @@ RUN wget -O - ${FFMPEG_REPO} | tar xz && mv FFmpeg-${FFMPEG_VER} FFmpeg && \ wget -O - ${FFMPEG_MA_PATCH_REPO_06} | patch -p1 && \ wget -O - ${FFMPEG_MA_PATCH_REPO_07} | patch -p1 && \ wget -O - ${FFMPEG_MA_PATCH_REPO_08} | patch -p1 && \ - wget -O - ${FFMPEG_MA_PATCH_REPO_09} | patch -p1; + wget -O - ${FFMPEG_MA_PATCH_REPO_09} | patch -p1 && \ + wget -O - ${FFMPEG_MA_PATCH_REPO_10} | patch -p1; # Patch FFmpeg source for SVT-HEVC RUN cd /home/FFmpeg && \ diff --git a/Xeon/ubuntu-18.04/ffmpeg+gst+dev/Dockerfile b/Xeon/ubuntu-18.04/ffmpeg+gst+dev/Dockerfile index ac72950f6..e58b0045b 100644 --- a/Xeon/ubuntu-18.04/ffmpeg+gst+dev/Dockerfile +++ b/Xeon/ubuntu-18.04/ffmpeg+gst+dev/Dockerfile @@ -482,6 +482,7 @@ ARG FFMPEG_MA_PATCH_REPO_06=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/ ARG FFMPEG_MA_PATCH_REPO_07=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0007-Refine-features-of-IE-filters.patch ARG FFMPEG_MA_PATCH_REPO_08=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0008-fixed-extra-comma-in-iemetadata.patch ARG FFMPEG_MA_PATCH_REPO_09=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0009-add-source-as-option-source-url-calculate-nano-times.patch +ARG FFMPEG_MA_PATCH_REPO_10=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0010-fixed-buffer-overflow-issue-in-iemetadata.patch RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install -y -q --no-install-recommends libass-dev libfreetype6-dev libsdl2-dev libxcb1-dev libxcb-shm0-dev libxcb-xfixes0-dev texinfo zlib1g-dev libssl-dev @@ -498,7 +499,8 @@ RUN wget -O - ${FFMPEG_REPO} | tar xz && mv FFmpeg-${FFMPEG_VER} FFmpeg && \ wget -O - ${FFMPEG_MA_PATCH_REPO_06} | patch -p1 && \ wget -O - ${FFMPEG_MA_PATCH_REPO_07} | patch -p1 && \ wget -O - ${FFMPEG_MA_PATCH_REPO_08} | patch -p1 && \ - wget -O - ${FFMPEG_MA_PATCH_REPO_09} | patch -p1; + wget -O - ${FFMPEG_MA_PATCH_REPO_09} | patch -p1 && \ + wget -O - ${FFMPEG_MA_PATCH_REPO_10} | patch -p1; # Patch FFmpeg source for SVT-HEVC RUN cd /home/FFmpeg && \ diff --git a/Xeon/ubuntu-18.04/ffmpeg/Dockerfile b/Xeon/ubuntu-18.04/ffmpeg/Dockerfile index b2d259e87..31391c4bb 100644 --- a/Xeon/ubuntu-18.04/ffmpeg/Dockerfile +++ b/Xeon/ubuntu-18.04/ffmpeg/Dockerfile @@ -206,6 +206,7 @@ ARG FFMPEG_MA_PATCH_REPO_06=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/ ARG FFMPEG_MA_PATCH_REPO_07=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0007-Refine-features-of-IE-filters.patch ARG FFMPEG_MA_PATCH_REPO_08=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0008-fixed-extra-comma-in-iemetadata.patch ARG FFMPEG_MA_PATCH_REPO_09=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0009-add-source-as-option-source-url-calculate-nano-times.patch +ARG FFMPEG_MA_PATCH_REPO_10=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0010-fixed-buffer-overflow-issue-in-iemetadata.patch RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install -y -q --no-install-recommends zlib1g-dev libssl-dev @@ -222,7 +223,8 @@ RUN wget -O - ${FFMPEG_REPO} | tar xz && mv FFmpeg-${FFMPEG_VER} FFmpeg && \ wget -O - ${FFMPEG_MA_PATCH_REPO_06} | patch -p1 && \ wget -O - ${FFMPEG_MA_PATCH_REPO_07} | patch -p1 && \ wget -O - ${FFMPEG_MA_PATCH_REPO_08} | patch -p1 && \ - wget -O - ${FFMPEG_MA_PATCH_REPO_09} | patch -p1; + wget -O - ${FFMPEG_MA_PATCH_REPO_09} | patch -p1 && \ + wget -O - ${FFMPEG_MA_PATCH_REPO_10} | patch -p1; # Patch FFmpeg source for SVT-HEVC RUN cd /home/FFmpeg && \ diff --git a/XeonE3/centos-7.4/ffmpeg+gst+dev/Dockerfile b/XeonE3/centos-7.4/ffmpeg+gst+dev/Dockerfile index e7e5dcd2c..f16d4d5c6 100644 --- a/XeonE3/centos-7.4/ffmpeg+gst+dev/Dockerfile +++ b/XeonE3/centos-7.4/ffmpeg+gst+dev/Dockerfile @@ -599,6 +599,7 @@ ARG FFMPEG_MA_PATCH_REPO_06=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/ ARG FFMPEG_MA_PATCH_REPO_07=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0007-Refine-features-of-IE-filters.patch ARG FFMPEG_MA_PATCH_REPO_08=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0008-fixed-extra-comma-in-iemetadata.patch ARG FFMPEG_MA_PATCH_REPO_09=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0009-add-source-as-option-source-url-calculate-nano-times.patch +ARG FFMPEG_MA_PATCH_REPO_10=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0010-fixed-buffer-overflow-issue-in-iemetadata.patch RUN yum install -y -q libass-devel freetype-devel SDL2-devel libxcb-devel libvdpau-devel texinfo zlib-devel openssl-devel @@ -615,7 +616,8 @@ RUN wget -O - ${FFMPEG_REPO} | tar xz && mv FFmpeg-${FFMPEG_VER} FFmpeg && \ wget -O - ${FFMPEG_MA_PATCH_REPO_06} | patch -p1 && \ wget -O - ${FFMPEG_MA_PATCH_REPO_07} | patch -p1 && \ wget -O - ${FFMPEG_MA_PATCH_REPO_08} | patch -p1 && \ - wget -O - ${FFMPEG_MA_PATCH_REPO_09} | patch -p1; + wget -O - ${FFMPEG_MA_PATCH_REPO_09} | patch -p1 && \ + wget -O - ${FFMPEG_MA_PATCH_REPO_10} | patch -p1; # Patch FFmpeg source for SVT-HEVC RUN cd /home/FFmpeg && \ diff --git a/XeonE3/centos-7.4/ffmpeg/Dockerfile b/XeonE3/centos-7.4/ffmpeg/Dockerfile index 472bde832..f3d9ee1d6 100644 --- a/XeonE3/centos-7.4/ffmpeg/Dockerfile +++ b/XeonE3/centos-7.4/ffmpeg/Dockerfile @@ -267,6 +267,7 @@ ARG FFMPEG_MA_PATCH_REPO_06=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/ ARG FFMPEG_MA_PATCH_REPO_07=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0007-Refine-features-of-IE-filters.patch ARG FFMPEG_MA_PATCH_REPO_08=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0008-fixed-extra-comma-in-iemetadata.patch ARG FFMPEG_MA_PATCH_REPO_09=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0009-add-source-as-option-source-url-calculate-nano-times.patch +ARG FFMPEG_MA_PATCH_REPO_10=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0010-fixed-buffer-overflow-issue-in-iemetadata.patch RUN yum install -y -q SDL2-devel libxcb-devel libvdpau-devel zlib-devel openssl-devel @@ -283,7 +284,8 @@ RUN wget -O - ${FFMPEG_REPO} | tar xz && mv FFmpeg-${FFMPEG_VER} FFmpeg && \ wget -O - ${FFMPEG_MA_PATCH_REPO_06} | patch -p1 && \ wget -O - ${FFMPEG_MA_PATCH_REPO_07} | patch -p1 && \ wget -O - ${FFMPEG_MA_PATCH_REPO_08} | patch -p1 && \ - wget -O - ${FFMPEG_MA_PATCH_REPO_09} | patch -p1; + wget -O - ${FFMPEG_MA_PATCH_REPO_09} | patch -p1 && \ + wget -O - ${FFMPEG_MA_PATCH_REPO_10} | patch -p1; # Patch FFmpeg source for SVT-HEVC RUN cd /home/FFmpeg && \ diff --git a/XeonE3/centos-7.5/ffmpeg+gst+dev/Dockerfile b/XeonE3/centos-7.5/ffmpeg+gst+dev/Dockerfile index 4e929b5fc..c18c98f06 100644 --- a/XeonE3/centos-7.5/ffmpeg+gst+dev/Dockerfile +++ b/XeonE3/centos-7.5/ffmpeg+gst+dev/Dockerfile @@ -598,6 +598,7 @@ ARG FFMPEG_MA_PATCH_REPO_06=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/ ARG FFMPEG_MA_PATCH_REPO_07=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0007-Refine-features-of-IE-filters.patch ARG FFMPEG_MA_PATCH_REPO_08=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0008-fixed-extra-comma-in-iemetadata.patch ARG FFMPEG_MA_PATCH_REPO_09=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0009-add-source-as-option-source-url-calculate-nano-times.patch +ARG FFMPEG_MA_PATCH_REPO_10=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0010-fixed-buffer-overflow-issue-in-iemetadata.patch RUN yum install -y -q libass-devel freetype-devel SDL2-devel libxcb-devel libvdpau-devel texinfo zlib-devel openssl-devel @@ -614,7 +615,8 @@ RUN wget -O - ${FFMPEG_REPO} | tar xz && mv FFmpeg-${FFMPEG_VER} FFmpeg && \ wget -O - ${FFMPEG_MA_PATCH_REPO_06} | patch -p1 && \ wget -O - ${FFMPEG_MA_PATCH_REPO_07} | patch -p1 && \ wget -O - ${FFMPEG_MA_PATCH_REPO_08} | patch -p1 && \ - wget -O - ${FFMPEG_MA_PATCH_REPO_09} | patch -p1; + wget -O - ${FFMPEG_MA_PATCH_REPO_09} | patch -p1 && \ + wget -O - ${FFMPEG_MA_PATCH_REPO_10} | patch -p1; # Patch FFmpeg source for SVT-HEVC RUN cd /home/FFmpeg && \ diff --git a/XeonE3/centos-7.5/ffmpeg/Dockerfile b/XeonE3/centos-7.5/ffmpeg/Dockerfile index d0a1415ba..254cba4c2 100644 --- a/XeonE3/centos-7.5/ffmpeg/Dockerfile +++ b/XeonE3/centos-7.5/ffmpeg/Dockerfile @@ -267,6 +267,7 @@ ARG FFMPEG_MA_PATCH_REPO_06=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/ ARG FFMPEG_MA_PATCH_REPO_07=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0007-Refine-features-of-IE-filters.patch ARG FFMPEG_MA_PATCH_REPO_08=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0008-fixed-extra-comma-in-iemetadata.patch ARG FFMPEG_MA_PATCH_REPO_09=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0009-add-source-as-option-source-url-calculate-nano-times.patch +ARG FFMPEG_MA_PATCH_REPO_10=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0010-fixed-buffer-overflow-issue-in-iemetadata.patch RUN yum install -y -q SDL2-devel libxcb-devel libvdpau-devel zlib-devel openssl-devel @@ -283,7 +284,8 @@ RUN wget -O - ${FFMPEG_REPO} | tar xz && mv FFmpeg-${FFMPEG_VER} FFmpeg && \ wget -O - ${FFMPEG_MA_PATCH_REPO_06} | patch -p1 && \ wget -O - ${FFMPEG_MA_PATCH_REPO_07} | patch -p1 && \ wget -O - ${FFMPEG_MA_PATCH_REPO_08} | patch -p1 && \ - wget -O - ${FFMPEG_MA_PATCH_REPO_09} | patch -p1; + wget -O - ${FFMPEG_MA_PATCH_REPO_09} | patch -p1 && \ + wget -O - ${FFMPEG_MA_PATCH_REPO_10} | patch -p1; # Patch FFmpeg source for SVT-HEVC RUN cd /home/FFmpeg && \ diff --git a/XeonE3/centos-7.6/ffmpeg+gst+dev/Dockerfile b/XeonE3/centos-7.6/ffmpeg+gst+dev/Dockerfile index 9deb47d53..6dbb0b691 100644 --- a/XeonE3/centos-7.6/ffmpeg+gst+dev/Dockerfile +++ b/XeonE3/centos-7.6/ffmpeg+gst+dev/Dockerfile @@ -598,6 +598,7 @@ ARG FFMPEG_MA_PATCH_REPO_06=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/ ARG FFMPEG_MA_PATCH_REPO_07=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0007-Refine-features-of-IE-filters.patch ARG FFMPEG_MA_PATCH_REPO_08=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0008-fixed-extra-comma-in-iemetadata.patch ARG FFMPEG_MA_PATCH_REPO_09=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0009-add-source-as-option-source-url-calculate-nano-times.patch +ARG FFMPEG_MA_PATCH_REPO_10=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0010-fixed-buffer-overflow-issue-in-iemetadata.patch RUN yum install -y -q libass-devel freetype-devel SDL2-devel libxcb-devel libvdpau-devel texinfo zlib-devel openssl-devel @@ -614,7 +615,8 @@ RUN wget -O - ${FFMPEG_REPO} | tar xz && mv FFmpeg-${FFMPEG_VER} FFmpeg && \ wget -O - ${FFMPEG_MA_PATCH_REPO_06} | patch -p1 && \ wget -O - ${FFMPEG_MA_PATCH_REPO_07} | patch -p1 && \ wget -O - ${FFMPEG_MA_PATCH_REPO_08} | patch -p1 && \ - wget -O - ${FFMPEG_MA_PATCH_REPO_09} | patch -p1; + wget -O - ${FFMPEG_MA_PATCH_REPO_09} | patch -p1 && \ + wget -O - ${FFMPEG_MA_PATCH_REPO_10} | patch -p1; # Patch FFmpeg source for SVT-HEVC RUN cd /home/FFmpeg && \ diff --git a/XeonE3/centos-7.6/ffmpeg/Dockerfile b/XeonE3/centos-7.6/ffmpeg/Dockerfile index 39a56dfa6..3ce7bede6 100644 --- a/XeonE3/centos-7.6/ffmpeg/Dockerfile +++ b/XeonE3/centos-7.6/ffmpeg/Dockerfile @@ -267,6 +267,7 @@ ARG FFMPEG_MA_PATCH_REPO_06=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/ ARG FFMPEG_MA_PATCH_REPO_07=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0007-Refine-features-of-IE-filters.patch ARG FFMPEG_MA_PATCH_REPO_08=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0008-fixed-extra-comma-in-iemetadata.patch ARG FFMPEG_MA_PATCH_REPO_09=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0009-add-source-as-option-source-url-calculate-nano-times.patch +ARG FFMPEG_MA_PATCH_REPO_10=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0010-fixed-buffer-overflow-issue-in-iemetadata.patch RUN yum install -y -q SDL2-devel libxcb-devel libvdpau-devel zlib-devel openssl-devel @@ -283,7 +284,8 @@ RUN wget -O - ${FFMPEG_REPO} | tar xz && mv FFmpeg-${FFMPEG_VER} FFmpeg && \ wget -O - ${FFMPEG_MA_PATCH_REPO_06} | patch -p1 && \ wget -O - ${FFMPEG_MA_PATCH_REPO_07} | patch -p1 && \ wget -O - ${FFMPEG_MA_PATCH_REPO_08} | patch -p1 && \ - wget -O - ${FFMPEG_MA_PATCH_REPO_09} | patch -p1; + wget -O - ${FFMPEG_MA_PATCH_REPO_09} | patch -p1 && \ + wget -O - ${FFMPEG_MA_PATCH_REPO_10} | patch -p1; # Patch FFmpeg source for SVT-HEVC RUN cd /home/FFmpeg && \ diff --git a/XeonE3/ubuntu-16.04/ffmpeg+gst+dev/Dockerfile b/XeonE3/ubuntu-16.04/ffmpeg+gst+dev/Dockerfile index a6f60d422..e8dc65772 100644 --- a/XeonE3/ubuntu-16.04/ffmpeg+gst+dev/Dockerfile +++ b/XeonE3/ubuntu-16.04/ffmpeg+gst+dev/Dockerfile @@ -602,6 +602,7 @@ ARG FFMPEG_MA_PATCH_REPO_06=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/ ARG FFMPEG_MA_PATCH_REPO_07=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0007-Refine-features-of-IE-filters.patch ARG FFMPEG_MA_PATCH_REPO_08=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0008-fixed-extra-comma-in-iemetadata.patch ARG FFMPEG_MA_PATCH_REPO_09=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0009-add-source-as-option-source-url-calculate-nano-times.patch +ARG FFMPEG_MA_PATCH_REPO_10=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0010-fixed-buffer-overflow-issue-in-iemetadata.patch RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install -y -q --no-install-recommends libass-dev libfreetype6-dev libvdpau-dev libsdl2-dev libxcb1-dev libxcb-shm0-dev libxcb-xfixes0-dev texinfo zlib1g-dev libssl-dev @@ -618,7 +619,8 @@ RUN wget -O - ${FFMPEG_REPO} | tar xz && mv FFmpeg-${FFMPEG_VER} FFmpeg && \ wget -O - ${FFMPEG_MA_PATCH_REPO_06} | patch -p1 && \ wget -O - ${FFMPEG_MA_PATCH_REPO_07} | patch -p1 && \ wget -O - ${FFMPEG_MA_PATCH_REPO_08} | patch -p1 && \ - wget -O - ${FFMPEG_MA_PATCH_REPO_09} | patch -p1; + wget -O - ${FFMPEG_MA_PATCH_REPO_09} | patch -p1 && \ + wget -O - ${FFMPEG_MA_PATCH_REPO_10} | patch -p1; # Patch FFmpeg source for SVT-HEVC RUN cd /home/FFmpeg && \ diff --git a/XeonE3/ubuntu-16.04/ffmpeg/Dockerfile b/XeonE3/ubuntu-16.04/ffmpeg/Dockerfile index d5bf3463a..1caf5d9c2 100644 --- a/XeonE3/ubuntu-16.04/ffmpeg/Dockerfile +++ b/XeonE3/ubuntu-16.04/ffmpeg/Dockerfile @@ -259,6 +259,7 @@ ARG FFMPEG_MA_PATCH_REPO_06=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/ ARG FFMPEG_MA_PATCH_REPO_07=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0007-Refine-features-of-IE-filters.patch ARG FFMPEG_MA_PATCH_REPO_08=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0008-fixed-extra-comma-in-iemetadata.patch ARG FFMPEG_MA_PATCH_REPO_09=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0009-add-source-as-option-source-url-calculate-nano-times.patch +ARG FFMPEG_MA_PATCH_REPO_10=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0010-fixed-buffer-overflow-issue-in-iemetadata.patch RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install -y -q --no-install-recommends libvdpau-dev libsdl2-dev libxcb1-dev libxcb-shm0-dev libxcb-xfixes0-dev zlib1g-dev libssl-dev @@ -275,7 +276,8 @@ RUN wget -O - ${FFMPEG_REPO} | tar xz && mv FFmpeg-${FFMPEG_VER} FFmpeg && \ wget -O - ${FFMPEG_MA_PATCH_REPO_06} | patch -p1 && \ wget -O - ${FFMPEG_MA_PATCH_REPO_07} | patch -p1 && \ wget -O - ${FFMPEG_MA_PATCH_REPO_08} | patch -p1 && \ - wget -O - ${FFMPEG_MA_PATCH_REPO_09} | patch -p1; + wget -O - ${FFMPEG_MA_PATCH_REPO_09} | patch -p1 && \ + wget -O - ${FFMPEG_MA_PATCH_REPO_10} | patch -p1; # Patch FFmpeg source for SVT-HEVC RUN cd /home/FFmpeg && \ diff --git a/XeonE3/ubuntu-18.04/ffmpeg+gst+dev/Dockerfile b/XeonE3/ubuntu-18.04/ffmpeg+gst+dev/Dockerfile index f385adb69..b2f1d2eff 100644 --- a/XeonE3/ubuntu-18.04/ffmpeg+gst+dev/Dockerfile +++ b/XeonE3/ubuntu-18.04/ffmpeg+gst+dev/Dockerfile @@ -604,6 +604,7 @@ ARG FFMPEG_MA_PATCH_REPO_06=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/ ARG FFMPEG_MA_PATCH_REPO_07=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0007-Refine-features-of-IE-filters.patch ARG FFMPEG_MA_PATCH_REPO_08=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0008-fixed-extra-comma-in-iemetadata.patch ARG FFMPEG_MA_PATCH_REPO_09=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0009-add-source-as-option-source-url-calculate-nano-times.patch +ARG FFMPEG_MA_PATCH_REPO_10=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0010-fixed-buffer-overflow-issue-in-iemetadata.patch RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install -y -q --no-install-recommends libass-dev libfreetype6-dev libvdpau-dev libsdl2-dev libxcb1-dev libxcb-shm0-dev libxcb-xfixes0-dev texinfo zlib1g-dev libssl-dev @@ -620,7 +621,8 @@ RUN wget -O - ${FFMPEG_REPO} | tar xz && mv FFmpeg-${FFMPEG_VER} FFmpeg && \ wget -O - ${FFMPEG_MA_PATCH_REPO_06} | patch -p1 && \ wget -O - ${FFMPEG_MA_PATCH_REPO_07} | patch -p1 && \ wget -O - ${FFMPEG_MA_PATCH_REPO_08} | patch -p1 && \ - wget -O - ${FFMPEG_MA_PATCH_REPO_09} | patch -p1; + wget -O - ${FFMPEG_MA_PATCH_REPO_09} | patch -p1 && \ + wget -O - ${FFMPEG_MA_PATCH_REPO_10} | patch -p1; # Patch FFmpeg source for SVT-HEVC RUN cd /home/FFmpeg && \ diff --git a/XeonE3/ubuntu-18.04/ffmpeg/Dockerfile b/XeonE3/ubuntu-18.04/ffmpeg/Dockerfile index b2d39f483..3598e5bec 100644 --- a/XeonE3/ubuntu-18.04/ffmpeg/Dockerfile +++ b/XeonE3/ubuntu-18.04/ffmpeg/Dockerfile @@ -259,6 +259,7 @@ ARG FFMPEG_MA_PATCH_REPO_06=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/ ARG FFMPEG_MA_PATCH_REPO_07=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0007-Refine-features-of-IE-filters.patch ARG FFMPEG_MA_PATCH_REPO_08=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0008-fixed-extra-comma-in-iemetadata.patch ARG FFMPEG_MA_PATCH_REPO_09=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0009-add-source-as-option-source-url-calculate-nano-times.patch +ARG FFMPEG_MA_PATCH_REPO_10=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0010-fixed-buffer-overflow-issue-in-iemetadata.patch RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install -y -q --no-install-recommends libvdpau-dev libsdl2-dev libxcb1-dev libxcb-shm0-dev libxcb-xfixes0-dev zlib1g-dev libssl-dev @@ -275,7 +276,8 @@ RUN wget -O - ${FFMPEG_REPO} | tar xz && mv FFmpeg-${FFMPEG_VER} FFmpeg && \ wget -O - ${FFMPEG_MA_PATCH_REPO_06} | patch -p1 && \ wget -O - ${FFMPEG_MA_PATCH_REPO_07} | patch -p1 && \ wget -O - ${FFMPEG_MA_PATCH_REPO_08} | patch -p1 && \ - wget -O - ${FFMPEG_MA_PATCH_REPO_09} | patch -p1; + wget -O - ${FFMPEG_MA_PATCH_REPO_09} | patch -p1 && \ + wget -O - ${FFMPEG_MA_PATCH_REPO_10} | patch -p1; # Patch FFmpeg source for SVT-HEVC RUN cd /home/FFmpeg && \ diff --git a/template/ffmpeg.m4 b/template/ffmpeg.m4 index cb017c5c8..7993ee0c6 100644 --- a/template/ffmpeg.m4 +++ b/template/ffmpeg.m4 @@ -13,6 +13,7 @@ ARG FFMPEG_MA_PATCH_REPO_06=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/ ARG FFMPEG_MA_PATCH_REPO_07=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0007-Refine-features-of-IE-filters.patch ARG FFMPEG_MA_PATCH_REPO_08=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0008-fixed-extra-comma-in-iemetadata.patch ARG FFMPEG_MA_PATCH_REPO_09=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0009-add-source-as-option-source-url-calculate-nano-times.patch +ARG FFMPEG_MA_PATCH_REPO_10=https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0010-fixed-buffer-overflow-issue-in-iemetadata.patch define(`FFMPEG_SUBTITLE',ifelse(index(DOCKER_IMAGE,-dev),-1,OFF,ON))dnl define(`FFMPEG_X11',ifelse(index(DOCKER_IMAGE,-dev),-1,ifelse(index(DOCKER_IMAGE,xeon-),-1,ON,OFF),ON))dnl @@ -36,7 +37,8 @@ RUN wget -O - ${FFMPEG_REPO} | tar xz && mv FFmpeg-${FFMPEG_VER} FFmpeg && \ wget -O - ${FFMPEG_MA_PATCH_REPO_06} | patch -p1 && \ wget -O - ${FFMPEG_MA_PATCH_REPO_07} | patch -p1 && \ wget -O - ${FFMPEG_MA_PATCH_REPO_08} | patch -p1 && \ - wget -O - ${FFMPEG_MA_PATCH_REPO_09} | patch -p1; + wget -O - ${FFMPEG_MA_PATCH_REPO_09} | patch -p1 && \ + wget -O - ${FFMPEG_MA_PATCH_REPO_10} | patch -p1; defn(`FFMPEG_SOURCE_SVT_HEVC',`FFMPEG_SOURCE_SVT_AV1',`FFMPEG_SOURCE_TRANSFORM360')dnl # Compile FFmpeg From 66521fcbad3122f86dd5134d465aa6bdd6bcc6e9 Mon Sep 17 00:00:00 2001 From: Lin Xie Date: Tue, 2 Apr 2019 10:21:13 +0800 Subject: [PATCH 2/2] update ffmpeg doc --- doc/ffmpeg.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/doc/ffmpeg.md b/doc/ffmpeg.md index 47dcc0da4..a533d8918 100644 --- a/doc/ffmpeg.md +++ b/doc/ffmpeg.md @@ -29,6 +29,10 @@ The FFmpeg builds included the following patches for feature enhancement, better |[IE_FILTERS_04](https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0004-Kafka-protocol-producer.patch)|Kafka protocol producer.| |[IE_FILTERS_05](https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0005-Support-object-detection-and-featured-face-identific.patch)|Support object detection and featured face identification.| |[IE_FILTERS_06](https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0006-Send-metadata-in-a-packet-and-refine-the-json-format.patch)|Send metadata in a packet and refine the json format.| +|[IE_FILTERS_07](https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0007-Refine-features-of-IE-filters.patch)|Refine features of IE filters.| +|[IE_FILTERS_08](https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0008-fixed-extra-comma-in-iemetadata.patch)|Fixed extra comma in iemetadata.| +|[IE_FILTERS_09](https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0009-add-source-as-option-source-url-calculate-nano-times.patch)|Add source as option source url calculate nano times.| +|[IE_FILTERS_10](https://raw.githubusercontent.com/VCDP/FFmpeg-patch/master/media-analytics/0010-fixed-buffer-overflow-issue-in-iemetadata.patch)|Fixed buffer overflow issue in iemetadata.| ### GPU Acceleration @@ -67,7 +71,7 @@ Face detection and emotion identification, save metadata to json format: ```bash ffmpeg -i ~/Videos/xxx.mp4 -vf detect=model=./face-detection-adas-0001/FP32/face-detection-adas-0001.xml:name=face, \ classify=model=./emotions_recognition/emotions-recognition-retail-0003.xml:label=./emotions_recognition/emotion-labels.txt:name=emotion \ --an -f iemetadata emotion-meta.json +-an -f iemetadata -source_url $URL -custom_tag $TAG emotion-meta.json ``` Object Detection with labels: @@ -77,6 +81,7 @@ ffmpeg -i ~/Videos/xxx.mp4 -vf detect=model=./mobilenet-ssd.xml:label=./object_l ``` Face detection and reidentification: + ```bash ffmpeg -i ~/Videos/xxx.mp4 -vf detect=model=./face-detection-retail-0004.xml:name=face, \ classify=model=./face-reidentification-retail-0095.xml:label=./labels.txt:name=face_id:feature_file=./registered_faces.bin -an -f null /dev/nul