From a4d311d29ead208eab952257dfdc028bf3a99c80 Mon Sep 17 00:00:00 2001 From: jhou5 Date: Wed, 17 Mar 2021 14:45:58 -0700 Subject: [PATCH 01/13] Update Docker image README (#704) * update README --- QAT/centos-7/media/dev/README.md | 28 ++-- QAT/centos-7/media/nginx/README.md | 16 +- QAT/ubuntu-18.04/media/dev/README.md | 27 +-- QAT/ubuntu-18.04/media/nginx/README.md | 16 +- QAT/ubuntu-20.04/media/dev/README.md | 29 ++-- QAT/ubuntu-20.04/media/nginx/README.md | 16 +- SG1/centos-7/media/dev/README.md | 47 ++++++ SG1/centos-7/media/ffmpeg/README.md | 47 ++++++ SG1/ubuntu-18.04/media/dev/README.md | 47 ++++++ SG1/ubuntu-18.04/media/ffmpeg/README.md | 47 ++++++ SG1/ubuntu-20.04/media/dev/README.md | 47 ++++++ SG1/ubuntu-20.04/media/ffmpeg/README.md | 47 ++++++ VCAC-A/ubuntu-18.04/analytics/dev/README.md | 28 ++-- .../ubuntu-18.04/analytics/ffmpeg/README.md | 11 +- VCAC-A/ubuntu-18.04/analytics/gst/README.md | 29 ++-- .../analytics/hddldaemon/README.md | 4 +- VCAC-A/ubuntu-20.04/analytics/dev/README.md | 30 ++-- .../ubuntu-20.04/analytics/ffmpeg/README.md | 13 +- VCAC-A/ubuntu-20.04/analytics/gst/README.md | 31 ++-- Xeon/centos-7/analytics/dev/README.md | 56 +++++++ Xeon/centos-7/analytics/ffmpeg/README.md | 46 +++++ Xeon/centos-7/analytics/gst/README.md | 55 ++++++ Xeon/centos-7/graphics/dev/README.md | 4 +- Xeon/centos-7/graphics/ospray-mpi/README.md | 4 +- Xeon/centos-7/graphics/ospray/README.md | 2 +- Xeon/centos-7/media/dev/README.md | 15 +- Xeon/centos-7/media/ffmpeg/README.md | 3 +- Xeon/centos-7/media/gst/README.md | 14 +- Xeon/centos-7/media/nginx/README.md | 9 +- Xeon/centos-7/media/srs/README.md | 44 +++++ Xeon/centos-7/media/svt/README.md | 3 +- Xeon/centos-7/service/owt-dev/README.md | 33 ++-- Xeon/centos-7/service/owt/README.md | 26 +-- Xeon/centos-7/service/owt360/README.md | 42 +++++ Xeon/ubuntu-18.04/analytics/dev/README.md | 23 +-- Xeon/ubuntu-18.04/analytics/ffmpeg/README.md | 6 +- Xeon/ubuntu-18.04/analytics/gst/README.md | 24 +-- Xeon/ubuntu-18.04/graphics/dev/README.md | 4 +- .../graphics/ospray-mpi/README.md | 4 +- Xeon/ubuntu-18.04/graphics/ospray/README.md | 2 +- Xeon/ubuntu-18.04/media/dev/README.md | 14 +- Xeon/ubuntu-18.04/media/ffmpeg/README.md | 3 +- Xeon/ubuntu-18.04/media/gst/README.md | 14 +- Xeon/ubuntu-18.04/media/nginx/README.md | 9 +- Xeon/ubuntu-18.04/media/srs/README.md | 44 +++++ Xeon/ubuntu-18.04/media/svt/README.md | 3 +- Xeon/ubuntu-18.04/service/owt-dev/README.md | 28 ++-- Xeon/ubuntu-18.04/service/owt/README.md | 23 ++- Xeon/ubuntu-18.04/service/owt360/README.md | 42 +++++ Xeon/ubuntu-20.04/analytics/dev/README.md | 56 +++++++ Xeon/ubuntu-20.04/analytics/ffmpeg/README.md | 46 +++++ Xeon/ubuntu-20.04/analytics/gst/README.md | 55 ++++++ Xeon/ubuntu-20.04/graphics/dev/README.md | 4 +- .../graphics/ospray-mpi/README.md | 4 +- Xeon/ubuntu-20.04/graphics/ospray/README.md | 2 +- Xeon/ubuntu-20.04/media/dev/README.md | 50 ++++++ Xeon/ubuntu-20.04/media/ffmpeg/README.md | 43 +++++ Xeon/ubuntu-20.04/media/gst/README.md | 49 ++++++ Xeon/ubuntu-20.04/media/nginx/README.md | 46 +++++ Xeon/ubuntu-20.04/media/srs/README.md | 44 +++++ Xeon/ubuntu-20.04/media/svt/README.md | 44 +++++ XeonE3/centos-7/analytics/dev/README.md | 30 ++-- XeonE3/centos-7/analytics/ffmpeg/README.md | 11 +- XeonE3/centos-7/analytics/gst/README.md | 33 ++-- XeonE3/centos-7/media/dev/README.md | 20 +-- XeonE3/centos-7/media/ffmpeg/README.md | 6 +- XeonE3/centos-7/media/gst/README.md | 19 +-- XeonE3/centos-7/media/nginx/README.md | 12 +- XeonE3/centos-7/service/owt-dev/README.md | 51 ++++++ XeonE3/centos-7/service/owt/README.md | 52 ++++++ XeonE3/centos-7/service/owt360/README.md | 46 +++++ XeonE3/ubuntu-18.04/analytics/dev/README.md | 30 ++-- .../ubuntu-18.04/analytics/ffmpeg/README.md | 13 +- XeonE3/ubuntu-18.04/analytics/gst/README.md | 32 ++-- XeonE3/ubuntu-18.04/media/dev/README.md | 18 +- XeonE3/ubuntu-18.04/media/ffmpeg/README.md | 5 +- XeonE3/ubuntu-18.04/media/gst/README.md | 18 +- XeonE3/ubuntu-18.04/media/nginx/README.md | 11 +- XeonE3/ubuntu-18.04/service/owt-dev/README.md | 51 ++++++ XeonE3/ubuntu-18.04/service/owt/README.md | 52 ++++++ XeonE3/ubuntu-18.04/service/owt360/README.md | 46 +++++ XeonE3/ubuntu-20.04/analytics/dev/README.md | 32 ++-- .../ubuntu-20.04/analytics/ffmpeg/README.md | 15 +- XeonE3/ubuntu-20.04/analytics/gst/README.md | 34 ++-- XeonE3/ubuntu-20.04/media/dev/README.md | 55 ++++++ XeonE3/ubuntu-20.04/media/ffmpeg/README.md | 47 ++++++ XeonE3/ubuntu-20.04/media/gst/README.md | 53 ++++++ XeonE3/ubuntu-20.04/media/nginx/README.md | 50 ++++++ script/generate_readme.py | 158 ++++++++++++------ 89 files changed, 2119 insertions(+), 483 deletions(-) create mode 100644 SG1/centos-7/media/dev/README.md create mode 100644 SG1/centos-7/media/ffmpeg/README.md create mode 100644 SG1/ubuntu-18.04/media/dev/README.md create mode 100644 SG1/ubuntu-18.04/media/ffmpeg/README.md create mode 100644 SG1/ubuntu-20.04/media/dev/README.md create mode 100644 SG1/ubuntu-20.04/media/ffmpeg/README.md create mode 100644 Xeon/centos-7/analytics/dev/README.md create mode 100644 Xeon/centos-7/analytics/ffmpeg/README.md create mode 100644 Xeon/centos-7/analytics/gst/README.md create mode 100644 Xeon/centos-7/media/srs/README.md create mode 100644 Xeon/centos-7/service/owt360/README.md create mode 100644 Xeon/ubuntu-18.04/media/srs/README.md create mode 100644 Xeon/ubuntu-18.04/service/owt360/README.md create mode 100644 Xeon/ubuntu-20.04/analytics/dev/README.md create mode 100644 Xeon/ubuntu-20.04/analytics/ffmpeg/README.md create mode 100644 Xeon/ubuntu-20.04/analytics/gst/README.md create mode 100644 Xeon/ubuntu-20.04/media/dev/README.md create mode 100644 Xeon/ubuntu-20.04/media/ffmpeg/README.md create mode 100644 Xeon/ubuntu-20.04/media/gst/README.md create mode 100644 Xeon/ubuntu-20.04/media/nginx/README.md create mode 100644 Xeon/ubuntu-20.04/media/srs/README.md create mode 100644 Xeon/ubuntu-20.04/media/svt/README.md create mode 100644 XeonE3/centos-7/service/owt-dev/README.md create mode 100644 XeonE3/centos-7/service/owt/README.md create mode 100644 XeonE3/centos-7/service/owt360/README.md create mode 100644 XeonE3/ubuntu-18.04/service/owt-dev/README.md create mode 100644 XeonE3/ubuntu-18.04/service/owt/README.md create mode 100644 XeonE3/ubuntu-18.04/service/owt360/README.md create mode 100644 XeonE3/ubuntu-20.04/media/dev/README.md create mode 100644 XeonE3/ubuntu-20.04/media/ffmpeg/README.md create mode 100644 XeonE3/ubuntu-20.04/media/gst/README.md create mode 100644 XeonE3/ubuntu-20.04/media/nginx/README.md diff --git a/QAT/centos-7/media/dev/README.md b/QAT/centos-7/media/dev/README.md index f4adc41dd..3e94a862f 100644 --- a/QAT/centos-7/media/dev/README.md +++ b/QAT/centos-7/media/dev/README.md @@ -1,7 +1,7 @@ This docker image is part of Open Visual Cloud software stacks. Optimized for NGINX web server with compute-intensive operations acceleration with Intel® QuickAssist Technology (Intel® QAT).The docker image can be used in the FROM field of a downstream Dockerfile. ## Supported tags and respective Dockerfile links - - [qat-centos-7-media-dev](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/QAT/centos-7/media/dev/Dockerfile) + - [qat-centos-7-media-dev](https://github.com/OpenVisualCloud/Dockerfiles/blob/v21.3/QAT/centos-7/media/dev/Dockerfile) ## Quick reference - #### Supported platform and OS @@ -25,12 +25,13 @@ This docker installs third party components licensed under various open source l | Components | License | | ----- | ----- | |CentOS| [Various](https://hub.docker.com/_/centos) | -|NGINX_HTTP_FLV|BSD 2-clause "Simplified" License| -|NGINX_Upload_Module|BSD 3-clause "Simplified" License| -|qat-zip|BSD 3-clause "New" or "Revised" License| -|openssl|Apache License 2.0| -|qat-engine|BSD 3-clause "New" or "Revised" License| -|asynch_mode_nginx |BSD 3-clause "New" or "Revised" License| +|QATzip|BSD 3-clause "New" or "Revised" License| +|OpenSSL|Apache License 2.0| +|ipp crypo|Apache-2.0 License| +|QAT OpenSSL engine|BSD 3-clause "New" or "Revised" License| +|nginx http flv|BSD 2-clause "Simplified" License| +|nginx upload module|BSD 3-clause "Simplified" License| +|asynch mode nginx |BSD 3-clause "New" or "Revised" License| |libogg|BSD 3-clause "New" or "Revised" License| |libvorbis|BSD 3-clause "New" or "Revised" License| |Opus Interactive Audio Codec|BSD 3-clause "New" or "Revised" License| @@ -43,13 +44,12 @@ This docker installs third party components licensed under various open source l |Intel SVT-AV1|BSD-2-Clause Plus Patent License| |Intel SVT-VP9|BSD-2-Clause Plus Patent License| |gstreamer|GNU Lesser General Public License v2.1 or later| -|gst orc|GNU Lesser General Public License v2.1 or later| -|gst plugin base|GNU Lesser General Public License v2.1 or later| -|gst plugin good|GNU Lesser General Public License v2.1 or later| -|gst plugin bad|GNU Lesser General Public License v2.1 or later| -|gst plugin ugly|GNU Lesser General Public License v2.1 or later| -|gst plugin libav|GNU Library General Public License Version 2| -|gst plugin svt|GNU Lesser General Public License v2.1 or later| +|gst plugins base|GNU Lesser General Public License v2.1 or later| +|gst plugins good|GNU Lesser General Public License v2.1 or later| +|gst plugins bad|GNU Lesser General Public License v2.1 or later| +|gst plugins ugly|GNU Lesser General Public License v2.1 or later| +|gst libav|GNU Library General Public License Version 2.1 or later| +|gst svt|GNU Lesser General Public License v2.1 or later| |FFmpeg|GNU Lesser General Public License v2.1 or later| diff --git a/QAT/centos-7/media/nginx/README.md b/QAT/centos-7/media/nginx/README.md index c84611afe..2e09b54a4 100644 --- a/QAT/centos-7/media/nginx/README.md +++ b/QAT/centos-7/media/nginx/README.md @@ -1,7 +1,7 @@ This docker image is part of Open Visual Cloud software stacks. Optimized for NGINX web server with compute-intensive operations acceleration with Intel® QuickAssist Technology (Intel® QAT).The docker image can be used in the FROM field of a downstream Dockerfile. ## Supported tags and respective Dockerfile links - - [qat-centos-7-media-nginx](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/QAT/centos-7/media/nginx/Dockerfile) + - [qat-centos-7-media-nginx](https://github.com/OpenVisualCloud/Dockerfiles/blob/v21.3/QAT/centos-7/media/nginx/Dockerfile) ## Quick reference - #### Supported platform and OS @@ -25,12 +25,13 @@ This docker installs third party components licensed under various open source l | Components | License | | ----- | ----- | |CentOS| [Various](https://hub.docker.com/_/centos) | -|NGINX_HTTP_FLV|BSD 2-clause "Simplified" License| -|NGINX_Upload_Module|BSD 3-clause "Simplified" License| -|qat-zip|BSD 3-clause "New" or "Revised" License| -|openssl|Apache License 2.0| -|qat-engine|BSD 3-clause "New" or "Revised" License| -|asynch_mode_nginx |BSD 3-clause "New" or "Revised" License| +|QATzip|BSD 3-clause "New" or "Revised" License| +|OpenSSL|Apache License 2.0| +|ipp crypo|Apache-2.0 License| +|QAT OpenSSL engine|BSD 3-clause "New" or "Revised" License| +|nginx http flv|BSD 2-clause "Simplified" License| +|nginx upload module|BSD 3-clause "Simplified" License| +|asynch mode nginx |BSD 3-clause "New" or "Revised" License| |libogg|BSD 3-clause "New" or "Revised" License| |libvorbis|BSD 3-clause "New" or "Revised" License| |Opus Interactive Audio Codec|BSD 3-clause "New" or "Revised" License| @@ -41,6 +42,7 @@ This docker installs third party components licensed under various open source l |Intel SVT-HEVC|BSD-2-Clause Plus Patent License| |Intel SVT-AV1|BSD-2-Clause Plus Patent License| |Intel SVT-VP9|BSD-2-Clause Plus Patent License| +|OpenCV|BSD 3-clause "New" or "Revised" License| |FFmpeg|GNU Lesser General Public License v2.1 or later| diff --git a/QAT/ubuntu-18.04/media/dev/README.md b/QAT/ubuntu-18.04/media/dev/README.md index 383de6776..8e66b2abc 100644 --- a/QAT/ubuntu-18.04/media/dev/README.md +++ b/QAT/ubuntu-18.04/media/dev/README.md @@ -1,7 +1,7 @@ This docker image is part of Open Visual Cloud software stacks. Optimized for NGINX web server with compute-intensive operations acceleration with Intel® QuickAssist Technology (Intel® QAT).The docker image can be used in the FROM field of a downstream Dockerfile. ## Supported tags and respective Dockerfile links - - [qat-ubuntu-1804-media-dev](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/QAT/ubuntu-18.04/media/dev/Dockerfile) + - [qat-ubuntu-1804-media-dev](https://github.com/OpenVisualCloud/Dockerfiles/blob/v21.3/QAT/ubuntu-18.04/media/dev/Dockerfile) ## Quick reference - #### Supported platform and OS @@ -25,12 +25,13 @@ This docker installs third party components licensed under various open source l | Components | License | | ----- | ----- | |Ubuntu| [Various](https://hub.docker.com/_/ubuntu) | -|NGINX_HTTP_FLV|BSD 2-clause "Simplified" License| -|NGINX_Upload_Module|BSD 3-clause "Simplified" License| -|qat-zip|BSD 3-clause "New" or "Revised" License| -|openssl|Apache License 2.0| -|qat-engine|BSD 3-clause "New" or "Revised" License| -|asynch_mode_nginx |BSD 3-clause "New" or "Revised" License| +|QATzip|BSD 3-clause "New" or "Revised" License| +|OpenSSL|Apache License 2.0| +|ipp crypo|Apache-2.0 License| +|QAT OpenSSL engine|BSD 3-clause "New" or "Revised" License| +|nginx http flv|BSD 2-clause "Simplified" License| +|nginx upload module|BSD 3-clause "Simplified" License| +|asynch mode nginx |BSD 3-clause "New" or "Revised" License| |libogg|BSD 3-clause "New" or "Revised" License| |libvorbis|BSD 3-clause "New" or "Revised" License| |Opus Interactive Audio Codec|BSD 3-clause "New" or "Revised" License| @@ -43,12 +44,12 @@ This docker installs third party components licensed under various open source l |Intel SVT-AV1|BSD-2-Clause Plus Patent License| |Intel SVT-VP9|BSD-2-Clause Plus Patent License| |gstreamer|GNU Lesser General Public License v2.1 or later| -|gst plugin base|GNU Lesser General Public License v2.1 or later| -|gst plugin good|GNU Lesser General Public License v2.1 or later| -|gst plugin bad|GNU Lesser General Public License v2.1 or later| -|gst plugin ugly|GNU Lesser General Public License v2.1 or later| -|gst plugin libav|GNU Library General Public License Version 2| -|gst plugin svt|GNU Lesser General Public License v2.1 or later| +|gst plugins base|GNU Lesser General Public License v2.1 or later| +|gst plugins good|GNU Lesser General Public License v2.1 or later| +|gst plugins bad|GNU Lesser General Public License v2.1 or later| +|gst plugins ugly|GNU Lesser General Public License v2.1 or later| +|gst libav|GNU Library General Public License Version 2.1 or later| +|gst svt|GNU Lesser General Public License v2.1 or later| |FFmpeg|GNU Lesser General Public License v2.1 or later| diff --git a/QAT/ubuntu-18.04/media/nginx/README.md b/QAT/ubuntu-18.04/media/nginx/README.md index 075d158a1..2d18a4e93 100644 --- a/QAT/ubuntu-18.04/media/nginx/README.md +++ b/QAT/ubuntu-18.04/media/nginx/README.md @@ -1,7 +1,7 @@ This docker image is part of Open Visual Cloud software stacks. Optimized for NGINX web server with compute-intensive operations acceleration with Intel® QuickAssist Technology (Intel® QAT).The docker image can be used in the FROM field of a downstream Dockerfile. ## Supported tags and respective Dockerfile links - - [qat-ubuntu-1804-media-nginx](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/QAT/ubuntu-18.04/media/nginx/Dockerfile) + - [qat-ubuntu-1804-media-nginx](https://github.com/OpenVisualCloud/Dockerfiles/blob/v21.3/QAT/ubuntu-18.04/media/nginx/Dockerfile) ## Quick reference - #### Supported platform and OS @@ -25,12 +25,13 @@ This docker installs third party components licensed under various open source l | Components | License | | ----- | ----- | |Ubuntu| [Various](https://hub.docker.com/_/ubuntu) | -|NGINX_HTTP_FLV|BSD 2-clause "Simplified" License| -|NGINX_Upload_Module|BSD 3-clause "Simplified" License| -|qat-zip|BSD 3-clause "New" or "Revised" License| -|openssl|Apache License 2.0| -|qat-engine|BSD 3-clause "New" or "Revised" License| -|asynch_mode_nginx |BSD 3-clause "New" or "Revised" License| +|QATzip|BSD 3-clause "New" or "Revised" License| +|OpenSSL|Apache License 2.0| +|ipp crypo|Apache-2.0 License| +|QAT OpenSSL engine|BSD 3-clause "New" or "Revised" License| +|nginx http flv|BSD 2-clause "Simplified" License| +|nginx upload module|BSD 3-clause "Simplified" License| +|asynch mode nginx |BSD 3-clause "New" or "Revised" License| |libogg|BSD 3-clause "New" or "Revised" License| |libvorbis|BSD 3-clause "New" or "Revised" License| |Opus Interactive Audio Codec|BSD 3-clause "New" or "Revised" License| @@ -41,6 +42,7 @@ This docker installs third party components licensed under various open source l |Intel SVT-HEVC|BSD-2-Clause Plus Patent License| |Intel SVT-AV1|BSD-2-Clause Plus Patent License| |Intel SVT-VP9|BSD-2-Clause Plus Patent License| +|OpenCV|BSD 3-clause "New" or "Revised" License| |FFmpeg|GNU Lesser General Public License v2.1 or later| diff --git a/QAT/ubuntu-20.04/media/dev/README.md b/QAT/ubuntu-20.04/media/dev/README.md index 383de6776..40385fdcb 100644 --- a/QAT/ubuntu-20.04/media/dev/README.md +++ b/QAT/ubuntu-20.04/media/dev/README.md @@ -1,11 +1,11 @@ This docker image is part of Open Visual Cloud software stacks. Optimized for NGINX web server with compute-intensive operations acceleration with Intel® QuickAssist Technology (Intel® QAT).The docker image can be used in the FROM field of a downstream Dockerfile. ## Supported tags and respective Dockerfile links - - [qat-ubuntu-1804-media-dev](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/QAT/ubuntu-18.04/media/dev/Dockerfile) + - [qat-ubuntu-2004-media-dev](https://github.com/OpenVisualCloud/Dockerfiles/blob/v21.3/QAT/ubuntu-20.04/media/dev/Dockerfile) ## Quick reference - #### Supported platform and OS - Intel® QAT platform, Ubuntu 18.04 + Intel® QAT platform, Ubuntu 20.04 - #### Usage instructions: [FFmpeg](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/doc/ffmpeg.md) [GStreamer](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/doc/gst.md) @@ -25,12 +25,13 @@ This docker installs third party components licensed under various open source l | Components | License | | ----- | ----- | |Ubuntu| [Various](https://hub.docker.com/_/ubuntu) | -|NGINX_HTTP_FLV|BSD 2-clause "Simplified" License| -|NGINX_Upload_Module|BSD 3-clause "Simplified" License| -|qat-zip|BSD 3-clause "New" or "Revised" License| -|openssl|Apache License 2.0| -|qat-engine|BSD 3-clause "New" or "Revised" License| -|asynch_mode_nginx |BSD 3-clause "New" or "Revised" License| +|QATzip|BSD 3-clause "New" or "Revised" License| +|OpenSSL|Apache License 2.0| +|ipp crypo|Apache-2.0 License| +|QAT OpenSSL engine|BSD 3-clause "New" or "Revised" License| +|nginx http flv|BSD 2-clause "Simplified" License| +|nginx upload module|BSD 3-clause "Simplified" License| +|asynch mode nginx |BSD 3-clause "New" or "Revised" License| |libogg|BSD 3-clause "New" or "Revised" License| |libvorbis|BSD 3-clause "New" or "Revised" License| |Opus Interactive Audio Codec|BSD 3-clause "New" or "Revised" License| @@ -43,12 +44,12 @@ This docker installs third party components licensed under various open source l |Intel SVT-AV1|BSD-2-Clause Plus Patent License| |Intel SVT-VP9|BSD-2-Clause Plus Patent License| |gstreamer|GNU Lesser General Public License v2.1 or later| -|gst plugin base|GNU Lesser General Public License v2.1 or later| -|gst plugin good|GNU Lesser General Public License v2.1 or later| -|gst plugin bad|GNU Lesser General Public License v2.1 or later| -|gst plugin ugly|GNU Lesser General Public License v2.1 or later| -|gst plugin libav|GNU Library General Public License Version 2| -|gst plugin svt|GNU Lesser General Public License v2.1 or later| +|gst plugins base|GNU Lesser General Public License v2.1 or later| +|gst plugins good|GNU Lesser General Public License v2.1 or later| +|gst plugins bad|GNU Lesser General Public License v2.1 or later| +|gst plugins ugly|GNU Lesser General Public License v2.1 or later| +|gst libav|GNU Library General Public License Version 2.1 or later| +|gst svt|GNU Lesser General Public License v2.1 or later| |FFmpeg|GNU Lesser General Public License v2.1 or later| diff --git a/QAT/ubuntu-20.04/media/nginx/README.md b/QAT/ubuntu-20.04/media/nginx/README.md index c4d277d18..e53cbee86 100644 --- a/QAT/ubuntu-20.04/media/nginx/README.md +++ b/QAT/ubuntu-20.04/media/nginx/README.md @@ -1,7 +1,7 @@ This docker image is part of Open Visual Cloud software stacks. Optimized for NGINX web server with compute-intensive operations acceleration with Intel® QuickAssist Technology (Intel® QAT).The docker image can be used in the FROM field of a downstream Dockerfile. ## Supported tags and respective Dockerfile links - - [qat-ubuntu-2004-media-nginx](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/QAT/ubuntu-20.04/media/nginx/Dockerfile) + - [qat-ubuntu-2004-media-nginx](https://github.com/OpenVisualCloud/Dockerfiles/blob/v21.3/QAT/ubuntu-20.04/media/nginx/Dockerfile) ## Quick reference - #### Supported platform and OS @@ -25,12 +25,13 @@ This docker installs third party components licensed under various open source l | Components | License | | ----- | ----- | |Ubuntu| [Various](https://hub.docker.com/_/ubuntu) | -|NGINX_HTTP_FLV|BSD 2-clause "Simplified" License| -|NGINX_Upload_Module|BSD 3-clause "Simplified" License| -|qat-zip|BSD 3-clause "New" or "Revised" License| -|openssl|Apache License 2.0| -|qat-engine|BSD 3-clause "New" or "Revised" License| -|asynch_mode_nginx |BSD 3-clause "New" or "Revised" License| +|QATzip|BSD 3-clause "New" or "Revised" License| +|OpenSSL|Apache License 2.0| +|ipp crypo|Apache-2.0 License| +|QAT OpenSSL engine|BSD 3-clause "New" or "Revised" License| +|nginx http flv|BSD 2-clause "Simplified" License| +|nginx upload module|BSD 3-clause "Simplified" License| +|asynch mode nginx |BSD 3-clause "New" or "Revised" License| |libogg|BSD 3-clause "New" or "Revised" License| |libvorbis|BSD 3-clause "New" or "Revised" License| |Opus Interactive Audio Codec|BSD 3-clause "New" or "Revised" License| @@ -41,6 +42,7 @@ This docker installs third party components licensed under various open source l |Intel SVT-HEVC|BSD-2-Clause Plus Patent License| |Intel SVT-AV1|BSD-2-Clause Plus Patent License| |Intel SVT-VP9|BSD-2-Clause Plus Patent License| +|OpenCV|BSD 3-clause "New" or "Revised" License| |FFmpeg|GNU Lesser General Public License v2.1 or later| diff --git a/SG1/centos-7/media/dev/README.md b/SG1/centos-7/media/dev/README.md new file mode 100644 index 000000000..587eee3b2 --- /dev/null +++ b/SG1/centos-7/media/dev/README.md @@ -0,0 +1,47 @@ +This docker image is part of Open Visual Cloud software stacks. This is development image aim towards enabling C++ application compilation, debugging (with the debugging, profiling tools) and optimization (with the optimization tools.) You can compile C++ applications with this image and then copy the applications to the corresponding deployment image. Included what are in FFmpeg or GStreamer media creation and delivery images . Also included Intel hardware accelaration software stack such as media SDK, media driver, gmmlib and libva. The docker image can be used in the FROM field of a downstream Dockerfile. + +## Supported tags and respective Dockerfile links + - [sg1-centos-7-media-dev](https://github.com/OpenVisualCloud/Dockerfiles/blob/v21.3/SG1/centos-7/media/dev/Dockerfile) + +## Quick reference +- #### Supported platform and OS + Intel® SG1 platform, CentOS-7 + +- #### Usage instructions: + [FFmpeg](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/doc/ffmpeg.md) [GStreamer](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/doc/gst.md) + + +- #### Getting started with Dockerfiles: + [OpenVisualCloud Dockerfiles Wiki](https://github.com/OpenVisualCloud/Dockerfiles/wiki) + +- #### File issues: + [OpenVisualCloud Dockerfiles Issues](https://github.com/OpenVisualCloud/Dockerfiles/issues) + + +## License +This docker installs third party components licensed under various open source licenses. The terms under which those components may be used and distributed can be found with the license document that is provided with those components. Please familiarize yourself with those terms to ensure your distribution of those components complies with the terms of those licenses. + + +| Components | License | +| ----- | ----- | +|CentOS| [Various](https://hub.docker.com/_/centos) | +|libogg|BSD 3-clause "New" or "Revised" License| +|libvorbis|BSD 3-clause "New" or "Revised" License| +|Opus Interactive Audio Codec|BSD 3-clause "New" or "Revised" License| +|libvpx|BSD 3-clause "New" or "Revised" License| +|Aomedia AV1 Codec Library|BSD 2-clause "Simplified" License| +|x264|GNU General Public License v2.0 or later| +|x265|GNU General Public License v2.0 or later| +|dav1d|BSD 2-clause "Simplified" License| +|Intel SVT-HEVC|BSD-2-Clause Plus Patent License| +|Intel SVT-AV1|BSD-2-Clause Plus Patent License| +|Intel SVT-VP9|BSD-2-Clause Plus Patent License| +|Intel Graphics Memory Management Library| MIT License| +|Intel libva| MIT License +|Intel media driver | MIT License| +|Intel media SDK|MIT License| +|FFmpeg|GNU Lesser General Public License v2.1 or later| + + +More license information can be found in [components source package](https://github.com/OpenVisualCloud/Dockerfiles-Resources). +As for any pre-built image usage, it is the image user's responsibility to ensure that any use of this image complies with any relevant licenses and potential fees for all software contained within. We will have no indemnity or warranty coverage from suppliers. diff --git a/SG1/centos-7/media/ffmpeg/README.md b/SG1/centos-7/media/ffmpeg/README.md new file mode 100644 index 000000000..2cae5c72d --- /dev/null +++ b/SG1/centos-7/media/ffmpeg/README.md @@ -0,0 +1,47 @@ +This docker image is part of Open Visual Cloud software stacks. Optimized for the media creation and delivery use case. Included FFmpeg and codecs such as aac, opus, ogg, vorbis, x264, x265, vp8/9, av1 and SVT-HEVC. Also included Intel hardware accelaration software stack such as media SDK, media driver, gmmlib and libva. The docker image can be used in the FROM field of a downstream Dockerfile. + +## Supported tags and respective Dockerfile links + - [sg1-centos-7-media-ffmpeg](https://github.com/OpenVisualCloud/Dockerfiles/blob/v21.3/SG1/centos-7/media/ffmpeg/Dockerfile) + +## Quick reference +- #### Supported platform and OS + Intel® SG1 platform, CentOS-7 + +- #### Usage instructions: + [FFmpeg](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/doc/ffmpeg.md) + + +- #### Getting started with Dockerfiles: + [OpenVisualCloud Dockerfiles Wiki](https://github.com/OpenVisualCloud/Dockerfiles/wiki) + +- #### File issues: + [OpenVisualCloud Dockerfiles Issues](https://github.com/OpenVisualCloud/Dockerfiles/issues) + + +## License +This docker installs third party components licensed under various open source licenses. The terms under which those components may be used and distributed can be found with the license document that is provided with those components. Please familiarize yourself with those terms to ensure your distribution of those components complies with the terms of those licenses. + + +| Components | License | +| ----- | ----- | +|CentOS| [Various](https://hub.docker.com/_/centos) | +|libogg|BSD 3-clause "New" or "Revised" License| +|libvorbis|BSD 3-clause "New" or "Revised" License| +|Opus Interactive Audio Codec|BSD 3-clause "New" or "Revised" License| +|libvpx|BSD 3-clause "New" or "Revised" License| +|x264|GNU General Public License v2.0 or later| +|x265|GNU General Public License v2.0 or later| +|dav1d|BSD 2-clause "Simplified" License| +|Intel SVT-HEVC|BSD-2-Clause Plus Patent License| +|Intel SVT-AV1|BSD-2-Clause Plus Patent License| +|Intel SVT-VP9|BSD-2-Clause Plus Patent License| +|Intel Graphics Memory Management Library| MIT License| +|Intel libva| MIT License +|Intel media driver | MIT License| +|Intel media SDK|MIT License| +|OpenCV|BSD 3-clause "New" or "Revised" License| +|FFmpeg|GNU Lesser General Public License v2.1 or later| + + +More license information can be found in [components source package](https://github.com/OpenVisualCloud/Dockerfiles-Resources). +As for any pre-built image usage, it is the image user's responsibility to ensure that any use of this image complies with any relevant licenses and potential fees for all software contained within. We will have no indemnity or warranty coverage from suppliers. diff --git a/SG1/ubuntu-18.04/media/dev/README.md b/SG1/ubuntu-18.04/media/dev/README.md new file mode 100644 index 000000000..a42169b46 --- /dev/null +++ b/SG1/ubuntu-18.04/media/dev/README.md @@ -0,0 +1,47 @@ +This docker image is part of Open Visual Cloud software stacks. This is development image aim towards enabling C++ application compilation, debugging (with the debugging, profiling tools) and optimization (with the optimization tools.) You can compile C++ applications with this image and then copy the applications to the corresponding deployment image. Included what are in FFmpeg or GStreamer media creation and delivery images . Also included Intel hardware accelaration software stack such as media SDK, media driver, gmmlib and libva. The docker image can be used in the FROM field of a downstream Dockerfile. + +## Supported tags and respective Dockerfile links + - [sg1-ubuntu-1804-media-dev](https://github.com/OpenVisualCloud/Dockerfiles/blob/v21.3/SG1/ubuntu-18.04/media/dev/Dockerfile) + +## Quick reference +- #### Supported platform and OS + Intel® SG1 platform, Ubuntu 18.04 + +- #### Usage instructions: + [FFmpeg](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/doc/ffmpeg.md) [GStreamer](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/doc/gst.md) + + +- #### Getting started with Dockerfiles: + [OpenVisualCloud Dockerfiles Wiki](https://github.com/OpenVisualCloud/Dockerfiles/wiki) + +- #### File issues: + [OpenVisualCloud Dockerfiles Issues](https://github.com/OpenVisualCloud/Dockerfiles/issues) + + +## License +This docker installs third party components licensed under various open source licenses. The terms under which those components may be used and distributed can be found with the license document that is provided with those components. Please familiarize yourself with those terms to ensure your distribution of those components complies with the terms of those licenses. + + +| Components | License | +| ----- | ----- | +|Ubuntu| [Various](https://hub.docker.com/_/ubuntu) | +|libogg|BSD 3-clause "New" or "Revised" License| +|libvorbis|BSD 3-clause "New" or "Revised" License| +|Opus Interactive Audio Codec|BSD 3-clause "New" or "Revised" License| +|libvpx|BSD 3-clause "New" or "Revised" License| +|Aomedia AV1 Codec Library|BSD 2-clause "Simplified" License| +|x264|GNU General Public License v2.0 or later| +|x265|GNU General Public License v2.0 or later| +|dav1d|BSD 2-clause "Simplified" License| +|Intel SVT-HEVC|BSD-2-Clause Plus Patent License| +|Intel SVT-AV1|BSD-2-Clause Plus Patent License| +|Intel SVT-VP9|BSD-2-Clause Plus Patent License| +|Intel Graphics Memory Management Library| MIT License| +|Intel libva| MIT License +|Intel media driver | MIT License| +|Intel media SDK|MIT License| +|FFmpeg|GNU Lesser General Public License v2.1 or later| + + +More license information can be found in [components source package](https://github.com/OpenVisualCloud/Dockerfiles-Resources). +As for any pre-built image usage, it is the image user's responsibility to ensure that any use of this image complies with any relevant licenses and potential fees for all software contained within. We will have no indemnity or warranty coverage from suppliers. diff --git a/SG1/ubuntu-18.04/media/ffmpeg/README.md b/SG1/ubuntu-18.04/media/ffmpeg/README.md new file mode 100644 index 000000000..c26a28262 --- /dev/null +++ b/SG1/ubuntu-18.04/media/ffmpeg/README.md @@ -0,0 +1,47 @@ +This docker image is part of Open Visual Cloud software stacks. Optimized for the media creation and delivery use case. Included FFmpeg and codecs such as aac, opus, ogg, vorbis, x264, x265, vp8/9, av1 and SVT-HEVC. Also included Intel hardware accelaration software stack such as media SDK, media driver, gmmlib and libva. The docker image can be used in the FROM field of a downstream Dockerfile. + +## Supported tags and respective Dockerfile links + - [sg1-ubuntu-1804-media-ffmpeg](https://github.com/OpenVisualCloud/Dockerfiles/blob/v21.3/SG1/ubuntu-18.04/media/ffmpeg/Dockerfile) + +## Quick reference +- #### Supported platform and OS + Intel® SG1 platform, Ubuntu 18.04 + +- #### Usage instructions: + [FFmpeg](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/doc/ffmpeg.md) + + +- #### Getting started with Dockerfiles: + [OpenVisualCloud Dockerfiles Wiki](https://github.com/OpenVisualCloud/Dockerfiles/wiki) + +- #### File issues: + [OpenVisualCloud Dockerfiles Issues](https://github.com/OpenVisualCloud/Dockerfiles/issues) + + +## License +This docker installs third party components licensed under various open source licenses. The terms under which those components may be used and distributed can be found with the license document that is provided with those components. Please familiarize yourself with those terms to ensure your distribution of those components complies with the terms of those licenses. + + +| Components | License | +| ----- | ----- | +|Ubuntu| [Various](https://hub.docker.com/_/ubuntu) | +|libogg|BSD 3-clause "New" or "Revised" License| +|libvorbis|BSD 3-clause "New" or "Revised" License| +|Opus Interactive Audio Codec|BSD 3-clause "New" or "Revised" License| +|libvpx|BSD 3-clause "New" or "Revised" License| +|x264|GNU General Public License v2.0 or later| +|x265|GNU General Public License v2.0 or later| +|dav1d|BSD 2-clause "Simplified" License| +|Intel SVT-HEVC|BSD-2-Clause Plus Patent License| +|Intel SVT-AV1|BSD-2-Clause Plus Patent License| +|Intel SVT-VP9|BSD-2-Clause Plus Patent License| +|Intel Graphics Memory Management Library| MIT License| +|Intel libva| MIT License +|Intel media driver | MIT License| +|Intel media SDK|MIT License| +|OpenCV|BSD 3-clause "New" or "Revised" License| +|FFmpeg|GNU Lesser General Public License v2.1 or later| + + +More license information can be found in [components source package](https://github.com/OpenVisualCloud/Dockerfiles-Resources). +As for any pre-built image usage, it is the image user's responsibility to ensure that any use of this image complies with any relevant licenses and potential fees for all software contained within. We will have no indemnity or warranty coverage from suppliers. diff --git a/SG1/ubuntu-20.04/media/dev/README.md b/SG1/ubuntu-20.04/media/dev/README.md new file mode 100644 index 000000000..5c859422d --- /dev/null +++ b/SG1/ubuntu-20.04/media/dev/README.md @@ -0,0 +1,47 @@ +This docker image is part of Open Visual Cloud software stacks. This is development image aim towards enabling C++ application compilation, debugging (with the debugging, profiling tools) and optimization (with the optimization tools.) You can compile C++ applications with this image and then copy the applications to the corresponding deployment image. Included what are in FFmpeg or GStreamer media creation and delivery images . Also included Intel hardware accelaration software stack such as media SDK, media driver, gmmlib and libva. The docker image can be used in the FROM field of a downstream Dockerfile. + +## Supported tags and respective Dockerfile links + - [sg1-ubuntu-2004-media-dev](https://github.com/OpenVisualCloud/Dockerfiles/blob/v21.3/SG1/ubuntu-20.04/media/dev/Dockerfile) + +## Quick reference +- #### Supported platform and OS + Intel® SG1 platform, Ubuntu 20.04 + +- #### Usage instructions: + [FFmpeg](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/doc/ffmpeg.md) [GStreamer](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/doc/gst.md) + + +- #### Getting started with Dockerfiles: + [OpenVisualCloud Dockerfiles Wiki](https://github.com/OpenVisualCloud/Dockerfiles/wiki) + +- #### File issues: + [OpenVisualCloud Dockerfiles Issues](https://github.com/OpenVisualCloud/Dockerfiles/issues) + + +## License +This docker installs third party components licensed under various open source licenses. The terms under which those components may be used and distributed can be found with the license document that is provided with those components. Please familiarize yourself with those terms to ensure your distribution of those components complies with the terms of those licenses. + + +| Components | License | +| ----- | ----- | +|Ubuntu| [Various](https://hub.docker.com/_/ubuntu) | +|libogg|BSD 3-clause "New" or "Revised" License| +|libvorbis|BSD 3-clause "New" or "Revised" License| +|Opus Interactive Audio Codec|BSD 3-clause "New" or "Revised" License| +|libvpx|BSD 3-clause "New" or "Revised" License| +|Aomedia AV1 Codec Library|BSD 2-clause "Simplified" License| +|x264|GNU General Public License v2.0 or later| +|x265|GNU General Public License v2.0 or later| +|dav1d|BSD 2-clause "Simplified" License| +|Intel SVT-HEVC|BSD-2-Clause Plus Patent License| +|Intel SVT-AV1|BSD-2-Clause Plus Patent License| +|Intel SVT-VP9|BSD-2-Clause Plus Patent License| +|Intel Graphics Memory Management Library| MIT License| +|Intel libva| MIT License +|Intel media driver | MIT License| +|Intel media SDK|MIT License| +|FFmpeg|GNU Lesser General Public License v2.1 or later| + + +More license information can be found in [components source package](https://github.com/OpenVisualCloud/Dockerfiles-Resources). +As for any pre-built image usage, it is the image user's responsibility to ensure that any use of this image complies with any relevant licenses and potential fees for all software contained within. We will have no indemnity or warranty coverage from suppliers. diff --git a/SG1/ubuntu-20.04/media/ffmpeg/README.md b/SG1/ubuntu-20.04/media/ffmpeg/README.md new file mode 100644 index 000000000..5bbffd0fc --- /dev/null +++ b/SG1/ubuntu-20.04/media/ffmpeg/README.md @@ -0,0 +1,47 @@ +This docker image is part of Open Visual Cloud software stacks. Optimized for the media creation and delivery use case. Included FFmpeg and codecs such as aac, opus, ogg, vorbis, x264, x265, vp8/9, av1 and SVT-HEVC. Also included Intel hardware accelaration software stack such as media SDK, media driver, gmmlib and libva. The docker image can be used in the FROM field of a downstream Dockerfile. + +## Supported tags and respective Dockerfile links + - [sg1-ubuntu-2004-media-ffmpeg](https://github.com/OpenVisualCloud/Dockerfiles/blob/v21.3/SG1/ubuntu-20.04/media/ffmpeg/Dockerfile) + +## Quick reference +- #### Supported platform and OS + Intel® SG1 platform, Ubuntu 20.04 + +- #### Usage instructions: + [FFmpeg](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/doc/ffmpeg.md) + + +- #### Getting started with Dockerfiles: + [OpenVisualCloud Dockerfiles Wiki](https://github.com/OpenVisualCloud/Dockerfiles/wiki) + +- #### File issues: + [OpenVisualCloud Dockerfiles Issues](https://github.com/OpenVisualCloud/Dockerfiles/issues) + + +## License +This docker installs third party components licensed under various open source licenses. The terms under which those components may be used and distributed can be found with the license document that is provided with those components. Please familiarize yourself with those terms to ensure your distribution of those components complies with the terms of those licenses. + + +| Components | License | +| ----- | ----- | +|Ubuntu| [Various](https://hub.docker.com/_/ubuntu) | +|libogg|BSD 3-clause "New" or "Revised" License| +|libvorbis|BSD 3-clause "New" or "Revised" License| +|Opus Interactive Audio Codec|BSD 3-clause "New" or "Revised" License| +|libvpx|BSD 3-clause "New" or "Revised" License| +|x264|GNU General Public License v2.0 or later| +|x265|GNU General Public License v2.0 or later| +|dav1d|BSD 2-clause "Simplified" License| +|Intel SVT-HEVC|BSD-2-Clause Plus Patent License| +|Intel SVT-AV1|BSD-2-Clause Plus Patent License| +|Intel SVT-VP9|BSD-2-Clause Plus Patent License| +|Intel Graphics Memory Management Library| MIT License| +|Intel libva| MIT License +|Intel media driver | MIT License| +|Intel media SDK|MIT License| +|OpenCV|BSD 3-clause "New" or "Revised" License| +|FFmpeg|GNU Lesser General Public License v2.1 or later| + + +More license information can be found in [components source package](https://github.com/OpenVisualCloud/Dockerfiles-Resources). +As for any pre-built image usage, it is the image user's responsibility to ensure that any use of this image complies with any relevant licenses and potential fees for all software contained within. We will have no indemnity or warranty coverage from suppliers. diff --git a/VCAC-A/ubuntu-18.04/analytics/dev/README.md b/VCAC-A/ubuntu-18.04/analytics/dev/README.md index ccf162ade..f4ea6e118 100644 --- a/VCAC-A/ubuntu-18.04/analytics/dev/README.md +++ b/VCAC-A/ubuntu-18.04/analytics/dev/README.md @@ -1,7 +1,7 @@ This docker image is part of Open Visual Cloud software stacks. This is development image aim towards enabling C++ application compilation, debugging (with the debugging, profiling tools) and optimization (with the optimization tools.) You can compile C++ applications with this image and then copy the applications to the corresponding deployment image. Included what are in FFmpeg & GStreamer media analytics images. Also included Intel hardware accelaration software stack such as media SDK, media driver, gmmlib and libva. The docker image can be used in the FROM field of a downstream Dockerfile. ## Supported tags and respective Dockerfile links - - [vcac-a-ubuntu-1804-analytics-dev](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/VCAC-A/ubuntu-18.04/analytics/dev/Dockerfile) + - [vcac-a-ubuntu-1804-analytics-dev](https://github.com/OpenVisualCloud/Dockerfiles/blob/v21.3/VCAC-A/ubuntu-18.04/analytics/dev/Dockerfile) ## Quick reference - #### Supported platform and OS @@ -34,23 +34,23 @@ This docker installs third party components licensed under various open source l |x265|GNU General Public License v2.0 or later| |dav1d|BSD 2-clause "Simplified" License| |Intel Graphics Memory Management Library| MIT License| -|libdrm|MIT license| |Intel libva| MIT License -|Intel media-driver | MIT License| +|Intel opencl | MIT License| +|Intel media driver | MIT License| |Intel media SDK|MIT License| -|intel-opencl | MIT License| +|OpenVINO|End User License Agreement for the Intel(R) Software Development Products| |json-c|MIT License| +|librdkafka|BSD 2-clause "Simplified" License| +|OpenCV|BSD 3-clause "New" or "Revised" License| |gstreamer|GNU Lesser General Public License v2.1 or later| -|gst orc|GNU Lesser General Public License v2.1 or later| -|gst plugin base|GNU Lesser General Public License v2.1 or later| -|gst plugin good|GNU Lesser General Public License v2.1 or later| -|gst plugin bad|GNU Lesser General Public License v2.1 or later| -|gst plugin ugly|GNU Lesser General Public License v2.1 or later| -|gst plugin libav|GNU Library General Public License Version 2| -|gst plugin vaapi|GNU Lesser General Public License v2.1 or later| -|opencv|BSD 3-clause "New" or "Revised" License| -|OpenVINO|End User License Agreement for the Intel(R) Software Development Products| -|gst plugin gva|MIT License| +|gst plugins base|GNU Lesser General Public License v2.1 or later| +|gst plugins good|GNU Lesser General Public License v2.1 or later| +|gst plugins bad|GNU Lesser General Public License v2.1 or later| +|gst plugins ugly|GNU Lesser General Public License v2.1 or later| +|gst libav|GNU Library General Public License Version 2.1 or later| +|gst vaapi|GNU Lesser General Public License v2.1 or later| +|paho.mqtt.c|Eclipse Public License - v 2.0| +|gst python|GNU Library General Public License Version 2.1| |FFmpeg|GNU Lesser General Public License v2.1 or later| diff --git a/VCAC-A/ubuntu-18.04/analytics/ffmpeg/README.md b/VCAC-A/ubuntu-18.04/analytics/ffmpeg/README.md index 9561c1fa0..13ec4ea68 100644 --- a/VCAC-A/ubuntu-18.04/analytics/ffmpeg/README.md +++ b/VCAC-A/ubuntu-18.04/analytics/ffmpeg/README.md @@ -1,7 +1,7 @@ This docker image is part of Open Visual Cloud software stacks. Optimized for Media Analytics. Included what are in media delivery FFmpeg image, inferencing engine and video analytics plugins. Also included Intel hardware accelaration software stack such as media SDK, media driver, opencl, gmmlib and libva. The docker image can be used in the FROM field of a downstream Dockerfile. ## Supported tags and respective Dockerfile links - - [vcac-a-ubuntu-1804-analytics-ffmpeg](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/VCAC-A/ubuntu-18.04/analytics/ffmpeg/Dockerfile) + - [vcac-a-ubuntu-1804-analytics-ffmpeg](https://github.com/OpenVisualCloud/Dockerfiles/blob/v21.3/VCAC-A/ubuntu-18.04/analytics/ffmpeg/Dockerfile) ## Quick reference - #### Supported platform and OS @@ -33,15 +33,14 @@ This docker installs third party components licensed under various open source l |x265|GNU General Public License v2.0 or later| |dav1d|BSD 2-clause "Simplified" License| |Intel Graphics Memory Management Library| MIT License| -|libdrm|MIT license| |Intel libva| MIT License -|Intel media-driver | MIT License| +|Intel opencl | MIT License| +|Intel media driver | MIT License| |Intel media SDK|MIT License| -|intel-opencl | MIT License| +|OpenVINO|End User License Agreement for the Intel(R) Software Development Products| |json-c|MIT License| |librdkafka|BSD 2-clause "Simplified" License| -|opencv|BSD 3-clause "New" or "Revised" License| -|OpenVINO|End User License Agreement for the Intel(R) Software Development Products| +|OpenCV|BSD 3-clause "New" or "Revised" License| |FFmpeg|GNU Lesser General Public License v2.1 or later| diff --git a/VCAC-A/ubuntu-18.04/analytics/gst/README.md b/VCAC-A/ubuntu-18.04/analytics/gst/README.md index 3911d4a12..22b6043be 100644 --- a/VCAC-A/ubuntu-18.04/analytics/gst/README.md +++ b/VCAC-A/ubuntu-18.04/analytics/gst/README.md @@ -1,7 +1,7 @@ This docker image is part of Open Visual Cloud software stacks. Optimized for Media Analytics. Included what are in media delivery GStreamer image, inferencing engine and video analytics plugins. Also included Intel hardware accelaration software stack such as media SDK, media driver, opencl, gmmlib and libva. The docker image can be used in the FROM field of a downstream Dockerfile. ## Supported tags and respective Dockerfile links - - [vcac-a-ubuntu-1804-analytics-gst](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/VCAC-A/ubuntu-18.04/analytics/gst/Dockerfile) + - [vcac-a-ubuntu-1804-analytics-gst](https://github.com/OpenVisualCloud/Dockerfiles/blob/v21.3/VCAC-A/ubuntu-18.04/analytics/gst/Dockerfile) ## Quick reference - #### Supported platform and OS @@ -35,20 +35,21 @@ This docker installs third party components licensed under various open source l |dav1d|BSD 2-clause "Simplified" License| |Intel Graphics Memory Management Library| MIT License| |Intel libva| MIT License -|Intel media-driver | MIT License| -|Intel media SDK|MIT License| -|intel-opencl | MIT License| -|gstreamer|GNU Lesser General Public License v2.1 or later| -|gst orc|GNU Lesser General Public License v2.1 or later| -|gst plugin base|GNU Lesser General Public License v2.1 or later| -|gst plugin good|GNU Lesser General Public License v2.1 or later| -|gst plugin bad|GNU Lesser General Public License v2.1 or later| -|gst plugin ugly|GNU Lesser General Public License v2.1 or later| -|gst plugin libav|GNU Library General Public License Version 2| -|gst plugin vaapi|GNU Lesser General Public License v2.1 or later| -|opencv|BSD 3-clause "New" or "Revised" License| +|Intel opencl | MIT License| +|Intel media driver | MIT License| |OpenVINO|End User License Agreement for the Intel(R) Software Development Products| -|gst plugin gva|MIT License| +|json-c|MIT License| +|librdkafka|BSD 2-clause "Simplified" License| +|OpenCV|BSD 3-clause "New" or "Revised" License| +|gstreamer|GNU Lesser General Public License v2.1 or later| +|gst plugins base|GNU Lesser General Public License v2.1 or later| +|gst plugins good|GNU Lesser General Public License v2.1 or later| +|gst plugins bad|GNU Lesser General Public License v2.1 or later| +|gst plugins ugly|GNU Lesser General Public License v2.1 or later| +|gst libav|GNU Library General Public License Version 2.1 or later| +|gst vaapi|GNU Lesser General Public License v2.1 or later| +|paho.mqtt.c|Eclipse Public License - v 2.0| +|gst python|GNU Library General Public License Version 2.1| More license information can be found in [components source package](https://github.com/OpenVisualCloud/Dockerfiles-Resources). diff --git a/VCAC-A/ubuntu-18.04/analytics/hddldaemon/README.md b/VCAC-A/ubuntu-18.04/analytics/hddldaemon/README.md index 6aecb264f..64abcd804 100644 --- a/VCAC-A/ubuntu-18.04/analytics/hddldaemon/README.md +++ b/VCAC-A/ubuntu-18.04/analytics/hddldaemon/README.md @@ -1,7 +1,7 @@ This docker image is part of Open Visual Cloud software stacks. Optimized for Media Analytics. With OpenVINO HDDL daemon installed and configured. The docker image can be used in the FROM field of a downstream Dockerfile. ## Supported tags and respective Dockerfile links - - [vcac-a-ubuntu-1804-analytics-hddldaemon](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/VCAC-A/ubuntu-18.04/analytics/hddldaemon/Dockerfile) + - [vcac-a-ubuntu-1804-analytics-hddldaemon](https://github.com/OpenVisualCloud/Dockerfiles/blob/v21.3/VCAC-A/ubuntu-18.04/analytics/hddldaemon/Dockerfile) ## Quick reference - #### Supported platform and OS @@ -24,7 +24,7 @@ This docker installs third party components licensed under various open source l | Components | License | | ----- | ----- | |Ubuntu| [Various](https://hub.docker.com/_/ubuntu) | -|OpenVINO|End User License Agreement for the Intel(R) Software Development Products| +|openvino|End User License Agreement for the Intel(R) Software Development Products| More license information can be found in [components source package](https://github.com/OpenVisualCloud/Dockerfiles-Resources). diff --git a/VCAC-A/ubuntu-20.04/analytics/dev/README.md b/VCAC-A/ubuntu-20.04/analytics/dev/README.md index ccf162ade..13241544c 100644 --- a/VCAC-A/ubuntu-20.04/analytics/dev/README.md +++ b/VCAC-A/ubuntu-20.04/analytics/dev/README.md @@ -1,11 +1,11 @@ This docker image is part of Open Visual Cloud software stacks. This is development image aim towards enabling C++ application compilation, debugging (with the debugging, profiling tools) and optimization (with the optimization tools.) You can compile C++ applications with this image and then copy the applications to the corresponding deployment image. Included what are in FFmpeg & GStreamer media analytics images. Also included Intel hardware accelaration software stack such as media SDK, media driver, gmmlib and libva. The docker image can be used in the FROM field of a downstream Dockerfile. ## Supported tags and respective Dockerfile links - - [vcac-a-ubuntu-1804-analytics-dev](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/VCAC-A/ubuntu-18.04/analytics/dev/Dockerfile) + - [vcac-a-ubuntu-2004-analytics-dev](https://github.com/OpenVisualCloud/Dockerfiles/blob/v21.3/VCAC-A/ubuntu-20.04/analytics/dev/Dockerfile) ## Quick reference - #### Supported platform and OS - Intel® VCAC-A platform, Ubuntu 18.04 + Intel® VCAC-A platform, Ubuntu 20.04 - #### Usage instructions: [FFmpeg](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/doc/ffmpeg.md) [GStreamer](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/doc/gst.md) @@ -34,23 +34,23 @@ This docker installs third party components licensed under various open source l |x265|GNU General Public License v2.0 or later| |dav1d|BSD 2-clause "Simplified" License| |Intel Graphics Memory Management Library| MIT License| -|libdrm|MIT license| |Intel libva| MIT License -|Intel media-driver | MIT License| +|Intel opencl | MIT License| +|Intel media driver | MIT License| |Intel media SDK|MIT License| -|intel-opencl | MIT License| +|OpenVINO|End User License Agreement for the Intel(R) Software Development Products| |json-c|MIT License| +|librdkafka|BSD 2-clause "Simplified" License| +|OpenCV|BSD 3-clause "New" or "Revised" License| |gstreamer|GNU Lesser General Public License v2.1 or later| -|gst orc|GNU Lesser General Public License v2.1 or later| -|gst plugin base|GNU Lesser General Public License v2.1 or later| -|gst plugin good|GNU Lesser General Public License v2.1 or later| -|gst plugin bad|GNU Lesser General Public License v2.1 or later| -|gst plugin ugly|GNU Lesser General Public License v2.1 or later| -|gst plugin libav|GNU Library General Public License Version 2| -|gst plugin vaapi|GNU Lesser General Public License v2.1 or later| -|opencv|BSD 3-clause "New" or "Revised" License| -|OpenVINO|End User License Agreement for the Intel(R) Software Development Products| -|gst plugin gva|MIT License| +|gst plugins base|GNU Lesser General Public License v2.1 or later| +|gst plugins good|GNU Lesser General Public License v2.1 or later| +|gst plugins bad|GNU Lesser General Public License v2.1 or later| +|gst plugins ugly|GNU Lesser General Public License v2.1 or later| +|gst libav|GNU Library General Public License Version 2.1 or later| +|gst vaapi|GNU Lesser General Public License v2.1 or later| +|paho.mqtt.c|Eclipse Public License - v 2.0| +|gst python|GNU Library General Public License Version 2.1| |FFmpeg|GNU Lesser General Public License v2.1 or later| diff --git a/VCAC-A/ubuntu-20.04/analytics/ffmpeg/README.md b/VCAC-A/ubuntu-20.04/analytics/ffmpeg/README.md index 9561c1fa0..5502ec696 100644 --- a/VCAC-A/ubuntu-20.04/analytics/ffmpeg/README.md +++ b/VCAC-A/ubuntu-20.04/analytics/ffmpeg/README.md @@ -1,11 +1,11 @@ This docker image is part of Open Visual Cloud software stacks. Optimized for Media Analytics. Included what are in media delivery FFmpeg image, inferencing engine and video analytics plugins. Also included Intel hardware accelaration software stack such as media SDK, media driver, opencl, gmmlib and libva. The docker image can be used in the FROM field of a downstream Dockerfile. ## Supported tags and respective Dockerfile links - - [vcac-a-ubuntu-1804-analytics-ffmpeg](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/VCAC-A/ubuntu-18.04/analytics/ffmpeg/Dockerfile) + - [vcac-a-ubuntu-2004-analytics-ffmpeg](https://github.com/OpenVisualCloud/Dockerfiles/blob/v21.3/VCAC-A/ubuntu-20.04/analytics/ffmpeg/Dockerfile) ## Quick reference - #### Supported platform and OS - Intel® VCAC-A platform, Ubuntu 18.04 + Intel® VCAC-A platform, Ubuntu 20.04 - #### Usage instructions: [FFmpeg](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/doc/ffmpeg.md) @@ -33,15 +33,14 @@ This docker installs third party components licensed under various open source l |x265|GNU General Public License v2.0 or later| |dav1d|BSD 2-clause "Simplified" License| |Intel Graphics Memory Management Library| MIT License| -|libdrm|MIT license| |Intel libva| MIT License -|Intel media-driver | MIT License| +|Intel opencl | MIT License| +|Intel media driver | MIT License| |Intel media SDK|MIT License| -|intel-opencl | MIT License| +|OpenVINO|End User License Agreement for the Intel(R) Software Development Products| |json-c|MIT License| |librdkafka|BSD 2-clause "Simplified" License| -|opencv|BSD 3-clause "New" or "Revised" License| -|OpenVINO|End User License Agreement for the Intel(R) Software Development Products| +|OpenCV|BSD 3-clause "New" or "Revised" License| |FFmpeg|GNU Lesser General Public License v2.1 or later| diff --git a/VCAC-A/ubuntu-20.04/analytics/gst/README.md b/VCAC-A/ubuntu-20.04/analytics/gst/README.md index 3911d4a12..7ffdf4520 100644 --- a/VCAC-A/ubuntu-20.04/analytics/gst/README.md +++ b/VCAC-A/ubuntu-20.04/analytics/gst/README.md @@ -1,11 +1,11 @@ This docker image is part of Open Visual Cloud software stacks. Optimized for Media Analytics. Included what are in media delivery GStreamer image, inferencing engine and video analytics plugins. Also included Intel hardware accelaration software stack such as media SDK, media driver, opencl, gmmlib and libva. The docker image can be used in the FROM field of a downstream Dockerfile. ## Supported tags and respective Dockerfile links - - [vcac-a-ubuntu-1804-analytics-gst](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/VCAC-A/ubuntu-18.04/analytics/gst/Dockerfile) + - [vcac-a-ubuntu-2004-analytics-gst](https://github.com/OpenVisualCloud/Dockerfiles/blob/v21.3/VCAC-A/ubuntu-20.04/analytics/gst/Dockerfile) ## Quick reference - #### Supported platform and OS - Intel® VCAC-A platform, Ubuntu 18.04 + Intel® VCAC-A platform, Ubuntu 20.04 - #### Usage instructions: [GStreamer](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/doc/gst.md) @@ -35,20 +35,21 @@ This docker installs third party components licensed under various open source l |dav1d|BSD 2-clause "Simplified" License| |Intel Graphics Memory Management Library| MIT License| |Intel libva| MIT License -|Intel media-driver | MIT License| -|Intel media SDK|MIT License| -|intel-opencl | MIT License| -|gstreamer|GNU Lesser General Public License v2.1 or later| -|gst orc|GNU Lesser General Public License v2.1 or later| -|gst plugin base|GNU Lesser General Public License v2.1 or later| -|gst plugin good|GNU Lesser General Public License v2.1 or later| -|gst plugin bad|GNU Lesser General Public License v2.1 or later| -|gst plugin ugly|GNU Lesser General Public License v2.1 or later| -|gst plugin libav|GNU Library General Public License Version 2| -|gst plugin vaapi|GNU Lesser General Public License v2.1 or later| -|opencv|BSD 3-clause "New" or "Revised" License| +|Intel opencl | MIT License| +|Intel media driver | MIT License| |OpenVINO|End User License Agreement for the Intel(R) Software Development Products| -|gst plugin gva|MIT License| +|json-c|MIT License| +|librdkafka|BSD 2-clause "Simplified" License| +|OpenCV|BSD 3-clause "New" or "Revised" License| +|gstreamer|GNU Lesser General Public License v2.1 or later| +|gst plugins base|GNU Lesser General Public License v2.1 or later| +|gst plugins good|GNU Lesser General Public License v2.1 or later| +|gst plugins bad|GNU Lesser General Public License v2.1 or later| +|gst plugins ugly|GNU Lesser General Public License v2.1 or later| +|gst libav|GNU Library General Public License Version 2.1 or later| +|gst vaapi|GNU Lesser General Public License v2.1 or later| +|paho.mqtt.c|Eclipse Public License - v 2.0| +|gst python|GNU Library General Public License Version 2.1| More license information can be found in [components source package](https://github.com/OpenVisualCloud/Dockerfiles-Resources). diff --git a/Xeon/centos-7/analytics/dev/README.md b/Xeon/centos-7/analytics/dev/README.md new file mode 100644 index 000000000..4f085c7c4 --- /dev/null +++ b/Xeon/centos-7/analytics/dev/README.md @@ -0,0 +1,56 @@ +This docker image is part of Open Visual Cloud software stacks. This is development image aim towards enabling C++ application compilation, debugging (with the debugging, profiling tools) and optimization (with the optimization tools.) You can compile C++ applications with this image and then copy the applications to the corresponding deployment image. Included what are in FFmpeg & GStreamer media analytics images. The docker image can be used in the FROM field of a downstream Dockerfile. + +## Supported tags and respective Dockerfile links + - [xeon-centos-7-analytics-dev](https://github.com/OpenVisualCloud/Dockerfiles/blob/v21.3/Xeon/centos-7/analytics/dev/Dockerfile) + +## Quick reference +- #### Supported platform and OS + Intel® Xeon® platform, CentOS-7 + +- #### Usage instructions: + [FFmpeg](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/doc/ffmpeg.md) [GStreamer](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/doc/gst.md) + + +- #### Getting started with Dockerfiles: + [OpenVisualCloud Dockerfiles Wiki](https://github.com/OpenVisualCloud/Dockerfiles/wiki) + +- #### File issues: + [OpenVisualCloud Dockerfiles Issues](https://github.com/OpenVisualCloud/Dockerfiles/issues) + + +## License +This docker installs third party components licensed under various open source licenses. The terms under which those components may be used and distributed can be found with the license document that is provided with those components. Please familiarize yourself with those terms to ensure your distribution of those components complies with the terms of those licenses. + + +| Components | License | +| ----- | ----- | +|CentOS| [Various](https://hub.docker.com/_/centos) | +|libogg|BSD 3-clause "New" or "Revised" License| +|libvorbis|BSD 3-clause "New" or "Revised" License| +|Opus Interactive Audio Codec|BSD 3-clause "New" or "Revised" License| +|libvpx|BSD 3-clause "New" or "Revised" License| +|Aomedia AV1 Codec Library|BSD 2-clause "Simplified" License| +|x264|GNU General Public License v2.0 or later| +|x265|GNU General Public License v2.0 or later| +|dav1d|BSD 2-clause "Simplified" License| +|Intel SVT-HEVC|BSD-2-Clause Plus Patent License| +|Intel SVT-AV1|BSD-2-Clause Plus Patent License| +|Intel SVT-VP9|BSD-2-Clause Plus Patent License| +|OpenVINO|Apache License v2.0| +|json-c|MIT License| +|librdkafka|BSD 2-clause "Simplified" License| +|gstreamer|GNU Lesser General Public License v2.1 or later| +|gst plugins base|GNU Lesser General Public License v2.1 or later| +|gst plugins good|GNU Lesser General Public License v2.1 or later| +|gst plugins bad|GNU Lesser General Public License v2.1 or later| +|gst plugins ugly|GNU Lesser General Public License v2.1 or later| +|gst libav|GNU Library General Public License Version 2.1 or later| +|gst svt|GNU Lesser General Public License v2.1 or later| +|OpenCV|BSD 3-clause "New" or "Revised" License| +|gst video analytics|MIT License| +|gst python|GNU Library General Public License Version 2.1| +|FFmpeg|GNU Lesser General Public License v2.1 or later| + + +More license information can be found in [components source package](https://github.com/OpenVisualCloud/Dockerfiles-Resources). +As for any pre-built image usage, it is the image user's responsibility to ensure that any use of this image complies with any relevant licenses and potential fees for all software contained within. We will have no indemnity or warranty coverage from suppliers. diff --git a/Xeon/centos-7/analytics/ffmpeg/README.md b/Xeon/centos-7/analytics/ffmpeg/README.md new file mode 100644 index 000000000..506f0758f --- /dev/null +++ b/Xeon/centos-7/analytics/ffmpeg/README.md @@ -0,0 +1,46 @@ +This docker image is part of Open Visual Cloud software stacks. Optimized for Media Analytics. Included what are in media delivery FFmpeg image, inferencing engine and video analytics plugins. The docker image can be used in the FROM field of a downstream Dockerfile. + +## Supported tags and respective Dockerfile links + - [xeon-centos-7-analytics-ffmpeg](https://github.com/OpenVisualCloud/Dockerfiles/blob/v21.3/Xeon/centos-7/analytics/ffmpeg/Dockerfile) + +## Quick reference +- #### Supported platform and OS + Intel® Xeon® platform, CentOS-7 + +- #### Usage instructions: + [FFmpeg](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/doc/ffmpeg.md) + + +- #### Getting started with Dockerfiles: + [OpenVisualCloud Dockerfiles Wiki](https://github.com/OpenVisualCloud/Dockerfiles/wiki) + +- #### File issues: + [OpenVisualCloud Dockerfiles Issues](https://github.com/OpenVisualCloud/Dockerfiles/issues) + + +## License +This docker installs third party components licensed under various open source licenses. The terms under which those components may be used and distributed can be found with the license document that is provided with those components. Please familiarize yourself with those terms to ensure your distribution of those components complies with the terms of those licenses. + + +| Components | License | +| ----- | ----- | +|CentOS| [Various](https://hub.docker.com/_/centos) | +|libogg|BSD 3-clause "New" or "Revised" License| +|libvorbis|BSD 3-clause "New" or "Revised" License| +|Opus Interactive Audio Codec|BSD 3-clause "New" or "Revised" License| +|libvpx|BSD 3-clause "New" or "Revised" License| +|x264|GNU General Public License v2.0 or later| +|x265|GNU General Public License v2.0 or later| +|dav1d|BSD 2-clause "Simplified" License| +|Intel SVT-HEVC|BSD-2-Clause Plus Patent License| +|Intel SVT-AV1|BSD-2-Clause Plus Patent License| +|Intel SVT-VP9|BSD-2-Clause Plus Patent License| +|OpenVINO|Apache License v2.0| +|json-c|MIT License| +|librdkafka|BSD 2-clause "Simplified" License| +|OpenCV|BSD 3-clause "New" or "Revised" License| +|FFmpeg|GNU Lesser General Public License v2.1 or later| + + +More license information can be found in [components source package](https://github.com/OpenVisualCloud/Dockerfiles-Resources). +As for any pre-built image usage, it is the image user's responsibility to ensure that any use of this image complies with any relevant licenses and potential fees for all software contained within. We will have no indemnity or warranty coverage from suppliers. diff --git a/Xeon/centos-7/analytics/gst/README.md b/Xeon/centos-7/analytics/gst/README.md new file mode 100644 index 000000000..99dfc6e4a --- /dev/null +++ b/Xeon/centos-7/analytics/gst/README.md @@ -0,0 +1,55 @@ +This docker image is part of Open Visual Cloud software stacks. Optimized for Media Analytics. Included what are in media delivery GStreamer image, inferencing engine and video analytics plugins. The docker image can be used in the FROM field of a downstream Dockerfile. + +## Supported tags and respective Dockerfile links + - [xeon-centos-7-analytics-gst](https://github.com/OpenVisualCloud/Dockerfiles/blob/v21.3/Xeon/centos-7/analytics/gst/Dockerfile) + +## Quick reference +- #### Supported platform and OS + Intel® Xeon® platform, CentOS-7 + +- #### Usage instructions: + [GStreamer](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/doc/gst.md) + + +- #### Getting started with Dockerfiles: + [OpenVisualCloud Dockerfiles Wiki](https://github.com/OpenVisualCloud/Dockerfiles/wiki) + +- #### File issues: + [OpenVisualCloud Dockerfiles Issues](https://github.com/OpenVisualCloud/Dockerfiles/issues) + + +## License +This docker installs third party components licensed under various open source licenses. The terms under which those components may be used and distributed can be found with the license document that is provided with those components. Please familiarize yourself with those terms to ensure your distribution of those components complies with the terms of those licenses. + + +| Components | License | +| ----- | ----- | +|CentOS| [Various](https://hub.docker.com/_/centos) | +|libogg|BSD 3-clause "New" or "Revised" License| +|libvorbis|BSD 3-clause "New" or "Revised" License| +|Opus Interactive Audio Codec|BSD 3-clause "New" or "Revised" License| +|libvpx|BSD 3-clause "New" or "Revised" License| +|Aomedia AV1 Codec Library|BSD 2-clause "Simplified" License| +|x264|GNU General Public License v2.0 or later| +|x265|GNU General Public License v2.0 or later| +|dav1d|BSD 2-clause "Simplified" License| +|Intel SVT-HEVC|BSD-2-Clause Plus Patent License| +|Intel SVT-AV1|BSD-2-Clause Plus Patent License| +|Intel SVT-VP9|BSD-2-Clause Plus Patent License| +|OpenVINO|Apache License v2.0| +|json-c|MIT License| +|librdkafka|BSD 2-clause "Simplified" License| +|gstreamer|GNU Lesser General Public License v2.1 or later| +|gst plugins base|GNU Lesser General Public License v2.1 or later| +|gst plugins good|GNU Lesser General Public License v2.1 or later| +|gst plugins bad|GNU Lesser General Public License v2.1 or later| +|gst plugins ugly|GNU Lesser General Public License v2.1 or later| +|gst libav|GNU Library General Public License Version 2.1 or later| +|gst svt|GNU Lesser General Public License v2.1 or later| +|OpenCV|BSD 3-clause "New" or "Revised" License| +|gst video analytics|MIT License| +|gst python|GNU Library General Public License Version 2.1| + + +More license information can be found in [components source package](https://github.com/OpenVisualCloud/Dockerfiles-Resources). +As for any pre-built image usage, it is the image user's responsibility to ensure that any use of this image complies with any relevant licenses and potential fees for all software contained within. We will have no indemnity or warranty coverage from suppliers. diff --git a/Xeon/centos-7/graphics/dev/README.md b/Xeon/centos-7/graphics/dev/README.md index 8572f92d3..6f213718a 100644 --- a/Xeon/centos-7/graphics/dev/README.md +++ b/Xeon/centos-7/graphics/dev/README.md @@ -1,7 +1,7 @@ This docker image is part of Open Visual Cloud software stacks. This is development image aim towards enabling C++ application compilation, debugging (with the debugging, profiling tools) and optimization (with the optimization tools.) You can compile C++ applications with this image and then copy the applications to the corresponding deployment image. This image is for Intel OSPRay C++ application development. The docker image can be used in the FROM field of a downstream Dockerfile. ## Supported tags and respective Dockerfile links - - [xeon-centos-7-graphics-dev](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/Xeon/centos-7/graphics/dev/Dockerfile) + - [xeon-centos-7-graphics-dev](https://github.com/OpenVisualCloud/Dockerfiles/blob/v21.3/Xeon/centos-7/graphics/dev/Dockerfile) ## Quick reference - #### Supported platform and OS @@ -27,8 +27,8 @@ This docker installs third party components licensed under various open source l |CentOS| [Various](https://hub.docker.com/_/centos) | |ispc|BSD 3-clause License| |embree|Apache License 2.0| +|OpenImageIO|BSD 3-clause License|,|openexr|BSD 3-clause "New" or "Revised" License| |ospray|Apache License v2.0| -|oiio|BSD 3-clause License|,|openexr|BSD 3-clause "New" or "Revised" License| |ospray|Apache License v2.0| diff --git a/Xeon/centos-7/graphics/ospray-mpi/README.md b/Xeon/centos-7/graphics/ospray-mpi/README.md index c52b3158e..01e2412a6 100644 --- a/Xeon/centos-7/graphics/ospray-mpi/README.md +++ b/Xeon/centos-7/graphics/ospray-mpi/README.md @@ -1,7 +1,7 @@ This docker image is part of Open Visual Cloud software stacks. Docker images optimized for Intel OSPRay and multi-host connections. Included the Intel OSPRay ray tracing engine with multi-host connections via MPI. The docker image can be used in the FROM field of a downstream Dockerfile. ## Supported tags and respective Dockerfile links - - [xeon-centos-7-graphics-ospray-mpi](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/Xeon/centos-7/graphics/ospray-mpi/Dockerfile) + - [xeon-centos-7-graphics-ospray-mpi](https://github.com/OpenVisualCloud/Dockerfiles/blob/v21.3/Xeon/centos-7/graphics/ospray-mpi/Dockerfile) ## Quick reference - #### Supported platform and OS @@ -27,7 +27,7 @@ This docker installs third party components licensed under various open source l |CentOS| [Various](https://hub.docker.com/_/centos) | |ispc|BSD 3-clause License| |embree|Apache License 2.0| -|oiio|BSD 3-clause License|,|openexr|BSD 3-clause "New" or "Revised" License| +|OpenImageIO|BSD 3-clause License|,|openexr|BSD 3-clause "New" or "Revised" License| |ospray|Apache License v2.0| diff --git a/Xeon/centos-7/graphics/ospray/README.md b/Xeon/centos-7/graphics/ospray/README.md index 74bdb965c..07861a1bd 100644 --- a/Xeon/centos-7/graphics/ospray/README.md +++ b/Xeon/centos-7/graphics/ospray/README.md @@ -1,7 +1,7 @@ This docker image is part of Open Visual Cloud software stacks. Docker images optimized for Intel OSPRay. Included the Intel OSPRay ray tracing engine and examples. The docker image can be used in the FROM field of a downstream Dockerfile. ## Supported tags and respective Dockerfile links - - [xeon-centos-7-graphics-ospray](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/Xeon/centos-7/graphics/ospray/Dockerfile) + - [xeon-centos-7-graphics-ospray](https://github.com/OpenVisualCloud/Dockerfiles/blob/v21.3/Xeon/centos-7/graphics/ospray/Dockerfile) ## Quick reference - #### Supported platform and OS diff --git a/Xeon/centos-7/media/dev/README.md b/Xeon/centos-7/media/dev/README.md index 9ed045060..6028ae495 100644 --- a/Xeon/centos-7/media/dev/README.md +++ b/Xeon/centos-7/media/dev/README.md @@ -1,7 +1,7 @@ This docker image is part of Open Visual Cloud software stacks. This is development image aim towards enabling C++ application compilation, debugging (with the debugging, profiling tools) and optimization (with the optimization tools.) You can compile C++ applications with this image and then copy the applications to the corresponding deployment image. Included what are in FFmpeg or GStreamer media creation and delivery images . The docker image can be used in the FROM field of a downstream Dockerfile. ## Supported tags and respective Dockerfile links - - [xeon-centos-7-media-dev](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/Xeon/centos-7/media/dev/Dockerfile) + - [xeon-centos-7-media-dev](https://github.com/OpenVisualCloud/Dockerfiles/blob/v21.3/Xeon/centos-7/media/dev/Dockerfile) ## Quick reference - #### Supported platform and OS @@ -37,13 +37,12 @@ This docker installs third party components licensed under various open source l |Intel SVT-AV1|BSD-2-Clause Plus Patent License| |Intel SVT-VP9|BSD-2-Clause Plus Patent License| |gstreamer|GNU Lesser General Public License v2.1 or later| -|gst orc|GNU Lesser General Public License v2.1 or later| -|gst plugin base|GNU Lesser General Public License v2.1 or later| -|gst plugin good|GNU Lesser General Public License v2.1 or later| -|gst plugin bad|GNU Lesser General Public License v2.1 or later| -|gst plugin ugly|GNU Lesser General Public License v2.1 or later| -|gst plugin libav|GNU Library General Public License Version 2| -|gst plugin svt|GNU Lesser General Public License v2.1 or later| +|gst plugins base|GNU Lesser General Public License v2.1 or later| +|gst plugins good|GNU Lesser General Public License v2.1 or later| +|gst plugins bad|GNU Lesser General Public License v2.1 or later| +|gst plugins ugly|GNU Lesser General Public License v2.1 or later| +|gst libav|GNU Library General Public License Version 2.1 or later| +|gst svt|GNU Lesser General Public License v2.1 or later| |FFmpeg|GNU Lesser General Public License v2.1 or later| diff --git a/Xeon/centos-7/media/ffmpeg/README.md b/Xeon/centos-7/media/ffmpeg/README.md index 84d8c93d4..c60a67630 100644 --- a/Xeon/centos-7/media/ffmpeg/README.md +++ b/Xeon/centos-7/media/ffmpeg/README.md @@ -1,7 +1,7 @@ This docker image is part of Open Visual Cloud software stacks. Optimized for the media creation and delivery use case. Included FFmpeg and codecs such as aac, opus, ogg, vorbis, x264, x265, vp8/9, av1 and SVT-HEVC. The docker image can be used in the FROM field of a downstream Dockerfile. ## Supported tags and respective Dockerfile links - - [xeon-centos-7-media-ffmpeg](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/Xeon/centos-7/media/ffmpeg/Dockerfile) + - [xeon-centos-7-media-ffmpeg](https://github.com/OpenVisualCloud/Dockerfiles/blob/v21.3/Xeon/centos-7/media/ffmpeg/Dockerfile) ## Quick reference - #### Supported platform and OS @@ -35,6 +35,7 @@ This docker installs third party components licensed under various open source l |Intel SVT-HEVC|BSD-2-Clause Plus Patent License| |Intel SVT-AV1|BSD-2-Clause Plus Patent License| |Intel SVT-VP9|BSD-2-Clause Plus Patent License| +|OpenCV|BSD 3-clause "New" or "Revised" License| |FFmpeg|GNU Lesser General Public License v2.1 or later| diff --git a/Xeon/centos-7/media/gst/README.md b/Xeon/centos-7/media/gst/README.md index 35171e175..9bece8b1a 100644 --- a/Xeon/centos-7/media/gst/README.md +++ b/Xeon/centos-7/media/gst/README.md @@ -1,7 +1,7 @@ This docker image is part of Open Visual Cloud software stacks. Optimized for the media creation and delivery use case. Included gstreamer and audio and video plugins that can be connected to process audio and video content, such as creating, converting, transcoding. The docker image can be used in the FROM field of a downstream Dockerfile. ## Supported tags and respective Dockerfile links - - [xeon-centos-7-media-gst](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/Xeon/centos-7/media/gst/Dockerfile) + - [xeon-centos-7-media-gst](https://github.com/OpenVisualCloud/Dockerfiles/blob/v21.3/Xeon/centos-7/media/gst/Dockerfile) ## Quick reference - #### Supported platform and OS @@ -37,12 +37,12 @@ This docker installs third party components licensed under various open source l |Intel SVT-AV1|BSD-2-Clause Plus Patent License| |Intel SVT-VP9|BSD-2-Clause Plus Patent License| |gstreamer|GNU Lesser General Public License v2.1 or later| -|gst plugin base|GNU Lesser General Public License v2.1 or later| -|gst plugin good|GNU Lesser General Public License v2.1 or later| -|gst plugin bad|GNU Lesser General Public License v2.1 or later| -|gst plugin ugly|GNU Lesser General Public License v2.1 or later| -|gst plugin libav|GNU Library General Public License Version 2| -|gst plugin svt|GNU Lesser General Public License v2.1 or later| +|gst plugins base|GNU Lesser General Public License v2.1 or later| +|gst plugins good|GNU Lesser General Public License v2.1 or later| +|gst plugins bad|GNU Lesser General Public License v2.1 or later| +|gst plugins ugly|GNU Lesser General Public License v2.1 or later| +|gst libav|GNU Library General Public License Version 2.1 or later| +|gst svt|GNU Lesser General Public License v2.1 or later| More license information can be found in [components source package](https://github.com/OpenVisualCloud/Dockerfiles-Resources). diff --git a/Xeon/centos-7/media/nginx/README.md b/Xeon/centos-7/media/nginx/README.md index 4810d2180..180224cd6 100644 --- a/Xeon/centos-7/media/nginx/README.md +++ b/Xeon/centos-7/media/nginx/README.md @@ -1,7 +1,7 @@ This docker image is part of Open Visual Cloud software stacks. Optimized for the media creation and delivery use case. Optimized for NGINX web server that can be used for serving web content, load balancing, HTTP caching, or a reverse proxy. The docker image can be used in the FROM field of a downstream Dockerfile. ## Supported tags and respective Dockerfile links - - [xeon-centos-7-media-nginx](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/Xeon/centos-7/media/nginx/Dockerfile) + - [xeon-centos-7-media-nginx](https://github.com/OpenVisualCloud/Dockerfiles/blob/v21.3/Xeon/centos-7/media/nginx/Dockerfile) ## Quick reference - #### Supported platform and OS @@ -25,9 +25,9 @@ This docker installs third party components licensed under various open source l | Components | License | | ----- | ----- | |CentOS| [Various](https://hub.docker.com/_/centos) | -|NGINX_HTTP_FLV|BSD 2-clause "Simplified" License| -|NGINX_Upload_Module|BSD 3-clause "Simplified" License| -|NGINX|BSD 2-clause "Simplified" License| +|nginx http flv|BSD 2-clause "Simplified" License| +|nginx upload module|BSD 3-clause "Simplified" License| +|nginx|BSD 2-clause "Simplified" License| |libogg|BSD 3-clause "New" or "Revised" License| |libvorbis|BSD 3-clause "New" or "Revised" License| |Opus Interactive Audio Codec|BSD 3-clause "New" or "Revised" License| @@ -38,6 +38,7 @@ This docker installs third party components licensed under various open source l |Intel SVT-HEVC|BSD-2-Clause Plus Patent License| |Intel SVT-AV1|BSD-2-Clause Plus Patent License| |Intel SVT-VP9|BSD-2-Clause Plus Patent License| +|OpenCV|BSD 3-clause "New" or "Revised" License| |FFmpeg|GNU Lesser General Public License v2.1 or later| diff --git a/Xeon/centos-7/media/srs/README.md b/Xeon/centos-7/media/srs/README.md new file mode 100644 index 000000000..4407555ab --- /dev/null +++ b/Xeon/centos-7/media/srs/README.md @@ -0,0 +1,44 @@ +This docker image is part of Open Visual Cloud software stacks. Optimized for the media creation and delivery use case. Image with SRS high efficiency, stable and simple RTMP/HLS/FLV streaming cluster. The docker image can be used in the FROM field of a downstream Dockerfile. + +## Supported tags and respective Dockerfile links + - [xeon-centos-7-media-srs](https://github.com/OpenVisualCloud/Dockerfiles/blob/v21.3/Xeon/centos-7/media/srs/Dockerfile) + +## Quick reference +- #### Supported platform and OS + Intel® Xeon® platform, CentOS-7 + + + + +- #### Getting started with Dockerfiles: + [OpenVisualCloud Dockerfiles Wiki](https://github.com/OpenVisualCloud/Dockerfiles/wiki) + +- #### File issues: + [OpenVisualCloud Dockerfiles Issues](https://github.com/OpenVisualCloud/Dockerfiles/issues) + + +## License +This docker installs third party components licensed under various open source licenses. The terms under which those components may be used and distributed can be found with the license document that is provided with those components. Please familiarize yourself with those terms to ensure your distribution of those components complies with the terms of those licenses. + + +| Components | License | +| ----- | ----- | +|CentOS| [Various](https://hub.docker.com/_/centos) | +|OpenSSL|Apache License 2.0| +|Simple Realtime Server|MIT License| +|libogg|BSD 3-clause "New" or "Revised" License| +|libvorbis|BSD 3-clause "New" or "Revised" License| +|Opus Interactive Audio Codec|BSD 3-clause "New" or "Revised" License| +|libvpx|BSD 3-clause "New" or "Revised" License| +|x264|GNU General Public License v2.0 or later| +|x265|GNU General Public License v2.0 or later| +|dav1d|BSD 2-clause "Simplified" License| +|Intel SVT-HEVC|BSD-2-Clause Plus Patent License| +|Intel SVT-AV1|BSD-2-Clause Plus Patent License| +|Intel SVT-VP9|BSD-2-Clause Plus Patent License| +|OpenCV|BSD 3-clause "New" or "Revised" License| +|FFmpeg|GNU Lesser General Public License v2.1 or later| + + +More license information can be found in [components source package](https://github.com/OpenVisualCloud/Dockerfiles-Resources). +As for any pre-built image usage, it is the image user's responsibility to ensure that any use of this image complies with any relevant licenses and potential fees for all software contained within. We will have no indemnity or warranty coverage from suppliers. diff --git a/Xeon/centos-7/media/svt/README.md b/Xeon/centos-7/media/svt/README.md index 6b05c0905..d1e831d68 100644 --- a/Xeon/centos-7/media/svt/README.md +++ b/Xeon/centos-7/media/svt/README.md @@ -1,7 +1,7 @@ This docker image is part of Open Visual Cloud software stacks. Optimized for the media creation and delivery use case. Image with SVT (Scalable Video Technology) Encoder and decoders. Ready to use SVT apps to try AV1, HEVC, VP9 transcoders. The docker image can be used in the FROM field of a downstream Dockerfile. ## Supported tags and respective Dockerfile links - - [xeon-centos-7-media-svt](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/Xeon/centos-7/media/svt/Dockerfile) + - [xeon-centos-7-media-svt](https://github.com/OpenVisualCloud/Dockerfiles/blob/v21.3/Xeon/centos-7/media/svt/Dockerfile) ## Quick reference - #### Supported platform and OS @@ -36,6 +36,7 @@ This docker installs third party components licensed under various open source l |Intel SVT-HEVC|BSD-2-Clause Plus Patent License| |Intel SVT-AV1|BSD-2-Clause Plus Patent License| |Intel SVT-VP9|BSD-2-Clause Plus Patent License| +|OpenCV|BSD 3-clause "New" or "Revised" License| |FFmpeg|GNU Lesser General Public License v2.1 or later| diff --git a/Xeon/centos-7/service/owt-dev/README.md b/Xeon/centos-7/service/owt-dev/README.md index f69196dc3..5cd3e5478 100644 --- a/Xeon/centos-7/service/owt-dev/README.md +++ b/Xeon/centos-7/service/owt-dev/README.md @@ -1,14 +1,13 @@ -This docker image is part of Open Visual Cloud software stacks. Optimized for video conferencing service based on the WebRTC technology and Open WebRTC Toolkit (OWT). Included conferencing modes: 1:N, N:N with video and audio processing nodes. The docker image can be used to compile OWT applications. +This docker image is part of Open Visual Cloud software stacks. Optimized for video conferencing service based on the WebRTC technology and Open WebRTC Toolkit (OWT). The docker image can be used in the FROM field of a downstream Dockerfile. ## Supported tags and respective Dockerfile links - - [xeon-centos7-service-owt-dev](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/Xeon/centos-7/service/owt-dev/Dockerfile) + - [xeon-centos-7-service-owt-dev](https://github.com/OpenVisualCloud/Dockerfiles/blob/v21.3/Xeon/centos-7/service/owt-dev/Dockerfile) ## Quick reference - #### Supported platform and OS - Intel® Xeon® platform, CentOS 7 + Intel® Xeon® platform, CentOS-7 + -- #### Usage instructions: - [OWT](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/doc/owt.md) - #### Getting started with Dockerfiles: @@ -24,19 +23,25 @@ This docker installs third party components licensed under various open source l | Components | License | | ----- | ----- | -|Ubuntu| [Various](https://hub.docker.com/_/ubuntu) | -|libnice|GNU Lesser General Public License| -|openssl|Apache License 2.0| -|libre|BSD 3-clause License| -|usrsctp|BSD 3-clause "New" or "Revised" License| -|libsrtp2|BSD 3-clause License| -|FFmpeg|GNU Lesser General Public License v2.1 or later| -|nodejs| MIT Open Source License| +|CentOS| [Various](https://hub.docker.com/_/centos) | +|OpenSSL|Apache License 2.0| |Intel SVT-HEVC|BSD-2-Clause Plus Patent License| +|libvpx|BSD 3-clause "New" or "Revised" License| +|x264|GNU General Public License v2.0 or later| +|OpenCV|BSD 3-clause "New" or "Revised" License| +|Intel libva| MIT License +|OpenVINO|Apache License v2.0| +|FFmpeg|GNU Lesser General Public License v2.1 or later| +|gstreamer|GNU Lesser General Public License v2.1 or later| +|gst plugins base|GNU Lesser General Public License v2.1 or later| +|gst plugins good|GNU Lesser General Public License v2.1 or later| +|gst plugins bad|GNU Lesser General Public License v2.1 or later| +|gst plugins ugly|GNU Lesser General Public License v2.1 or later| +|gst libav|GNU Library General Public License Version 2.1 or later| +|gst video analytics|MIT License| |owt-server|Apache License v2.0| |owt-sdk|Apache License v2.0| |owt-deps-webrtc|BSD 3-clause License| -|nodejs| MIT Open Source License| More license information can be found in [components source package](https://github.com/OpenVisualCloud/Dockerfiles-Resources). diff --git a/Xeon/centos-7/service/owt/README.md b/Xeon/centos-7/service/owt/README.md index 0ba3c13cd..3d6462b31 100644 --- a/Xeon/centos-7/service/owt/README.md +++ b/Xeon/centos-7/service/owt/README.md @@ -1,11 +1,11 @@ This docker image is part of Open Visual Cloud software stacks. Optimized for video conferencing service based on the WebRTC technology and Open WebRTC Toolkit (OWT). Optimized for video conferencing service based on the WebRTC technology and Open WebRTC Toolkit (OWT). Included conferencing modes: 1:N, N:N with video and audio processing nodes. The docker image can be used in the FROM field of a downstream Dockerfile. ## Supported tags and respective Dockerfile links - - [xeon-centos-76-service-owt](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/Xeon/centos-7.6/service/owt/Dockerfile) + - [xeon-centos-7-service-owt](https://github.com/OpenVisualCloud/Dockerfiles/blob/v21.3/Xeon/centos-7/service/owt/Dockerfile) ## Quick reference - #### Supported platform and OS - Intel® Xeon® platform, CentOS-7.6.1810 + Intel® Xeon® platform, CentOS-7 - #### Usage instructions: [OWT](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/doc/owt.md) @@ -25,18 +25,24 @@ This docker installs third party components licensed under various open source l | Components | License | | ----- | ----- | |CentOS| [Various](https://hub.docker.com/_/centos) | -|libnice|GNU Lesser General Public License| -|openssl|Apache License 2.0| -|libre|BSD 3-clause License| -|usrsctp|BSD 3-clause "New" or "Revised" License| -|libsrtp2|BSD 3-clause License| -|FFmpeg|GNU Lesser General Public License v2.1 or later| -|nodejs| MIT Open Source License| +|OpenSSL|Apache License 2.0| |Intel SVT-HEVC|BSD-2-Clause Plus Patent License| +|libvpx|BSD 3-clause "New" or "Revised" License| +|x264|GNU General Public License v2.0 or later| +|OpenCV|BSD 3-clause "New" or "Revised" License| +|Intel libva| MIT License +|OpenVINO|Apache License v2.0| +|FFmpeg|GNU Lesser General Public License v2.1 or later| +|gstreamer|GNU Lesser General Public License v2.1 or later| +|gst plugins base|GNU Lesser General Public License v2.1 or later| +|gst plugins good|GNU Lesser General Public License v2.1 or later| +|gst plugins bad|GNU Lesser General Public License v2.1 or later| +|gst plugins ugly|GNU Lesser General Public License v2.1 or later| +|gst libav|GNU Library General Public License Version 2.1 or later| +|gst video analytics|MIT License| |owt-server|Apache License v2.0| |owt-sdk|Apache License v2.0| |owt-deps-webrtc|BSD 3-clause License| -|nodejs| MIT Open Source License| More license information can be found in [components source package](https://github.com/OpenVisualCloud/Dockerfiles-Resources). diff --git a/Xeon/centos-7/service/owt360/README.md b/Xeon/centos-7/service/owt360/README.md new file mode 100644 index 000000000..ecee9c9a3 --- /dev/null +++ b/Xeon/centos-7/service/owt360/README.md @@ -0,0 +1,42 @@ +This docker image is part of Open Visual Cloud software stacks. Optimized for video conferencing service based on the WebRTC technology and Open WebRTC Toolkit (OWT). Docker image optimized for ultra-high resolution immersive video low latency streaming, based on the WebRTC technology and the Open WebRTC Toolkit. Included SVT-HEVC tile-based 4K and 8K transcoding and field of view (FoV) adaptive streaming. The docker image can be used in the FROM field of a downstream Dockerfile. + +## Supported tags and respective Dockerfile links + - [xeon-centos-7-service-owt360](https://github.com/OpenVisualCloud/Dockerfiles/blob/v21.3/Xeon/centos-7/service/owt360/Dockerfile) + +## Quick reference +- #### Supported platform and OS + Intel® Xeon® platform, CentOS-7 + +- #### Usage instructions: + [OWT360](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/doc/owt360.md) + + +- #### Getting started with Dockerfiles: + [OpenVisualCloud Dockerfiles Wiki](https://github.com/OpenVisualCloud/Dockerfiles/wiki) + +- #### File issues: + [OpenVisualCloud Dockerfiles Issues](https://github.com/OpenVisualCloud/Dockerfiles/issues) + + +## License +This docker installs third party components licensed under various open source licenses. The terms under which those components may be used and distributed can be found with the license document that is provided with those components. Please familiarize yourself with those terms to ensure your distribution of those components complies with the terms of those licenses. + + +| Components | License | +| ----- | ----- | +|CentOS| [Various](https://hub.docker.com/_/centos) | +|OpenSSL|Apache License 2.0| +|Intel SVT-HEVC|BSD-2-Clause Plus Patent License| +|libvpx|BSD 3-clause "New" or "Revised" License| +|x264|GNU General Public License v2.0 or later| +|OpenCV|BSD 3-clause "New" or "Revised" License| +|OpenVINO|Apache License v2.0| +|FFmpeg|GNU Lesser General Public License v2.1 or later| +|360SCVP|BSD 3-clause "New" or "Revised" License| +|owt-server|Apache License v2.0| +|owt-sdk|Apache License v2.0| +|owt-deps-webrtc|BSD 3-clause License| + + +More license information can be found in [components source package](https://github.com/OpenVisualCloud/Dockerfiles-Resources). +As for any pre-built image usage, it is the image user's responsibility to ensure that any use of this image complies with any relevant licenses and potential fees for all software contained within. We will have no indemnity or warranty coverage from suppliers. diff --git a/Xeon/ubuntu-18.04/analytics/dev/README.md b/Xeon/ubuntu-18.04/analytics/dev/README.md index bb3dbcd2d..fd486e2c2 100644 --- a/Xeon/ubuntu-18.04/analytics/dev/README.md +++ b/Xeon/ubuntu-18.04/analytics/dev/README.md @@ -1,7 +1,7 @@ This docker image is part of Open Visual Cloud software stacks. This is development image aim towards enabling C++ application compilation, debugging (with the debugging, profiling tools) and optimization (with the optimization tools.) You can compile C++ applications with this image and then copy the applications to the corresponding deployment image. Included what are in FFmpeg & GStreamer media analytics images. The docker image can be used in the FROM field of a downstream Dockerfile. ## Supported tags and respective Dockerfile links - - [xeon-ubuntu-1804-analytics-dev](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/Xeon/ubuntu-18.04/analytics/dev/Dockerfile) + - [xeon-ubuntu-1804-analytics-dev](https://github.com/OpenVisualCloud/Dockerfiles/blob/v21.3/Xeon/ubuntu-18.04/analytics/dev/Dockerfile) ## Quick reference - #### Supported platform and OS @@ -36,18 +36,19 @@ This docker installs third party components licensed under various open source l |Intel SVT-HEVC|BSD-2-Clause Plus Patent License| |Intel SVT-AV1|BSD-2-Clause Plus Patent License| |Intel SVT-VP9|BSD-2-Clause Plus Patent License| +|OpenVINO|Apache License v2.0| |json-c|MIT License| +|librdkafka|BSD 2-clause "Simplified" License| |gstreamer|GNU Lesser General Public License v2.1 or later| -|gst orc|GNU Lesser General Public License v2.1 or later| -|gst plugin base|GNU Lesser General Public License v2.1 or later| -|gst plugin good|GNU Lesser General Public License v2.1 or later| -|gst plugin bad|GNU Lesser General Public License v2.1 or later| -|gst plugin ugly|GNU Lesser General Public License v2.1 or later| -|gst plugin libav|GNU Library General Public License Version 2| -|gst plugin svt|GNU Lesser General Public License v2.1 or later| -|opencv|BSD 3-clause "New" or "Revised" License| -|DLDT|Apache License v2.0| -|gst plugin gva|MIT License| +|gst plugins base|GNU Lesser General Public License v2.1 or later| +|gst plugins good|GNU Lesser General Public License v2.1 or later| +|gst plugins bad|GNU Lesser General Public License v2.1 or later| +|gst plugins ugly|GNU Lesser General Public License v2.1 or later| +|gst libav|GNU Library General Public License Version 2.1 or later| +|gst svt|GNU Lesser General Public License v2.1 or later| +|OpenCV|BSD 3-clause "New" or "Revised" License| +|gst video analytics|MIT License| +|gst python|GNU Library General Public License Version 2.1| |FFmpeg|GNU Lesser General Public License v2.1 or later| diff --git a/Xeon/ubuntu-18.04/analytics/ffmpeg/README.md b/Xeon/ubuntu-18.04/analytics/ffmpeg/README.md index c99f63b3b..58d44680e 100644 --- a/Xeon/ubuntu-18.04/analytics/ffmpeg/README.md +++ b/Xeon/ubuntu-18.04/analytics/ffmpeg/README.md @@ -1,7 +1,7 @@ This docker image is part of Open Visual Cloud software stacks. Optimized for Media Analytics. Included what are in media delivery FFmpeg image, inferencing engine and video analytics plugins. The docker image can be used in the FROM field of a downstream Dockerfile. ## Supported tags and respective Dockerfile links - - [xeon-ubuntu-1804-analytics-ffmpeg](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/Xeon/ubuntu-18.04/analytics/ffmpeg/Dockerfile) + - [xeon-ubuntu-1804-analytics-ffmpeg](https://github.com/OpenVisualCloud/Dockerfiles/blob/v21.3/Xeon/ubuntu-18.04/analytics/ffmpeg/Dockerfile) ## Quick reference - #### Supported platform and OS @@ -35,10 +35,10 @@ This docker installs third party components licensed under various open source l |Intel SVT-HEVC|BSD-2-Clause Plus Patent License| |Intel SVT-AV1|BSD-2-Clause Plus Patent License| |Intel SVT-VP9|BSD-2-Clause Plus Patent License| +|OpenCV|BSD 3-clause "New" or "Revised" License| +|OpenVINO|Apache License v2.0| |json-c|MIT License| |librdkafka|BSD 2-clause "Simplified" License| -|opencv|BSD 3-clause "New" or "Revised" License| -|DLDT|Apache License v2.0| |FFmpeg|GNU Lesser General Public License v2.1 or later| diff --git a/Xeon/ubuntu-18.04/analytics/gst/README.md b/Xeon/ubuntu-18.04/analytics/gst/README.md index f7af24121..b32c6cc87 100644 --- a/Xeon/ubuntu-18.04/analytics/gst/README.md +++ b/Xeon/ubuntu-18.04/analytics/gst/README.md @@ -1,7 +1,7 @@ This docker image is part of Open Visual Cloud software stacks. Optimized for Media Analytics. Included what are in media delivery GStreamer image, inferencing engine and video analytics plugins. The docker image can be used in the FROM field of a downstream Dockerfile. ## Supported tags and respective Dockerfile links - - [xeon-ubuntu-1804-analytics-gst](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/Xeon/ubuntu-18.04/analytics/gst/Dockerfile) + - [xeon-ubuntu-1804-analytics-gst](https://github.com/OpenVisualCloud/Dockerfiles/blob/v21.3/Xeon/ubuntu-18.04/analytics/gst/Dockerfile) ## Quick reference - #### Supported platform and OS @@ -36,17 +36,19 @@ This docker installs third party components licensed under various open source l |Intel SVT-HEVC|BSD-2-Clause Plus Patent License| |Intel SVT-AV1|BSD-2-Clause Plus Patent License| |Intel SVT-VP9|BSD-2-Clause Plus Patent License| +|OpenVINO|Apache License v2.0| +|json-c|MIT License| +|librdkafka|BSD 2-clause "Simplified" License| |gstreamer|GNU Lesser General Public License v2.1 or later| -|gst orc|GNU Lesser General Public License v2.1 or later| -|gst plugin base|GNU Lesser General Public License v2.1 or later| -|gst plugin good|GNU Lesser General Public License v2.1 or later| -|gst plugin bad|GNU Lesser General Public License v2.1 or later| -|gst plugin ugly|GNU Lesser General Public License v2.1 or later| -|gst plugin libav|GNU Library General Public License Version 2| -|gst plugin svt|GNU Lesser General Public License v2.1 or later| -|opencv|BSD 3-clause "New" or "Revised" License| -|DLDT|Apache License v2.0| -|gst plugin gva|MIT License| +|gst plugins base|GNU Lesser General Public License v2.1 or later| +|gst plugins good|GNU Lesser General Public License v2.1 or later| +|gst plugins bad|GNU Lesser General Public License v2.1 or later| +|gst plugins ugly|GNU Lesser General Public License v2.1 or later| +|gst libav|GNU Library General Public License Version 2.1 or later| +|gst svt|GNU Lesser General Public License v2.1 or later| +|OpenCV|BSD 3-clause "New" or "Revised" License| +|gst video analytics|MIT License| +|gst python|GNU Library General Public License Version 2.1| More license information can be found in [components source package](https://github.com/OpenVisualCloud/Dockerfiles-Resources). diff --git a/Xeon/ubuntu-18.04/graphics/dev/README.md b/Xeon/ubuntu-18.04/graphics/dev/README.md index 28832799b..629509986 100644 --- a/Xeon/ubuntu-18.04/graphics/dev/README.md +++ b/Xeon/ubuntu-18.04/graphics/dev/README.md @@ -1,7 +1,7 @@ This docker image is part of Open Visual Cloud software stacks. This is development image aim towards enabling C++ application compilation, debugging (with the debugging, profiling tools) and optimization (with the optimization tools.) You can compile C++ applications with this image and then copy the applications to the corresponding deployment image. This image is for Intel OSPRay C++ application development. The docker image can be used in the FROM field of a downstream Dockerfile. ## Supported tags and respective Dockerfile links - - [xeon-ubuntu-1804-graphics-dev](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/Xeon/ubuntu-18.04/graphics/dev/Dockerfile) + - [xeon-ubuntu-1804-graphics-dev](https://github.com/OpenVisualCloud/Dockerfiles/blob/v21.3/Xeon/ubuntu-18.04/graphics/dev/Dockerfile) ## Quick reference - #### Supported platform and OS @@ -27,7 +27,7 @@ This docker installs third party components licensed under various open source l |Ubuntu| [Various](https://hub.docker.com/_/ubuntu) | |ispc|BSD 3-clause License| |embree|Apache License 2.0| -|oiio|BSD 3-clause License|,|openexr|BSD 3-clause "New" or "Revised" License| +|OpenImageIO|BSD 3-clause License|,|openexr|BSD 3-clause "New" or "Revised" License| |ospray|Apache License v2.0| |ospray|Apache License v2.0| diff --git a/Xeon/ubuntu-18.04/graphics/ospray-mpi/README.md b/Xeon/ubuntu-18.04/graphics/ospray-mpi/README.md index 77381b463..a6f5f891a 100644 --- a/Xeon/ubuntu-18.04/graphics/ospray-mpi/README.md +++ b/Xeon/ubuntu-18.04/graphics/ospray-mpi/README.md @@ -1,7 +1,7 @@ This docker image is part of Open Visual Cloud software stacks. Docker images optimized for Intel OSPRay and multi-host connections. Included the Intel OSPRay ray tracing engine with multi-host connections via MPI. The docker image can be used in the FROM field of a downstream Dockerfile. ## Supported tags and respective Dockerfile links - - [xeon-ubuntu-1804-graphics-ospray-mpi](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/Xeon/ubuntu-18.04/graphics/ospray-mpi/Dockerfile) + - [xeon-ubuntu-1804-graphics-ospray-mpi](https://github.com/OpenVisualCloud/Dockerfiles/blob/v21.3/Xeon/ubuntu-18.04/graphics/ospray-mpi/Dockerfile) ## Quick reference - #### Supported platform and OS @@ -27,7 +27,7 @@ This docker installs third party components licensed under various open source l |Ubuntu| [Various](https://hub.docker.com/_/ubuntu) | |ispc|BSD 3-clause License| |embree|Apache License 2.0| -|oiio|BSD 3-clause License|,|openexr|BSD 3-clause "New" or "Revised" License| +|OpenImageIO|BSD 3-clause License|,|openexr|BSD 3-clause "New" or "Revised" License| |ospray|Apache License v2.0| diff --git a/Xeon/ubuntu-18.04/graphics/ospray/README.md b/Xeon/ubuntu-18.04/graphics/ospray/README.md index 7c0b9a9a9..c76236103 100644 --- a/Xeon/ubuntu-18.04/graphics/ospray/README.md +++ b/Xeon/ubuntu-18.04/graphics/ospray/README.md @@ -1,7 +1,7 @@ This docker image is part of Open Visual Cloud software stacks. Docker images optimized for Intel OSPRay. Included the Intel OSPRay ray tracing engine and examples. The docker image can be used in the FROM field of a downstream Dockerfile. ## Supported tags and respective Dockerfile links - - [xeon-ubuntu-1804-graphics-ospray](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/Xeon/ubuntu-18.04/graphics/ospray/Dockerfile) + - [xeon-ubuntu-1804-graphics-ospray](https://github.com/OpenVisualCloud/Dockerfiles/blob/v21.3/Xeon/ubuntu-18.04/graphics/ospray/Dockerfile) ## Quick reference - #### Supported platform and OS diff --git a/Xeon/ubuntu-18.04/media/dev/README.md b/Xeon/ubuntu-18.04/media/dev/README.md index 3f298ee1a..b55609e6a 100644 --- a/Xeon/ubuntu-18.04/media/dev/README.md +++ b/Xeon/ubuntu-18.04/media/dev/README.md @@ -1,7 +1,7 @@ This docker image is part of Open Visual Cloud software stacks. This is development image aim towards enabling C++ application compilation, debugging (with the debugging, profiling tools) and optimization (with the optimization tools.) You can compile C++ applications with this image and then copy the applications to the corresponding deployment image. Included what are in FFmpeg or GStreamer media creation and delivery images . The docker image can be used in the FROM field of a downstream Dockerfile. ## Supported tags and respective Dockerfile links - - [xeon-ubuntu-1804-media-dev](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/Xeon/ubuntu-18.04/media/dev/Dockerfile) + - [xeon-ubuntu-1804-media-dev](https://github.com/OpenVisualCloud/Dockerfiles/blob/v21.3/Xeon/ubuntu-18.04/media/dev/Dockerfile) ## Quick reference - #### Supported platform and OS @@ -37,12 +37,12 @@ This docker installs third party components licensed under various open source l |Intel SVT-AV1|BSD-2-Clause Plus Patent License| |Intel SVT-VP9|BSD-2-Clause Plus Patent License| |gstreamer|GNU Lesser General Public License v2.1 or later| -|gst plugin base|GNU Lesser General Public License v2.1 or later| -|gst plugin good|GNU Lesser General Public License v2.1 or later| -|gst plugin bad|GNU Lesser General Public License v2.1 or later| -|gst plugin ugly|GNU Lesser General Public License v2.1 or later| -|gst plugin libav|GNU Library General Public License Version 2| -|gst plugin svt|GNU Lesser General Public License v2.1 or later| +|gst plugins base|GNU Lesser General Public License v2.1 or later| +|gst plugins good|GNU Lesser General Public License v2.1 or later| +|gst plugins bad|GNU Lesser General Public License v2.1 or later| +|gst plugins ugly|GNU Lesser General Public License v2.1 or later| +|gst libav|GNU Library General Public License Version 2.1 or later| +|gst svt|GNU Lesser General Public License v2.1 or later| |FFmpeg|GNU Lesser General Public License v2.1 or later| diff --git a/Xeon/ubuntu-18.04/media/ffmpeg/README.md b/Xeon/ubuntu-18.04/media/ffmpeg/README.md index 0a8670005..9bf7af91d 100644 --- a/Xeon/ubuntu-18.04/media/ffmpeg/README.md +++ b/Xeon/ubuntu-18.04/media/ffmpeg/README.md @@ -1,7 +1,7 @@ This docker image is part of Open Visual Cloud software stacks. Optimized for the media creation and delivery use case. Included FFmpeg and codecs such as aac, opus, ogg, vorbis, x264, x265, vp8/9, av1 and SVT-HEVC. The docker image can be used in the FROM field of a downstream Dockerfile. ## Supported tags and respective Dockerfile links - - [xeon-ubuntu-1804-media-ffmpeg](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/Xeon/ubuntu-18.04/media/ffmpeg/Dockerfile) + - [xeon-ubuntu-1804-media-ffmpeg](https://github.com/OpenVisualCloud/Dockerfiles/blob/v21.3/Xeon/ubuntu-18.04/media/ffmpeg/Dockerfile) ## Quick reference - #### Supported platform and OS @@ -35,6 +35,7 @@ This docker installs third party components licensed under various open source l |Intel SVT-HEVC|BSD-2-Clause Plus Patent License| |Intel SVT-AV1|BSD-2-Clause Plus Patent License| |Intel SVT-VP9|BSD-2-Clause Plus Patent License| +|OpenCV|BSD 3-clause "New" or "Revised" License| |FFmpeg|GNU Lesser General Public License v2.1 or later| diff --git a/Xeon/ubuntu-18.04/media/gst/README.md b/Xeon/ubuntu-18.04/media/gst/README.md index 4a0c6f1ad..74a4939c1 100644 --- a/Xeon/ubuntu-18.04/media/gst/README.md +++ b/Xeon/ubuntu-18.04/media/gst/README.md @@ -1,7 +1,7 @@ This docker image is part of Open Visual Cloud software stacks. Optimized for the media creation and delivery use case. Included gstreamer and audio and video plugins that can be connected to process audio and video content, such as creating, converting, transcoding. The docker image can be used in the FROM field of a downstream Dockerfile. ## Supported tags and respective Dockerfile links - - [xeon-ubuntu-1804-media-gst](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/Xeon/ubuntu-18.04/media/gst/Dockerfile) + - [xeon-ubuntu-1804-media-gst](https://github.com/OpenVisualCloud/Dockerfiles/blob/v21.3/Xeon/ubuntu-18.04/media/gst/Dockerfile) ## Quick reference - #### Supported platform and OS @@ -37,12 +37,12 @@ This docker installs third party components licensed under various open source l |Intel SVT-AV1|BSD-2-Clause Plus Patent License| |Intel SVT-VP9|BSD-2-Clause Plus Patent License| |gstreamer|GNU Lesser General Public License v2.1 or later| -|gst plugin base|GNU Lesser General Public License v2.1 or later| -|gst plugin good|GNU Lesser General Public License v2.1 or later| -|gst plugin bad|GNU Lesser General Public License v2.1 or later| -|gst plugin ugly|GNU Lesser General Public License v2.1 or later| -|gst plugin libav|GNU Library General Public License Version 2| -|gst plugin svt|GNU Lesser General Public License v2.1 or later| +|gst plugins base|GNU Lesser General Public License v2.1 or later| +|gst plugins good|GNU Lesser General Public License v2.1 or later| +|gst plugins bad|GNU Lesser General Public License v2.1 or later| +|gst plugins ugly|GNU Lesser General Public License v2.1 or later| +|gst libav|GNU Library General Public License Version 2.1 or later| +|gst svt|GNU Lesser General Public License v2.1 or later| More license information can be found in [components source package](https://github.com/OpenVisualCloud/Dockerfiles-Resources). diff --git a/Xeon/ubuntu-18.04/media/nginx/README.md b/Xeon/ubuntu-18.04/media/nginx/README.md index 1b29c9dd3..ab1a46437 100644 --- a/Xeon/ubuntu-18.04/media/nginx/README.md +++ b/Xeon/ubuntu-18.04/media/nginx/README.md @@ -1,7 +1,7 @@ This docker image is part of Open Visual Cloud software stacks. Optimized for the media creation and delivery use case. Optimized for NGINX web server that can be used for serving web content, load balancing, HTTP caching, or a reverse proxy. The docker image can be used in the FROM field of a downstream Dockerfile. ## Supported tags and respective Dockerfile links - - [xeon-ubuntu-1804-media-nginx](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/Xeon/ubuntu-18.04/media/nginx/Dockerfile) + - [xeon-ubuntu-1804-media-nginx](https://github.com/OpenVisualCloud/Dockerfiles/blob/v21.3/Xeon/ubuntu-18.04/media/nginx/Dockerfile) ## Quick reference - #### Supported platform and OS @@ -25,9 +25,9 @@ This docker installs third party components licensed under various open source l | Components | License | | ----- | ----- | |Ubuntu| [Various](https://hub.docker.com/_/ubuntu) | -|NGINX_HTTP_FLV|BSD 2-clause "Simplified" License| -|NGINX_Upload_Module|BSD 3-clause "Simplified" License| -|NGINX|BSD 2-clause "Simplified" License| +|nginx http flv|BSD 2-clause "Simplified" License| +|nginx upload module|BSD 3-clause "Simplified" License| +|nginx|BSD 2-clause "Simplified" License| |libogg|BSD 3-clause "New" or "Revised" License| |libvorbis|BSD 3-clause "New" or "Revised" License| |Opus Interactive Audio Codec|BSD 3-clause "New" or "Revised" License| @@ -38,6 +38,7 @@ This docker installs third party components licensed under various open source l |Intel SVT-HEVC|BSD-2-Clause Plus Patent License| |Intel SVT-AV1|BSD-2-Clause Plus Patent License| |Intel SVT-VP9|BSD-2-Clause Plus Patent License| +|OpenCV|BSD 3-clause "New" or "Revised" License| |FFmpeg|GNU Lesser General Public License v2.1 or later| diff --git a/Xeon/ubuntu-18.04/media/srs/README.md b/Xeon/ubuntu-18.04/media/srs/README.md new file mode 100644 index 000000000..61df5069c --- /dev/null +++ b/Xeon/ubuntu-18.04/media/srs/README.md @@ -0,0 +1,44 @@ +This docker image is part of Open Visual Cloud software stacks. Optimized for the media creation and delivery use case. Image with SRS high efficiency, stable and simple RTMP/HLS/FLV streaming cluster. The docker image can be used in the FROM field of a downstream Dockerfile. + +## Supported tags and respective Dockerfile links + - [xeon-ubuntu-1804-media-srs](https://github.com/OpenVisualCloud/Dockerfiles/blob/v21.3/Xeon/ubuntu-18.04/media/srs/Dockerfile) + +## Quick reference +- #### Supported platform and OS + Intel® Xeon® platform, Ubuntu 18.04 + + + + +- #### Getting started with Dockerfiles: + [OpenVisualCloud Dockerfiles Wiki](https://github.com/OpenVisualCloud/Dockerfiles/wiki) + +- #### File issues: + [OpenVisualCloud Dockerfiles Issues](https://github.com/OpenVisualCloud/Dockerfiles/issues) + + +## License +This docker installs third party components licensed under various open source licenses. The terms under which those components may be used and distributed can be found with the license document that is provided with those components. Please familiarize yourself with those terms to ensure your distribution of those components complies with the terms of those licenses. + + +| Components | License | +| ----- | ----- | +|Ubuntu| [Various](https://hub.docker.com/_/ubuntu) | +|OpenSSL|Apache License 2.0| +|Simple Realtime Server|MIT License| +|libogg|BSD 3-clause "New" or "Revised" License| +|libvorbis|BSD 3-clause "New" or "Revised" License| +|Opus Interactive Audio Codec|BSD 3-clause "New" or "Revised" License| +|libvpx|BSD 3-clause "New" or "Revised" License| +|x264|GNU General Public License v2.0 or later| +|x265|GNU General Public License v2.0 or later| +|dav1d|BSD 2-clause "Simplified" License| +|Intel SVT-HEVC|BSD-2-Clause Plus Patent License| +|Intel SVT-AV1|BSD-2-Clause Plus Patent License| +|Intel SVT-VP9|BSD-2-Clause Plus Patent License| +|OpenCV|BSD 3-clause "New" or "Revised" License| +|FFmpeg|GNU Lesser General Public License v2.1 or later| + + +More license information can be found in [components source package](https://github.com/OpenVisualCloud/Dockerfiles-Resources). +As for any pre-built image usage, it is the image user's responsibility to ensure that any use of this image complies with any relevant licenses and potential fees for all software contained within. We will have no indemnity or warranty coverage from suppliers. diff --git a/Xeon/ubuntu-18.04/media/svt/README.md b/Xeon/ubuntu-18.04/media/svt/README.md index 7a3474920..6f2390ec7 100644 --- a/Xeon/ubuntu-18.04/media/svt/README.md +++ b/Xeon/ubuntu-18.04/media/svt/README.md @@ -1,7 +1,7 @@ This docker image is part of Open Visual Cloud software stacks. Optimized for the media creation and delivery use case. Image with SVT (Scalable Video Technology) Encoder and decoders. Ready to use SVT apps to try AV1, HEVC, VP9 transcoders. The docker image can be used in the FROM field of a downstream Dockerfile. ## Supported tags and respective Dockerfile links - - [xeon-ubuntu-1804-media-svt](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/Xeon/ubuntu-18.04/media/svt/Dockerfile) + - [xeon-ubuntu-1804-media-svt](https://github.com/OpenVisualCloud/Dockerfiles/blob/v21.3/Xeon/ubuntu-18.04/media/svt/Dockerfile) ## Quick reference - #### Supported platform and OS @@ -36,6 +36,7 @@ This docker installs third party components licensed under various open source l |Intel SVT-HEVC|BSD-2-Clause Plus Patent License| |Intel SVT-AV1|BSD-2-Clause Plus Patent License| |Intel SVT-VP9|BSD-2-Clause Plus Patent License| +|OpenCV|BSD 3-clause "New" or "Revised" License| |FFmpeg|GNU Lesser General Public License v2.1 or later| diff --git a/Xeon/ubuntu-18.04/service/owt-dev/README.md b/Xeon/ubuntu-18.04/service/owt-dev/README.md index eaa29f38c..dacb55961 100644 --- a/Xeon/ubuntu-18.04/service/owt-dev/README.md +++ b/Xeon/ubuntu-18.04/service/owt-dev/README.md @@ -1,14 +1,13 @@ -This docker image is part of Open Visual Cloud software stacks. Optimized for video conferencing service based on the WebRTC technology and Open WebRTC Toolkit (OWT). Included conferencing modes: 1:N, N:N with video and audio processing nodes. The docker image can be used to compile OWT applications. +This docker image is part of Open Visual Cloud software stacks. Optimized for video conferencing service based on the WebRTC technology and Open WebRTC Toolkit (OWT). The docker image can be used in the FROM field of a downstream Dockerfile. ## Supported tags and respective Dockerfile links - - [xeon-ubuntu-1804-service-owt-dev](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/Xeon/ubuntu-18.04/service/owt-dev/Dockerfile) + - [xeon-ubuntu-1804-service-owt-dev](https://github.com/OpenVisualCloud/Dockerfiles/blob/v21.3/Xeon/ubuntu-18.04/service/owt-dev/Dockerfile) ## Quick reference - #### Supported platform and OS Intel® Xeon® platform, Ubuntu 18.04 -- #### Usage instructions: - [OWT](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/doc/owt.md) + - #### Getting started with Dockerfiles: @@ -25,18 +24,23 @@ This docker installs third party components licensed under various open source l | Components | License | | ----- | ----- | |Ubuntu| [Various](https://hub.docker.com/_/ubuntu) | -|libnice|GNU Lesser General Public License| -|openssl|Apache License 2.0| -|libre|BSD 3-clause License| -|usrsctp|BSD 3-clause "New" or "Revised" License| -|libsrtp2|BSD 3-clause License| -|FFmpeg|GNU Lesser General Public License v2.1 or later| -|nodejs| MIT Open Source License| +|OpenSSL|Apache License 2.0| |Intel SVT-HEVC|BSD-2-Clause Plus Patent License| +|libvpx|BSD 3-clause "New" or "Revised" License| +|x264|GNU General Public License v2.0 or later| +|OpenCV|BSD 3-clause "New" or "Revised" License| +|OpenVINO|Apache License v2.0| +|FFmpeg|GNU Lesser General Public License v2.1 or later| +|gstreamer|GNU Lesser General Public License v2.1 or later| +|gst plugins base|GNU Lesser General Public License v2.1 or later| +|gst plugins good|GNU Lesser General Public License v2.1 or later| +|gst plugins bad|GNU Lesser General Public License v2.1 or later| +|gst plugins ugly|GNU Lesser General Public License v2.1 or later| +|gst libav|GNU Library General Public License Version 2.1 or later| +|gst video analytics|MIT License| |owt-server|Apache License v2.0| |owt-sdk|Apache License v2.0| |owt-deps-webrtc|BSD 3-clause License| -|nodejs| MIT Open Source License| More license information can be found in [components source package](https://github.com/OpenVisualCloud/Dockerfiles-Resources). diff --git a/Xeon/ubuntu-18.04/service/owt/README.md b/Xeon/ubuntu-18.04/service/owt/README.md index 4a2efd7ba..4efcd3398 100644 --- a/Xeon/ubuntu-18.04/service/owt/README.md +++ b/Xeon/ubuntu-18.04/service/owt/README.md @@ -1,7 +1,7 @@ This docker image is part of Open Visual Cloud software stacks. Optimized for video conferencing service based on the WebRTC technology and Open WebRTC Toolkit (OWT). Optimized for video conferencing service based on the WebRTC technology and Open WebRTC Toolkit (OWT). Included conferencing modes: 1:N, N:N with video and audio processing nodes. The docker image can be used in the FROM field of a downstream Dockerfile. ## Supported tags and respective Dockerfile links - - [xeon-ubuntu-1804-service-owt](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/Xeon/ubuntu-18.04/service/owt/Dockerfile) + - [xeon-ubuntu-1804-service-owt](https://github.com/OpenVisualCloud/Dockerfiles/blob/v21.3/Xeon/ubuntu-18.04/service/owt/Dockerfile) ## Quick reference - #### Supported platform and OS @@ -25,18 +25,23 @@ This docker installs third party components licensed under various open source l | Components | License | | ----- | ----- | |Ubuntu| [Various](https://hub.docker.com/_/ubuntu) | -|libnice|GNU Lesser General Public License| -|openssl|Apache License 2.0| -|libre|BSD 3-clause License| -|usrsctp|BSD 3-clause "New" or "Revised" License| -|libsrtp2|BSD 3-clause License| -|FFmpeg|GNU Lesser General Public License v2.1 or later| -|nodejs| MIT Open Source License| +|OpenSSL|Apache License 2.0| |Intel SVT-HEVC|BSD-2-Clause Plus Patent License| +|libvpx|BSD 3-clause "New" or "Revised" License| +|x264|GNU General Public License v2.0 or later| +|OpenCV|BSD 3-clause "New" or "Revised" License| +|OpenVINO|Apache License v2.0| +|FFmpeg|GNU Lesser General Public License v2.1 or later| +|gstreamer|GNU Lesser General Public License v2.1 or later| +|gst plugins base|GNU Lesser General Public License v2.1 or later| +|gst plugins good|GNU Lesser General Public License v2.1 or later| +|gst plugins bad|GNU Lesser General Public License v2.1 or later| +|gst plugins ugly|GNU Lesser General Public License v2.1 or later| +|gst libav|GNU Library General Public License Version 2.1 or later| +|gst video analytics|MIT License| |owt-server|Apache License v2.0| |owt-sdk|Apache License v2.0| |owt-deps-webrtc|BSD 3-clause License| -|nodejs| MIT Open Source License| More license information can be found in [components source package](https://github.com/OpenVisualCloud/Dockerfiles-Resources). diff --git a/Xeon/ubuntu-18.04/service/owt360/README.md b/Xeon/ubuntu-18.04/service/owt360/README.md new file mode 100644 index 000000000..d3dda55af --- /dev/null +++ b/Xeon/ubuntu-18.04/service/owt360/README.md @@ -0,0 +1,42 @@ +This docker image is part of Open Visual Cloud software stacks. Optimized for video conferencing service based on the WebRTC technology and Open WebRTC Toolkit (OWT). Docker image optimized for ultra-high resolution immersive video low latency streaming, based on the WebRTC technology and the Open WebRTC Toolkit. Included SVT-HEVC tile-based 4K and 8K transcoding and field of view (FoV) adaptive streaming. The docker image can be used in the FROM field of a downstream Dockerfile. + +## Supported tags and respective Dockerfile links + - [xeon-ubuntu-1804-service-owt360](https://github.com/OpenVisualCloud/Dockerfiles/blob/v21.3/Xeon/ubuntu-18.04/service/owt360/Dockerfile) + +## Quick reference +- #### Supported platform and OS + Intel® Xeon® platform, Ubuntu 18.04 + +- #### Usage instructions: + [OWT360](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/doc/owt360.md) + + +- #### Getting started with Dockerfiles: + [OpenVisualCloud Dockerfiles Wiki](https://github.com/OpenVisualCloud/Dockerfiles/wiki) + +- #### File issues: + [OpenVisualCloud Dockerfiles Issues](https://github.com/OpenVisualCloud/Dockerfiles/issues) + + +## License +This docker installs third party components licensed under various open source licenses. The terms under which those components may be used and distributed can be found with the license document that is provided with those components. Please familiarize yourself with those terms to ensure your distribution of those components complies with the terms of those licenses. + + +| Components | License | +| ----- | ----- | +|Ubuntu| [Various](https://hub.docker.com/_/ubuntu) | +|OpenSSL|Apache License 2.0| +|Intel SVT-HEVC|BSD-2-Clause Plus Patent License| +|libvpx|BSD 3-clause "New" or "Revised" License| +|x264|GNU General Public License v2.0 or later| +|OpenCV|BSD 3-clause "New" or "Revised" License| +|OpenVINO|Apache License v2.0| +|FFmpeg|GNU Lesser General Public License v2.1 or later| +|360SCVP|BSD 3-clause "New" or "Revised" License| +|owt-server|Apache License v2.0| +|owt-sdk|Apache License v2.0| +|owt-deps-webrtc|BSD 3-clause License| + + +More license information can be found in [components source package](https://github.com/OpenVisualCloud/Dockerfiles-Resources). +As for any pre-built image usage, it is the image user's responsibility to ensure that any use of this image complies with any relevant licenses and potential fees for all software contained within. We will have no indemnity or warranty coverage from suppliers. diff --git a/Xeon/ubuntu-20.04/analytics/dev/README.md b/Xeon/ubuntu-20.04/analytics/dev/README.md new file mode 100644 index 000000000..22cdb0c77 --- /dev/null +++ b/Xeon/ubuntu-20.04/analytics/dev/README.md @@ -0,0 +1,56 @@ +This docker image is part of Open Visual Cloud software stacks. This is development image aim towards enabling C++ application compilation, debugging (with the debugging, profiling tools) and optimization (with the optimization tools.) You can compile C++ applications with this image and then copy the applications to the corresponding deployment image. Included what are in FFmpeg & GStreamer media analytics images. The docker image can be used in the FROM field of a downstream Dockerfile. + +## Supported tags and respective Dockerfile links + - [xeon-ubuntu-2004-analytics-dev](https://github.com/OpenVisualCloud/Dockerfiles/blob/v21.3/Xeon/ubuntu-20.04/analytics/dev/Dockerfile) + +## Quick reference +- #### Supported platform and OS + Intel® Xeon® platform, Ubuntu 20.04 + +- #### Usage instructions: + [FFmpeg](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/doc/ffmpeg.md) [GStreamer](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/doc/gst.md) + + +- #### Getting started with Dockerfiles: + [OpenVisualCloud Dockerfiles Wiki](https://github.com/OpenVisualCloud/Dockerfiles/wiki) + +- #### File issues: + [OpenVisualCloud Dockerfiles Issues](https://github.com/OpenVisualCloud/Dockerfiles/issues) + + +## License +This docker installs third party components licensed under various open source licenses. The terms under which those components may be used and distributed can be found with the license document that is provided with those components. Please familiarize yourself with those terms to ensure your distribution of those components complies with the terms of those licenses. + + +| Components | License | +| ----- | ----- | +|Ubuntu| [Various](https://hub.docker.com/_/ubuntu) | +|libogg|BSD 3-clause "New" or "Revised" License| +|libvorbis|BSD 3-clause "New" or "Revised" License| +|Opus Interactive Audio Codec|BSD 3-clause "New" or "Revised" License| +|libvpx|BSD 3-clause "New" or "Revised" License| +|Aomedia AV1 Codec Library|BSD 2-clause "Simplified" License| +|x264|GNU General Public License v2.0 or later| +|x265|GNU General Public License v2.0 or later| +|dav1d|BSD 2-clause "Simplified" License| +|json-c|MIT License| +|librdkafka|BSD 2-clause "Simplified" License| +|Intel SVT-HEVC|BSD-2-Clause Plus Patent License| +|Intel SVT-AV1|BSD-2-Clause Plus Patent License| +|Intel SVT-VP9|BSD-2-Clause Plus Patent License| +|OpenVINO|Apache License v2.0| +|gstreamer|GNU Lesser General Public License v2.1 or later| +|gst plugins base|GNU Lesser General Public License v2.1 or later| +|gst plugins good|GNU Lesser General Public License v2.1 or later| +|gst plugins bad|GNU Lesser General Public License v2.1 or later| +|gst plugins ugly|GNU Lesser General Public License v2.1 or later| +|gst libav|GNU Library General Public License Version 2.1 or later| +|gst svt|GNU Lesser General Public License v2.1 or later| +|OpenCV|BSD 3-clause "New" or "Revised" License| +|gst video analytics|MIT License| +|gst python|GNU Library General Public License Version 2.1| +|FFmpeg|GNU Lesser General Public License v2.1 or later| + + +More license information can be found in [components source package](https://github.com/OpenVisualCloud/Dockerfiles-Resources). +As for any pre-built image usage, it is the image user's responsibility to ensure that any use of this image complies with any relevant licenses and potential fees for all software contained within. We will have no indemnity or warranty coverage from suppliers. diff --git a/Xeon/ubuntu-20.04/analytics/ffmpeg/README.md b/Xeon/ubuntu-20.04/analytics/ffmpeg/README.md new file mode 100644 index 000000000..4b1776b77 --- /dev/null +++ b/Xeon/ubuntu-20.04/analytics/ffmpeg/README.md @@ -0,0 +1,46 @@ +This docker image is part of Open Visual Cloud software stacks. Optimized for Media Analytics. Included what are in media delivery FFmpeg image, inferencing engine and video analytics plugins. The docker image can be used in the FROM field of a downstream Dockerfile. + +## Supported tags and respective Dockerfile links + - [xeon-ubuntu-2004-analytics-ffmpeg](https://github.com/OpenVisualCloud/Dockerfiles/blob/v21.3/Xeon/ubuntu-20.04/analytics/ffmpeg/Dockerfile) + +## Quick reference +- #### Supported platform and OS + Intel® Xeon® platform, Ubuntu 20.04 + +- #### Usage instructions: + [FFmpeg](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/doc/ffmpeg.md) + + +- #### Getting started with Dockerfiles: + [OpenVisualCloud Dockerfiles Wiki](https://github.com/OpenVisualCloud/Dockerfiles/wiki) + +- #### File issues: + [OpenVisualCloud Dockerfiles Issues](https://github.com/OpenVisualCloud/Dockerfiles/issues) + + +## License +This docker installs third party components licensed under various open source licenses. The terms under which those components may be used and distributed can be found with the license document that is provided with those components. Please familiarize yourself with those terms to ensure your distribution of those components complies with the terms of those licenses. + + +| Components | License | +| ----- | ----- | +|Ubuntu| [Various](https://hub.docker.com/_/ubuntu) | +|libogg|BSD 3-clause "New" or "Revised" License| +|libvorbis|BSD 3-clause "New" or "Revised" License| +|Opus Interactive Audio Codec|BSD 3-clause "New" or "Revised" License| +|libvpx|BSD 3-clause "New" or "Revised" License| +|x264|GNU General Public License v2.0 or later| +|x265|GNU General Public License v2.0 or later| +|dav1d|BSD 2-clause "Simplified" License| +|Intel SVT-HEVC|BSD-2-Clause Plus Patent License| +|Intel SVT-AV1|BSD-2-Clause Plus Patent License| +|Intel SVT-VP9|BSD-2-Clause Plus Patent License| +|OpenCV|BSD 3-clause "New" or "Revised" License| +|OpenVINO|Apache License v2.0| +|json-c|MIT License| +|librdkafka|BSD 2-clause "Simplified" License| +|FFmpeg|GNU Lesser General Public License v2.1 or later| + + +More license information can be found in [components source package](https://github.com/OpenVisualCloud/Dockerfiles-Resources). +As for any pre-built image usage, it is the image user's responsibility to ensure that any use of this image complies with any relevant licenses and potential fees for all software contained within. We will have no indemnity or warranty coverage from suppliers. diff --git a/Xeon/ubuntu-20.04/analytics/gst/README.md b/Xeon/ubuntu-20.04/analytics/gst/README.md new file mode 100644 index 000000000..14fc250b1 --- /dev/null +++ b/Xeon/ubuntu-20.04/analytics/gst/README.md @@ -0,0 +1,55 @@ +This docker image is part of Open Visual Cloud software stacks. Optimized for Media Analytics. Included what are in media delivery GStreamer image, inferencing engine and video analytics plugins. The docker image can be used in the FROM field of a downstream Dockerfile. + +## Supported tags and respective Dockerfile links + - [xeon-ubuntu-2004-analytics-gst](https://github.com/OpenVisualCloud/Dockerfiles/blob/v21.3/Xeon/ubuntu-20.04/analytics/gst/Dockerfile) + +## Quick reference +- #### Supported platform and OS + Intel® Xeon® platform, Ubuntu 20.04 + +- #### Usage instructions: + [GStreamer](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/doc/gst.md) + + +- #### Getting started with Dockerfiles: + [OpenVisualCloud Dockerfiles Wiki](https://github.com/OpenVisualCloud/Dockerfiles/wiki) + +- #### File issues: + [OpenVisualCloud Dockerfiles Issues](https://github.com/OpenVisualCloud/Dockerfiles/issues) + + +## License +This docker installs third party components licensed under various open source licenses. The terms under which those components may be used and distributed can be found with the license document that is provided with those components. Please familiarize yourself with those terms to ensure your distribution of those components complies with the terms of those licenses. + + +| Components | License | +| ----- | ----- | +|Ubuntu| [Various](https://hub.docker.com/_/ubuntu) | +|libogg|BSD 3-clause "New" or "Revised" License| +|libvorbis|BSD 3-clause "New" or "Revised" License| +|Opus Interactive Audio Codec|BSD 3-clause "New" or "Revised" License| +|libvpx|BSD 3-clause "New" or "Revised" License| +|Aomedia AV1 Codec Library|BSD 2-clause "Simplified" License| +|x264|GNU General Public License v2.0 or later| +|x265|GNU General Public License v2.0 or later| +|dav1d|BSD 2-clause "Simplified" License| +|Intel SVT-HEVC|BSD-2-Clause Plus Patent License| +|Intel SVT-AV1|BSD-2-Clause Plus Patent License| +|Intel SVT-VP9|BSD-2-Clause Plus Patent License| +|OpenVINO|Apache License v2.0| +|json-c|MIT License| +|librdkafka|BSD 2-clause "Simplified" License| +|gstreamer|GNU Lesser General Public License v2.1 or later| +|gst plugins base|GNU Lesser General Public License v2.1 or later| +|gst plugins good|GNU Lesser General Public License v2.1 or later| +|gst plugins bad|GNU Lesser General Public License v2.1 or later| +|gst plugins ugly|GNU Lesser General Public License v2.1 or later| +|gst libav|GNU Library General Public License Version 2.1 or later| +|gst svt|GNU Lesser General Public License v2.1 or later| +|OpenCV|BSD 3-clause "New" or "Revised" License| +|gst video analytics|MIT License| +|gst python|GNU Library General Public License Version 2.1| + + +More license information can be found in [components source package](https://github.com/OpenVisualCloud/Dockerfiles-Resources). +As for any pre-built image usage, it is the image user's responsibility to ensure that any use of this image complies with any relevant licenses and potential fees for all software contained within. We will have no indemnity or warranty coverage from suppliers. diff --git a/Xeon/ubuntu-20.04/graphics/dev/README.md b/Xeon/ubuntu-20.04/graphics/dev/README.md index 4c8cdad32..cc67bdec4 100644 --- a/Xeon/ubuntu-20.04/graphics/dev/README.md +++ b/Xeon/ubuntu-20.04/graphics/dev/README.md @@ -1,7 +1,7 @@ This docker image is part of Open Visual Cloud software stacks. This is development image aim towards enabling C++ application compilation, debugging (with the debugging, profiling tools) and optimization (with the optimization tools.) You can compile C++ applications with this image and then copy the applications to the corresponding deployment image. This image is for Intel OSPRay C++ application development. The docker image can be used in the FROM field of a downstream Dockerfile. ## Supported tags and respective Dockerfile links - - [xeon-ubuntu-2004-graphics-dev](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/Xeon/ubuntu-20.04/graphics/dev/Dockerfile) + - [xeon-ubuntu-2004-graphics-dev](https://github.com/OpenVisualCloud/Dockerfiles/blob/v21.3/Xeon/ubuntu-20.04/graphics/dev/Dockerfile) ## Quick reference - #### Supported platform and OS @@ -27,7 +27,7 @@ This docker installs third party components licensed under various open source l |Ubuntu| [Various](https://hub.docker.com/_/ubuntu) | |ispc|BSD 3-clause License| |embree|Apache License 2.0| -|oiio|BSD 3-clause License|,|openexr|BSD 3-clause "New" or "Revised" License| +|OpenImageIO|BSD 3-clause License|,|openexr|BSD 3-clause "New" or "Revised" License| |ospray|Apache License v2.0| |ospray|Apache License v2.0| diff --git a/Xeon/ubuntu-20.04/graphics/ospray-mpi/README.md b/Xeon/ubuntu-20.04/graphics/ospray-mpi/README.md index 1f43a14fb..7c12f2d10 100644 --- a/Xeon/ubuntu-20.04/graphics/ospray-mpi/README.md +++ b/Xeon/ubuntu-20.04/graphics/ospray-mpi/README.md @@ -1,7 +1,7 @@ This docker image is part of Open Visual Cloud software stacks. Docker images optimized for Intel OSPRay and multi-host connections. Included the Intel OSPRay ray tracing engine with multi-host connections via MPI. The docker image can be used in the FROM field of a downstream Dockerfile. ## Supported tags and respective Dockerfile links - - [xeon-ubuntu-2004-graphics-ospray-mpi](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/Xeon/ubuntu-20.04/graphics/ospray-mpi/Dockerfile) + - [xeon-ubuntu-2004-graphics-ospray-mpi](https://github.com/OpenVisualCloud/Dockerfiles/blob/v21.3/Xeon/ubuntu-20.04/graphics/ospray-mpi/Dockerfile) ## Quick reference - #### Supported platform and OS @@ -27,7 +27,7 @@ This docker installs third party components licensed under various open source l |Ubuntu| [Various](https://hub.docker.com/_/ubuntu) | |ispc|BSD 3-clause License| |embree|Apache License 2.0| -|oiio|BSD 3-clause License|,|openexr|BSD 3-clause "New" or "Revised" License| +|OpenImageIO|BSD 3-clause License|,|openexr|BSD 3-clause "New" or "Revised" License| |ospray|Apache License v2.0| diff --git a/Xeon/ubuntu-20.04/graphics/ospray/README.md b/Xeon/ubuntu-20.04/graphics/ospray/README.md index 3544311ba..6a72af93a 100644 --- a/Xeon/ubuntu-20.04/graphics/ospray/README.md +++ b/Xeon/ubuntu-20.04/graphics/ospray/README.md @@ -1,7 +1,7 @@ This docker image is part of Open Visual Cloud software stacks. Docker images optimized for Intel OSPRay. Included the Intel OSPRay ray tracing engine and examples. The docker image can be used in the FROM field of a downstream Dockerfile. ## Supported tags and respective Dockerfile links - - [xeon-ubuntu-2004-graphics-ospray](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/Xeon/ubuntu-20.04/graphics/ospray/Dockerfile) + - [xeon-ubuntu-2004-graphics-ospray](https://github.com/OpenVisualCloud/Dockerfiles/blob/v21.3/Xeon/ubuntu-20.04/graphics/ospray/Dockerfile) ## Quick reference - #### Supported platform and OS diff --git a/Xeon/ubuntu-20.04/media/dev/README.md b/Xeon/ubuntu-20.04/media/dev/README.md new file mode 100644 index 000000000..3893337a7 --- /dev/null +++ b/Xeon/ubuntu-20.04/media/dev/README.md @@ -0,0 +1,50 @@ +This docker image is part of Open Visual Cloud software stacks. This is development image aim towards enabling C++ application compilation, debugging (with the debugging, profiling tools) and optimization (with the optimization tools.) You can compile C++ applications with this image and then copy the applications to the corresponding deployment image. Included what are in FFmpeg or GStreamer media creation and delivery images . The docker image can be used in the FROM field of a downstream Dockerfile. + +## Supported tags and respective Dockerfile links + - [xeon-ubuntu-2004-media-dev](https://github.com/OpenVisualCloud/Dockerfiles/blob/v21.3/Xeon/ubuntu-20.04/media/dev/Dockerfile) + +## Quick reference +- #### Supported platform and OS + Intel® Xeon® platform, Ubuntu 20.04 + +- #### Usage instructions: + [FFmpeg](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/doc/ffmpeg.md) [GStreamer](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/doc/gst.md) + + +- #### Getting started with Dockerfiles: + [OpenVisualCloud Dockerfiles Wiki](https://github.com/OpenVisualCloud/Dockerfiles/wiki) + +- #### File issues: + [OpenVisualCloud Dockerfiles Issues](https://github.com/OpenVisualCloud/Dockerfiles/issues) + + +## License +This docker installs third party components licensed under various open source licenses. The terms under which those components may be used and distributed can be found with the license document that is provided with those components. Please familiarize yourself with those terms to ensure your distribution of those components complies with the terms of those licenses. + + +| Components | License | +| ----- | ----- | +|Ubuntu| [Various](https://hub.docker.com/_/ubuntu) | +|libogg|BSD 3-clause "New" or "Revised" License| +|libvorbis|BSD 3-clause "New" or "Revised" License| +|Opus Interactive Audio Codec|BSD 3-clause "New" or "Revised" License| +|libvpx|BSD 3-clause "New" or "Revised" License| +|Aomedia AV1 Codec Library|BSD 2-clause "Simplified" License| +|x264|GNU General Public License v2.0 or later| +|x265|GNU General Public License v2.0 or later| +|dav1d|BSD 2-clause "Simplified" License| +|Intel SVT-HEVC|BSD-2-Clause Plus Patent License| +|Intel SVT-AV1|BSD-2-Clause Plus Patent License| +|Intel SVT-VP9|BSD-2-Clause Plus Patent License| +|gstreamer|GNU Lesser General Public License v2.1 or later| +|gst plugins base|GNU Lesser General Public License v2.1 or later| +|gst plugins good|GNU Lesser General Public License v2.1 or later| +|gst plugins bad|GNU Lesser General Public License v2.1 or later| +|gst plugins ugly|GNU Lesser General Public License v2.1 or later| +|gst libav|GNU Library General Public License Version 2.1 or later| +|gst svt|GNU Lesser General Public License v2.1 or later| +|FFmpeg|GNU Lesser General Public License v2.1 or later| + + +More license information can be found in [components source package](https://github.com/OpenVisualCloud/Dockerfiles-Resources). +As for any pre-built image usage, it is the image user's responsibility to ensure that any use of this image complies with any relevant licenses and potential fees for all software contained within. We will have no indemnity or warranty coverage from suppliers. diff --git a/Xeon/ubuntu-20.04/media/ffmpeg/README.md b/Xeon/ubuntu-20.04/media/ffmpeg/README.md new file mode 100644 index 000000000..0866d4ca6 --- /dev/null +++ b/Xeon/ubuntu-20.04/media/ffmpeg/README.md @@ -0,0 +1,43 @@ +This docker image is part of Open Visual Cloud software stacks. Optimized for the media creation and delivery use case. Included FFmpeg and codecs such as aac, opus, ogg, vorbis, x264, x265, vp8/9, av1 and SVT-HEVC. The docker image can be used in the FROM field of a downstream Dockerfile. + +## Supported tags and respective Dockerfile links + - [xeon-ubuntu-2004-media-ffmpeg](https://github.com/OpenVisualCloud/Dockerfiles/blob/v21.3/Xeon/ubuntu-20.04/media/ffmpeg/Dockerfile) + +## Quick reference +- #### Supported platform and OS + Intel® Xeon® platform, Ubuntu 20.04 + +- #### Usage instructions: + [FFmpeg](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/doc/ffmpeg.md) + + +- #### Getting started with Dockerfiles: + [OpenVisualCloud Dockerfiles Wiki](https://github.com/OpenVisualCloud/Dockerfiles/wiki) + +- #### File issues: + [OpenVisualCloud Dockerfiles Issues](https://github.com/OpenVisualCloud/Dockerfiles/issues) + + +## License +This docker installs third party components licensed under various open source licenses. The terms under which those components may be used and distributed can be found with the license document that is provided with those components. Please familiarize yourself with those terms to ensure your distribution of those components complies with the terms of those licenses. + + +| Components | License | +| ----- | ----- | +|Ubuntu| [Various](https://hub.docker.com/_/ubuntu) | +|libogg|BSD 3-clause "New" or "Revised" License| +|libvorbis|BSD 3-clause "New" or "Revised" License| +|Opus Interactive Audio Codec|BSD 3-clause "New" or "Revised" License| +|libvpx|BSD 3-clause "New" or "Revised" License| +|x264|GNU General Public License v2.0 or later| +|x265|GNU General Public License v2.0 or later| +|dav1d|BSD 2-clause "Simplified" License| +|Intel SVT-HEVC|BSD-2-Clause Plus Patent License| +|Intel SVT-AV1|BSD-2-Clause Plus Patent License| +|Intel SVT-VP9|BSD-2-Clause Plus Patent License| +|OpenCV|BSD 3-clause "New" or "Revised" License| +|FFmpeg|GNU Lesser General Public License v2.1 or later| + + +More license information can be found in [components source package](https://github.com/OpenVisualCloud/Dockerfiles-Resources). +As for any pre-built image usage, it is the image user's responsibility to ensure that any use of this image complies with any relevant licenses and potential fees for all software contained within. We will have no indemnity or warranty coverage from suppliers. diff --git a/Xeon/ubuntu-20.04/media/gst/README.md b/Xeon/ubuntu-20.04/media/gst/README.md new file mode 100644 index 000000000..1bbec836e --- /dev/null +++ b/Xeon/ubuntu-20.04/media/gst/README.md @@ -0,0 +1,49 @@ +This docker image is part of Open Visual Cloud software stacks. Optimized for the media creation and delivery use case. Included gstreamer and audio and video plugins that can be connected to process audio and video content, such as creating, converting, transcoding. The docker image can be used in the FROM field of a downstream Dockerfile. + +## Supported tags and respective Dockerfile links + - [xeon-ubuntu-2004-media-gst](https://github.com/OpenVisualCloud/Dockerfiles/blob/v21.3/Xeon/ubuntu-20.04/media/gst/Dockerfile) + +## Quick reference +- #### Supported platform and OS + Intel® Xeon® platform, Ubuntu 20.04 + +- #### Usage instructions: + [GStreamer](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/doc/gst.md) + + +- #### Getting started with Dockerfiles: + [OpenVisualCloud Dockerfiles Wiki](https://github.com/OpenVisualCloud/Dockerfiles/wiki) + +- #### File issues: + [OpenVisualCloud Dockerfiles Issues](https://github.com/OpenVisualCloud/Dockerfiles/issues) + + +## License +This docker installs third party components licensed under various open source licenses. The terms under which those components may be used and distributed can be found with the license document that is provided with those components. Please familiarize yourself with those terms to ensure your distribution of those components complies with the terms of those licenses. + + +| Components | License | +| ----- | ----- | +|Ubuntu| [Various](https://hub.docker.com/_/ubuntu) | +|libogg|BSD 3-clause "New" or "Revised" License| +|libvorbis|BSD 3-clause "New" or "Revised" License| +|Opus Interactive Audio Codec|BSD 3-clause "New" or "Revised" License| +|libvpx|BSD 3-clause "New" or "Revised" License| +|Aomedia AV1 Codec Library|BSD 2-clause "Simplified" License| +|x264|GNU General Public License v2.0 or later| +|x265|GNU General Public License v2.0 or later| +|dav1d|BSD 2-clause "Simplified" License| +|Intel SVT-HEVC|BSD-2-Clause Plus Patent License| +|Intel SVT-AV1|BSD-2-Clause Plus Patent License| +|Intel SVT-VP9|BSD-2-Clause Plus Patent License| +|gstreamer|GNU Lesser General Public License v2.1 or later| +|gst plugins base|GNU Lesser General Public License v2.1 or later| +|gst plugins good|GNU Lesser General Public License v2.1 or later| +|gst plugins bad|GNU Lesser General Public License v2.1 or later| +|gst plugins ugly|GNU Lesser General Public License v2.1 or later| +|gst libav|GNU Library General Public License Version 2.1 or later| +|gst svt|GNU Lesser General Public License v2.1 or later| + + +More license information can be found in [components source package](https://github.com/OpenVisualCloud/Dockerfiles-Resources). +As for any pre-built image usage, it is the image user's responsibility to ensure that any use of this image complies with any relevant licenses and potential fees for all software contained within. We will have no indemnity or warranty coverage from suppliers. diff --git a/Xeon/ubuntu-20.04/media/nginx/README.md b/Xeon/ubuntu-20.04/media/nginx/README.md new file mode 100644 index 000000000..aaf7c8971 --- /dev/null +++ b/Xeon/ubuntu-20.04/media/nginx/README.md @@ -0,0 +1,46 @@ +This docker image is part of Open Visual Cloud software stacks. Optimized for the media creation and delivery use case. Optimized for NGINX web server that can be used for serving web content, load balancing, HTTP caching, or a reverse proxy. The docker image can be used in the FROM field of a downstream Dockerfile. + +## Supported tags and respective Dockerfile links + - [xeon-ubuntu-2004-media-nginx](https://github.com/OpenVisualCloud/Dockerfiles/blob/v21.3/Xeon/ubuntu-20.04/media/nginx/Dockerfile) + +## Quick reference +- #### Supported platform and OS + Intel® Xeon® platform, Ubuntu 20.04 + +- #### Usage instructions: + [NGINX](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/doc/nginx.md) + + +- #### Getting started with Dockerfiles: + [OpenVisualCloud Dockerfiles Wiki](https://github.com/OpenVisualCloud/Dockerfiles/wiki) + +- #### File issues: + [OpenVisualCloud Dockerfiles Issues](https://github.com/OpenVisualCloud/Dockerfiles/issues) + + +## License +This docker installs third party components licensed under various open source licenses. The terms under which those components may be used and distributed can be found with the license document that is provided with those components. Please familiarize yourself with those terms to ensure your distribution of those components complies with the terms of those licenses. + + +| Components | License | +| ----- | ----- | +|Ubuntu| [Various](https://hub.docker.com/_/ubuntu) | +|nginx http flv|BSD 2-clause "Simplified" License| +|nginx upload module|BSD 3-clause "Simplified" License| +|nginx|BSD 2-clause "Simplified" License| +|libogg|BSD 3-clause "New" or "Revised" License| +|libvorbis|BSD 3-clause "New" or "Revised" License| +|Opus Interactive Audio Codec|BSD 3-clause "New" or "Revised" License| +|libvpx|BSD 3-clause "New" or "Revised" License| +|x264|GNU General Public License v2.0 or later| +|x265|GNU General Public License v2.0 or later| +|dav1d|BSD 2-clause "Simplified" License| +|Intel SVT-HEVC|BSD-2-Clause Plus Patent License| +|Intel SVT-AV1|BSD-2-Clause Plus Patent License| +|Intel SVT-VP9|BSD-2-Clause Plus Patent License| +|OpenCV|BSD 3-clause "New" or "Revised" License| +|FFmpeg|GNU Lesser General Public License v2.1 or later| + + +More license information can be found in [components source package](https://github.com/OpenVisualCloud/Dockerfiles-Resources). +As for any pre-built image usage, it is the image user's responsibility to ensure that any use of this image complies with any relevant licenses and potential fees for all software contained within. We will have no indemnity or warranty coverage from suppliers. diff --git a/Xeon/ubuntu-20.04/media/srs/README.md b/Xeon/ubuntu-20.04/media/srs/README.md new file mode 100644 index 000000000..86b1f5dc7 --- /dev/null +++ b/Xeon/ubuntu-20.04/media/srs/README.md @@ -0,0 +1,44 @@ +This docker image is part of Open Visual Cloud software stacks. Optimized for the media creation and delivery use case. Image with SRS high efficiency, stable and simple RTMP/HLS/FLV streaming cluster. The docker image can be used in the FROM field of a downstream Dockerfile. + +## Supported tags and respective Dockerfile links + - [xeon-ubuntu-2004-media-srs](https://github.com/OpenVisualCloud/Dockerfiles/blob/v21.3/Xeon/ubuntu-20.04/media/srs/Dockerfile) + +## Quick reference +- #### Supported platform and OS + Intel® Xeon® platform, Ubuntu 20.04 + + + + +- #### Getting started with Dockerfiles: + [OpenVisualCloud Dockerfiles Wiki](https://github.com/OpenVisualCloud/Dockerfiles/wiki) + +- #### File issues: + [OpenVisualCloud Dockerfiles Issues](https://github.com/OpenVisualCloud/Dockerfiles/issues) + + +## License +This docker installs third party components licensed under various open source licenses. The terms under which those components may be used and distributed can be found with the license document that is provided with those components. Please familiarize yourself with those terms to ensure your distribution of those components complies with the terms of those licenses. + + +| Components | License | +| ----- | ----- | +|Ubuntu| [Various](https://hub.docker.com/_/ubuntu) | +|OpenSSL|Apache License 2.0| +|Simple Realtime Server|MIT License| +|libogg|BSD 3-clause "New" or "Revised" License| +|libvorbis|BSD 3-clause "New" or "Revised" License| +|Opus Interactive Audio Codec|BSD 3-clause "New" or "Revised" License| +|libvpx|BSD 3-clause "New" or "Revised" License| +|x264|GNU General Public License v2.0 or later| +|x265|GNU General Public License v2.0 or later| +|dav1d|BSD 2-clause "Simplified" License| +|Intel SVT-HEVC|BSD-2-Clause Plus Patent License| +|Intel SVT-AV1|BSD-2-Clause Plus Patent License| +|Intel SVT-VP9|BSD-2-Clause Plus Patent License| +|OpenCV|BSD 3-clause "New" or "Revised" License| +|FFmpeg|GNU Lesser General Public License v2.1 or later| + + +More license information can be found in [components source package](https://github.com/OpenVisualCloud/Dockerfiles-Resources). +As for any pre-built image usage, it is the image user's responsibility to ensure that any use of this image complies with any relevant licenses and potential fees for all software contained within. We will have no indemnity or warranty coverage from suppliers. diff --git a/Xeon/ubuntu-20.04/media/svt/README.md b/Xeon/ubuntu-20.04/media/svt/README.md new file mode 100644 index 000000000..6a278ef87 --- /dev/null +++ b/Xeon/ubuntu-20.04/media/svt/README.md @@ -0,0 +1,44 @@ +This docker image is part of Open Visual Cloud software stacks. Optimized for the media creation and delivery use case. Image with SVT (Scalable Video Technology) Encoder and decoders. Ready to use SVT apps to try AV1, HEVC, VP9 transcoders. The docker image can be used in the FROM field of a downstream Dockerfile. + +## Supported tags and respective Dockerfile links + - [xeon-ubuntu-2004-media-svt](https://github.com/OpenVisualCloud/Dockerfiles/blob/v21.3/Xeon/ubuntu-20.04/media/svt/Dockerfile) + +## Quick reference +- #### Supported platform and OS + Intel® Xeon® platform, Ubuntu 20.04 + +- #### Usage instructions: + [SVT](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/doc/svt.md) + + +- #### Getting started with Dockerfiles: + [OpenVisualCloud Dockerfiles Wiki](https://github.com/OpenVisualCloud/Dockerfiles/wiki) + +- #### File issues: + [OpenVisualCloud Dockerfiles Issues](https://github.com/OpenVisualCloud/Dockerfiles/issues) + + +## License +This docker installs third party components licensed under various open source licenses. The terms under which those components may be used and distributed can be found with the license document that is provided with those components. Please familiarize yourself with those terms to ensure your distribution of those components complies with the terms of those licenses. + + +| Components | License | +| ----- | ----- | +|Ubuntu| [Various](https://hub.docker.com/_/ubuntu) | +|Aomedia AV1 Codec Library|BSD 2-clause "Simplified" License| +|libogg|BSD 3-clause "New" or "Revised" License| +|libvorbis|BSD 3-clause "New" or "Revised" License| +|Opus Interactive Audio Codec|BSD 3-clause "New" or "Revised" License| +|libvpx|BSD 3-clause "New" or "Revised" License| +|x264|GNU General Public License v2.0 or later| +|x265|GNU General Public License v2.0 or later| +|dav1d|BSD 2-clause "Simplified" License| +|Intel SVT-HEVC|BSD-2-Clause Plus Patent License| +|Intel SVT-AV1|BSD-2-Clause Plus Patent License| +|Intel SVT-VP9|BSD-2-Clause Plus Patent License| +|OpenCV|BSD 3-clause "New" or "Revised" License| +|FFmpeg|GNU Lesser General Public License v2.1 or later| + + +More license information can be found in [components source package](https://github.com/OpenVisualCloud/Dockerfiles-Resources). +As for any pre-built image usage, it is the image user's responsibility to ensure that any use of this image complies with any relevant licenses and potential fees for all software contained within. We will have no indemnity or warranty coverage from suppliers. diff --git a/XeonE3/centos-7/analytics/dev/README.md b/XeonE3/centos-7/analytics/dev/README.md index baac2bc23..faaeb8047 100644 --- a/XeonE3/centos-7/analytics/dev/README.md +++ b/XeonE3/centos-7/analytics/dev/README.md @@ -1,7 +1,7 @@ This docker image is part of Open Visual Cloud software stacks. This is development image aim towards enabling C++ application compilation, debugging (with the debugging, profiling tools) and optimization (with the optimization tools.) You can compile C++ applications with this image and then copy the applications to the corresponding deployment image. Included what are in FFmpeg & GStreamer media analytics images. Also included Intel hardware accelaration software stack such as media SDK, media driver, gmmlib and libva. The docker image can be used in the FROM field of a downstream Dockerfile. ## Supported tags and respective Dockerfile links - - [xeone3-centos-7-analytics-dev](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/XeonE3/centos-7/analytics/dev/Dockerfile) + - [xeone3-centos-7-analytics-dev](https://github.com/OpenVisualCloud/Dockerfiles/blob/v21.3/XeonE3/centos-7/analytics/dev/Dockerfile) ## Quick reference - #### Supported platform and OS @@ -37,25 +37,23 @@ This docker installs third party components licensed under various open source l |Intel SVT-AV1|BSD-2-Clause Plus Patent License| |Intel SVT-VP9|BSD-2-Clause Plus Patent License| |Intel Graphics Memory Management Library| MIT License| -|libdrm|MIT license| |Intel libva| MIT License -|Intel media-driver | MIT License| +|Intel opencl | MIT License| +|Intel media driver | MIT License| |Intel media SDK|MIT License| -|intel-opencl | MIT License| -|json-c|MIT License| +|OpenVINO|Apache License v2.0| |librdkafka|BSD 2-clause "Simplified" License| |gstreamer|GNU Lesser General Public License v2.1 or later| -|gst orc|GNU Lesser General Public License v2.1 or later| -|gst plugin base|GNU Lesser General Public License v2.1 or later| -|gst plugin good|GNU Lesser General Public License v2.1 or later| -|gst plugin bad|GNU Lesser General Public License v2.1 or later| -|gst plugin ugly|GNU Lesser General Public License v2.1 or later| -|gst plugin libav|GNU Library General Public License Version 2| -|gst plugin svt|GNU Lesser General Public License v2.1 or later| -|gst plugin vaapi|GNU Lesser General Public License v2.1 or later| -|opencv|BSD 3-clause "New" or "Revised" License| -|DLDT|Apache License v2.0| -|gst plugin gva|MIT License| +|gst plugins base|GNU Lesser General Public License v2.1 or later| +|gst plugins good|GNU Lesser General Public License v2.1 or later| +|gst plugins bad|GNU Lesser General Public License v2.1 or later| +|gst plugins ugly|GNU Lesser General Public License v2.1 or later| +|gst libav|GNU Library General Public License Version 2.1 or later| +|gst vaapi|GNU Lesser General Public License v2.1 or later| +|gst svt|GNU Lesser General Public License v2.1 or later| +|OpenCV|BSD 3-clause "New" or "Revised" License| +|gst video analytics|MIT License| +|gst python|GNU Library General Public License Version 2.1| |FFmpeg|GNU Lesser General Public License v2.1 or later| diff --git a/XeonE3/centos-7/analytics/ffmpeg/README.md b/XeonE3/centos-7/analytics/ffmpeg/README.md index 4af11331b..96011aa4d 100644 --- a/XeonE3/centos-7/analytics/ffmpeg/README.md +++ b/XeonE3/centos-7/analytics/ffmpeg/README.md @@ -1,7 +1,7 @@ This docker image is part of Open Visual Cloud software stacks. Optimized for Media Analytics. Included what are in media delivery FFmpeg image, inferencing engine and video analytics plugins. Also included Intel hardware accelaration software stack such as media SDK, media driver, opencl, gmmlib and libva. The docker image can be used in the FROM field of a downstream Dockerfile. ## Supported tags and respective Dockerfile links - - [xeone3-centos-7-analytics-ffmpeg](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/XeonE3/centos-7/analytics/ffmpeg/Dockerfile) + - [xeone3-centos-7-analytics-ffmpeg](https://github.com/OpenVisualCloud/Dockerfiles/blob/v21.3/XeonE3/centos-7/analytics/ffmpeg/Dockerfile) ## Quick reference - #### Supported platform and OS @@ -36,15 +36,14 @@ This docker installs third party components licensed under various open source l |Intel SVT-AV1|BSD-2-Clause Plus Patent License| |Intel SVT-VP9|BSD-2-Clause Plus Patent License| |Intel Graphics Memory Management Library| MIT License| -|libdrm|MIT license| |Intel libva| MIT License -|Intel media-driver | MIT License| +|Intel opencl | MIT License| +|Intel media driver | MIT License| |Intel media SDK|MIT License| -|intel-opencl | MIT License| +|OpenCV|BSD 3-clause "New" or "Revised" License| +|OpenVINO|Apache License v2.0| |json-c|MIT License| |librdkafka|BSD 2-clause "Simplified" License| -|opencv|BSD 3-clause "New" or "Revised" License| -|DLDT|Apache License v2.0| |FFmpeg|GNU Lesser General Public License v2.1 or later| diff --git a/XeonE3/centos-7/analytics/gst/README.md b/XeonE3/centos-7/analytics/gst/README.md index 5dd71d78a..bdefe9dac 100644 --- a/XeonE3/centos-7/analytics/gst/README.md +++ b/XeonE3/centos-7/analytics/gst/README.md @@ -1,7 +1,7 @@ This docker image is part of Open Visual Cloud software stacks. Optimized for Media Analytics. Included what are in media delivery GStreamer image, inferencing engine and video analytics plugins. Also included Intel hardware accelaration software stack such as media SDK, media driver, opencl, gmmlib and libva. The docker image can be used in the FROM field of a downstream Dockerfile. ## Supported tags and respective Dockerfile links - - [xeone3-centos-7-analytics-gst](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/XeonE3/centos-7/analytics/gst/Dockerfile) + - [xeone3-centos-7-analytics-gst](https://github.com/OpenVisualCloud/Dockerfiles/blob/v21.3/XeonE3/centos-7/analytics/gst/Dockerfile) ## Quick reference - #### Supported platform and OS @@ -36,24 +36,23 @@ This docker installs third party components licensed under various open source l |Intel SVT-HEVC|BSD-2-Clause Plus Patent License| |Intel SVT-AV1|BSD-2-Clause Plus Patent License| |Intel SVT-VP9|BSD-2-Clause Plus Patent License| -|libdrm|MIT license| -|Intel libva| MIT License |Intel Graphics Memory Management Library| MIT License| -|Intel media-driver | MIT License| -|Intel media SDK|MIT License| -|intel-opencl | MIT License| +|Intel libva| MIT License +|Intel opencl | MIT License| +|Intel media driver | MIT License| +|OpenVINO|Apache License v2.0| +|librdkafka|BSD 2-clause "Simplified" License| |gstreamer|GNU Lesser General Public License v2.1 or later| -|gst orc|GNU Lesser General Public License v2.1 or later| -|gst plugin base|GNU Lesser General Public License v2.1 or later| -|gst plugin good|GNU Lesser General Public License v2.1 or later| -|gst plugin bad|GNU Lesser General Public License v2.1 or later| -|gst plugin ugly|GNU Lesser General Public License v2.1 or later| -|gst plugin libav|GNU Library General Public License Version 2| -|gst plugin svt|GNU Lesser General Public License v2.1 or later| -|gst plugin vaapi|GNU Lesser General Public License v2.1 or later| -|opencv|BSD 3-clause "New" or "Revised" License| -|DLDT|Apache License v2.0| -|gst plugin gva|MIT License| +|gst plugins base|GNU Lesser General Public License v2.1 or later| +|gst plugins good|GNU Lesser General Public License v2.1 or later| +|gst plugins bad|GNU Lesser General Public License v2.1 or later| +|gst plugins ugly|GNU Lesser General Public License v2.1 or later| +|gst libav|GNU Library General Public License Version 2.1 or later| +|gst vaapi|GNU Lesser General Public License v2.1 or later| +|gst svt|GNU Lesser General Public License v2.1 or later| +|OpenCV|BSD 3-clause "New" or "Revised" License| +|gst video analytics|MIT License| +|gst python|GNU Library General Public License Version 2.1| More license information can be found in [components source package](https://github.com/OpenVisualCloud/Dockerfiles-Resources). diff --git a/XeonE3/centos-7/media/dev/README.md b/XeonE3/centos-7/media/dev/README.md index 5182888c3..d00ac2278 100644 --- a/XeonE3/centos-7/media/dev/README.md +++ b/XeonE3/centos-7/media/dev/README.md @@ -1,7 +1,7 @@ This docker image is part of Open Visual Cloud software stacks. This is development image aim towards enabling C++ application compilation, debugging (with the debugging, profiling tools) and optimization (with the optimization tools.) You can compile C++ applications with this image and then copy the applications to the corresponding deployment image. Included what are in FFmpeg or GStreamer media creation and delivery images . Also included Intel hardware accelaration software stack such as media SDK, media driver, gmmlib and libva. The docker image can be used in the FROM field of a downstream Dockerfile. ## Supported tags and respective Dockerfile links - - [xeone3-centos-7-media-dev](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/XeonE3/centos-7/media/dev/Dockerfile) + - [xeone3-centos-7-media-dev](https://github.com/OpenVisualCloud/Dockerfiles/blob/v21.3/XeonE3/centos-7/media/dev/Dockerfile) ## Quick reference - #### Supported platform and OS @@ -37,19 +37,17 @@ This docker installs third party components licensed under various open source l |Intel SVT-AV1|BSD-2-Clause Plus Patent License| |Intel SVT-VP9|BSD-2-Clause Plus Patent License| |Intel Graphics Memory Management Library| MIT License| -|libdrm|MIT license| |Intel libva| MIT License -|Intel media-driver | MIT License| +|Intel media driver | MIT License| |Intel media SDK|MIT License| |gstreamer|GNU Lesser General Public License v2.1 or later| -|gst orc|GNU Lesser General Public License v2.1 or later| -|gst plugin base|GNU Lesser General Public License v2.1 or later| -|gst plugin good|GNU Lesser General Public License v2.1 or later| -|gst plugin bad|GNU Lesser General Public License v2.1 or later| -|gst plugin ugly|GNU Lesser General Public License v2.1 or later| -|gst plugin libav|GNU Library General Public License Version 2| -|gst plugin svt|GNU Lesser General Public License v2.1 or later| -|gst plugin vaapi|GNU Lesser General Public License v2.1 or later| +|gst plugins base|GNU Lesser General Public License v2.1 or later| +|gst plugins good|GNU Lesser General Public License v2.1 or later| +|gst plugins bad|GNU Lesser General Public License v2.1 or later| +|gst plugins ugly|GNU Lesser General Public License v2.1 or later| +|gst libav|GNU Library General Public License Version 2.1 or later| +|gst svt|GNU Lesser General Public License v2.1 or later| +|gst vaapi|GNU Lesser General Public License v2.1 or later| |FFmpeg|GNU Lesser General Public License v2.1 or later| diff --git a/XeonE3/centos-7/media/ffmpeg/README.md b/XeonE3/centos-7/media/ffmpeg/README.md index 717a11777..135aecbe6 100644 --- a/XeonE3/centos-7/media/ffmpeg/README.md +++ b/XeonE3/centos-7/media/ffmpeg/README.md @@ -1,7 +1,7 @@ This docker image is part of Open Visual Cloud software stacks. Optimized for the media creation and delivery use case. Included FFmpeg and codecs such as aac, opus, ogg, vorbis, x264, x265, vp8/9, av1 and SVT-HEVC. Also included Intel hardware accelaration software stack such as media SDK, media driver, gmmlib and libva. The docker image can be used in the FROM field of a downstream Dockerfile. ## Supported tags and respective Dockerfile links - - [xeone3-centos-7-media-ffmpeg](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/XeonE3/centos-7/media/ffmpeg/Dockerfile) + - [xeone3-centos-7-media-ffmpeg](https://github.com/OpenVisualCloud/Dockerfiles/blob/v21.3/XeonE3/centos-7/media/ffmpeg/Dockerfile) ## Quick reference - #### Supported platform and OS @@ -36,10 +36,10 @@ This docker installs third party components licensed under various open source l |Intel SVT-AV1|BSD-2-Clause Plus Patent License| |Intel SVT-VP9|BSD-2-Clause Plus Patent License| |Intel Graphics Memory Management Library| MIT License| -|libdrm|MIT license| |Intel libva| MIT License -|Intel media-driver | MIT License| +|Intel media driver | MIT License| |Intel media SDK|MIT License| +|OpenCV|BSD 3-clause "New" or "Revised" License| |FFmpeg|GNU Lesser General Public License v2.1 or later| diff --git a/XeonE3/centos-7/media/gst/README.md b/XeonE3/centos-7/media/gst/README.md index 69f529cba..e92199dcc 100644 --- a/XeonE3/centos-7/media/gst/README.md +++ b/XeonE3/centos-7/media/gst/README.md @@ -1,7 +1,7 @@ This docker image is part of Open Visual Cloud software stacks. Optimized for the media creation and delivery use case. Included gstreamer and audio and video plugins that can be connected to process audio and video content, such as creating, converting, transcoding. Also included Intel hardware accelaration software stack such as media SDK, media driver, gmmlib and libva. The docker image can be used in the FROM field of a downstream Dockerfile. ## Supported tags and respective Dockerfile links - - [xeone3-centos-7-media-gst](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/XeonE3/centos-7/media/gst/Dockerfile) + - [xeone3-centos-7-media-gst](https://github.com/OpenVisualCloud/Dockerfiles/blob/v21.3/XeonE3/centos-7/media/gst/Dockerfile) ## Quick reference - #### Supported platform and OS @@ -37,17 +37,16 @@ This docker installs third party components licensed under various open source l |Intel SVT-AV1|BSD-2-Clause Plus Patent License| |Intel SVT-VP9|BSD-2-Clause Plus Patent License| |Intel Graphics Memory Management Library| MIT License| -|libdrm|MIT license| |Intel libva| MIT License -|Intel media-driver | MIT License| +|Intel media driver | MIT License| |gstreamer|GNU Lesser General Public License v2.1 or later| -|gst plugin base|GNU Lesser General Public License v2.1 or later| -|gst plugin good|GNU Lesser General Public License v2.1 or later| -|gst plugin bad|GNU Lesser General Public License v2.1 or later| -|gst plugin ugly|GNU Lesser General Public License v2.1 or later| -|gst plugin libav|GNU Library General Public License Version 2| -|gst plugin svt|GNU Lesser General Public License v2.1 or later| -|gst plugin vaapi|GNU Lesser General Public License v2.1 or later| +|gst plugins base|GNU Lesser General Public License v2.1 or later| +|gst plugins good|GNU Lesser General Public License v2.1 or later| +|gst plugins bad|GNU Lesser General Public License v2.1 or later| +|gst plugins ugly|GNU Lesser General Public License v2.1 or later| +|gst libav|GNU Library General Public License Version 2.1 or later| +|gst svt|GNU Lesser General Public License v2.1 or later| +|gst vaapi|GNU Lesser General Public License v2.1 or later| More license information can be found in [components source package](https://github.com/OpenVisualCloud/Dockerfiles-Resources). diff --git a/XeonE3/centos-7/media/nginx/README.md b/XeonE3/centos-7/media/nginx/README.md index 69b49dd19..b97f07030 100644 --- a/XeonE3/centos-7/media/nginx/README.md +++ b/XeonE3/centos-7/media/nginx/README.md @@ -1,7 +1,7 @@ This docker image is part of Open Visual Cloud software stacks. Optimized for the media creation and delivery use case. Optimized for NGINX web server that can be used for serving web content, load balancing, HTTP caching, or a reverse proxy. Also included Intel hardware accelaration software stack such as media SDK, media driver, gmmlib and libva. The docker image can be used in the FROM field of a downstream Dockerfile. ## Supported tags and respective Dockerfile links - - [xeone3-centos-7-media-nginx](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/XeonE3/centos-7/media/nginx/Dockerfile) + - [xeone3-centos-7-media-nginx](https://github.com/OpenVisualCloud/Dockerfiles/blob/v21.3/XeonE3/centos-7/media/nginx/Dockerfile) ## Quick reference - #### Supported platform and OS @@ -25,9 +25,9 @@ This docker installs third party components licensed under various open source l | Components | License | | ----- | ----- | |CentOS| [Various](https://hub.docker.com/_/centos) | -|NGINX_HTTP_FLV|BSD 2-clause "Simplified" License| -|NGINX_Upload_Module|BSD 3-clause "Simplified" License| -|NGINX|BSD 2-clause "Simplified" License| +|nginx http flv|BSD 2-clause "Simplified" License| +|nginx upload module|BSD 3-clause "Simplified" License| +|nginx|BSD 2-clause "Simplified" License| |libogg|BSD 3-clause "New" or "Revised" License| |libvorbis|BSD 3-clause "New" or "Revised" License| |Opus Interactive Audio Codec|BSD 3-clause "New" or "Revised" License| @@ -39,10 +39,10 @@ This docker installs third party components licensed under various open source l |Intel SVT-AV1|BSD-2-Clause Plus Patent License| |Intel SVT-VP9|BSD-2-Clause Plus Patent License| |Intel Graphics Memory Management Library| MIT License| -|libdrm|MIT license| |Intel libva| MIT License -|Intel media-driver | MIT License| +|Intel media driver | MIT License| |Intel media SDK|MIT License| +|OpenCV|BSD 3-clause "New" or "Revised" License| |FFmpeg|GNU Lesser General Public License v2.1 or later| diff --git a/XeonE3/centos-7/service/owt-dev/README.md b/XeonE3/centos-7/service/owt-dev/README.md new file mode 100644 index 000000000..783b667f6 --- /dev/null +++ b/XeonE3/centos-7/service/owt-dev/README.md @@ -0,0 +1,51 @@ +This docker image is part of Open Visual Cloud software stacks. Optimized for video conferencing service based on the WebRTC technology and Open WebRTC Toolkit (OWT). The docker image can be used in the FROM field of a downstream Dockerfile. + +## Supported tags and respective Dockerfile links + - [xeone3-centos-7-service-owt-dev](https://github.com/OpenVisualCloud/Dockerfiles/blob/v21.3/XeonE3/centos-7/service/owt-dev/Dockerfile) + +## Quick reference +- #### Supported platform and OS + Intel® Xeon® E3 platform, CentOS-7 + + + + +- #### Getting started with Dockerfiles: + [OpenVisualCloud Dockerfiles Wiki](https://github.com/OpenVisualCloud/Dockerfiles/wiki) + +- #### File issues: + [OpenVisualCloud Dockerfiles Issues](https://github.com/OpenVisualCloud/Dockerfiles/issues) + + +## License +This docker installs third party components licensed under various open source licenses. The terms under which those components may be used and distributed can be found with the license document that is provided with those components. Please familiarize yourself with those terms to ensure your distribution of those components complies with the terms of those licenses. + + +| Components | License | +| ----- | ----- | +|CentOS| [Various](https://hub.docker.com/_/centos) | +|OpenSSL|Apache License 2.0| +|Intel SVT-HEVC|BSD-2-Clause Plus Patent License| +|libvpx|BSD 3-clause "New" or "Revised" License| +|x264|GNU General Public License v2.0 or later| +|Intel Graphics Memory Management Library| MIT License| +|Intel libva| MIT License +|Intel media driver | MIT License| +|Intel media SDK|MIT License| +|OpenCV|BSD 3-clause "New" or "Revised" License| +|OpenVINO|Apache License v2.0| +|FFmpeg|GNU Lesser General Public License v2.1 or later| +|gstreamer|GNU Lesser General Public License v2.1 or later| +|gst plugins base|GNU Lesser General Public License v2.1 or later| +|gst plugins good|GNU Lesser General Public License v2.1 or later| +|gst plugins bad|GNU Lesser General Public License v2.1 or later| +|gst plugins ugly|GNU Lesser General Public License v2.1 or later| +|gst libav|GNU Library General Public License Version 2.1 or later| +|gst video analytics|MIT License| +|owt-server|Apache License v2.0| +|owt-sdk|Apache License v2.0| +|owt-deps-webrtc|BSD 3-clause License| + + +More license information can be found in [components source package](https://github.com/OpenVisualCloud/Dockerfiles-Resources). +As for any pre-built image usage, it is the image user's responsibility to ensure that any use of this image complies with any relevant licenses and potential fees for all software contained within. We will have no indemnity or warranty coverage from suppliers. diff --git a/XeonE3/centos-7/service/owt/README.md b/XeonE3/centos-7/service/owt/README.md new file mode 100644 index 000000000..6f843307c --- /dev/null +++ b/XeonE3/centos-7/service/owt/README.md @@ -0,0 +1,52 @@ +This docker image is part of Open Visual Cloud software stacks. Optimized for video conferencing service based on the WebRTC technology and Open WebRTC Toolkit (OWT). Optimized for video conferencing service based on the WebRTC technology and Open WebRTC Toolkit (OWT). Included conferencing modes: 1:N, N:N with video and audio processing nodes. The docker image can be used in the FROM field of a downstream Dockerfile. + +## Supported tags and respective Dockerfile links + - [xeone3-centos-7-service-owt](https://github.com/OpenVisualCloud/Dockerfiles/blob/v21.3/XeonE3/centos-7/service/owt/Dockerfile) + +## Quick reference +- #### Supported platform and OS + Intel® Xeon® E3 platform, CentOS-7 + +- #### Usage instructions: + [OWT](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/doc/owt.md) + + +- #### Getting started with Dockerfiles: + [OpenVisualCloud Dockerfiles Wiki](https://github.com/OpenVisualCloud/Dockerfiles/wiki) + +- #### File issues: + [OpenVisualCloud Dockerfiles Issues](https://github.com/OpenVisualCloud/Dockerfiles/issues) + + +## License +This docker installs third party components licensed under various open source licenses. The terms under which those components may be used and distributed can be found with the license document that is provided with those components. Please familiarize yourself with those terms to ensure your distribution of those components complies with the terms of those licenses. + + +| Components | License | +| ----- | ----- | +|CentOS| [Various](https://hub.docker.com/_/centos) | +|OpenSSL|Apache License 2.0| +|Intel SVT-HEVC|BSD-2-Clause Plus Patent License| +|libvpx|BSD 3-clause "New" or "Revised" License| +|x264|GNU General Public License v2.0 or later| +|OpenCV|BSD 3-clause "New" or "Revised" License| +|Intel Graphics Memory Management Library| MIT License| +|Intel libva| MIT License +|Intel media driver | MIT License| +|Intel media SDK|MIT License| +|OpenVINO|Apache License v2.0| +|FFmpeg|GNU Lesser General Public License v2.1 or later| +|gstreamer|GNU Lesser General Public License v2.1 or later| +|gst plugins base|GNU Lesser General Public License v2.1 or later| +|gst plugins good|GNU Lesser General Public License v2.1 or later| +|gst plugins bad|GNU Lesser General Public License v2.1 or later| +|gst plugins ugly|GNU Lesser General Public License v2.1 or later| +|gst libav|GNU Library General Public License Version 2.1 or later| +|gst video analytics|MIT License| +|owt-server|Apache License v2.0| +|owt-sdk|Apache License v2.0| +|owt-deps-webrtc|BSD 3-clause License| + + +More license information can be found in [components source package](https://github.com/OpenVisualCloud/Dockerfiles-Resources). +As for any pre-built image usage, it is the image user's responsibility to ensure that any use of this image complies with any relevant licenses and potential fees for all software contained within. We will have no indemnity or warranty coverage from suppliers. diff --git a/XeonE3/centos-7/service/owt360/README.md b/XeonE3/centos-7/service/owt360/README.md new file mode 100644 index 000000000..e3223cdb2 --- /dev/null +++ b/XeonE3/centos-7/service/owt360/README.md @@ -0,0 +1,46 @@ +This docker image is part of Open Visual Cloud software stacks. Optimized for video conferencing service based on the WebRTC technology and Open WebRTC Toolkit (OWT). Docker image optimized for ultra-high resolution immersive video low latency streaming, based on the WebRTC technology and the Open WebRTC Toolkit. Included SVT-HEVC tile-based 4K and 8K transcoding and field of view (FoV) adaptive streaming. The docker image can be used in the FROM field of a downstream Dockerfile. + +## Supported tags and respective Dockerfile links + - [xeone3-centos-7-service-owt360](https://github.com/OpenVisualCloud/Dockerfiles/blob/v21.3/XeonE3/centos-7/service/owt360/Dockerfile) + +## Quick reference +- #### Supported platform and OS + Intel® Xeon® E3 platform, CentOS-7 + +- #### Usage instructions: + [OWT360](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/doc/owt360.md) + + +- #### Getting started with Dockerfiles: + [OpenVisualCloud Dockerfiles Wiki](https://github.com/OpenVisualCloud/Dockerfiles/wiki) + +- #### File issues: + [OpenVisualCloud Dockerfiles Issues](https://github.com/OpenVisualCloud/Dockerfiles/issues) + + +## License +This docker installs third party components licensed under various open source licenses. The terms under which those components may be used and distributed can be found with the license document that is provided with those components. Please familiarize yourself with those terms to ensure your distribution of those components complies with the terms of those licenses. + + +| Components | License | +| ----- | ----- | +|CentOS| [Various](https://hub.docker.com/_/centos) | +|OpenSSL|Apache License 2.0| +|Intel SVT-HEVC|BSD-2-Clause Plus Patent License| +|libvpx|BSD 3-clause "New" or "Revised" License| +|x264|GNU General Public License v2.0 or later| +|Intel Graphics Memory Management Library| MIT License| +|Intel libva| MIT License +|Intel media driver | MIT License| +|Intel media SDK|MIT License| +|OpenCV|BSD 3-clause "New" or "Revised" License| +|OpenVINO|Apache License v2.0| +|FFmpeg|GNU Lesser General Public License v2.1 or later| +|360SCVP|BSD 3-clause "New" or "Revised" License| +|owt-server|Apache License v2.0| +|owt-sdk|Apache License v2.0| +|owt-deps-webrtc|BSD 3-clause License| + + +More license information can be found in [components source package](https://github.com/OpenVisualCloud/Dockerfiles-Resources). +As for any pre-built image usage, it is the image user's responsibility to ensure that any use of this image complies with any relevant licenses and potential fees for all software contained within. We will have no indemnity or warranty coverage from suppliers. diff --git a/XeonE3/ubuntu-18.04/analytics/dev/README.md b/XeonE3/ubuntu-18.04/analytics/dev/README.md index 6e4902cee..c48d464ad 100644 --- a/XeonE3/ubuntu-18.04/analytics/dev/README.md +++ b/XeonE3/ubuntu-18.04/analytics/dev/README.md @@ -1,7 +1,7 @@ This docker image is part of Open Visual Cloud software stacks. This is development image aim towards enabling C++ application compilation, debugging (with the debugging, profiling tools) and optimization (with the optimization tools.) You can compile C++ applications with this image and then copy the applications to the corresponding deployment image. Included what are in FFmpeg & GStreamer media analytics images. Also included Intel hardware accelaration software stack such as media SDK, media driver, gmmlib and libva. The docker image can be used in the FROM field of a downstream Dockerfile. ## Supported tags and respective Dockerfile links - - [xeone3-ubuntu-1804-analytics-dev](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/XeonE3/ubuntu-18.04/analytics/dev/Dockerfile) + - [xeone3-ubuntu-1804-analytics-dev](https://github.com/OpenVisualCloud/Dockerfiles/blob/v21.3/XeonE3/ubuntu-18.04/analytics/dev/Dockerfile) ## Quick reference - #### Supported platform and OS @@ -37,24 +37,24 @@ This docker installs third party components licensed under various open source l |Intel SVT-AV1|BSD-2-Clause Plus Patent License| |Intel SVT-VP9|BSD-2-Clause Plus Patent License| |Intel Graphics Memory Management Library| MIT License| -|libdrm|MIT license| |Intel libva| MIT License -|Intel media-driver | MIT License| +|Intel opencl | MIT License| +|Intel media driver | MIT License| |Intel media SDK|MIT License| -|intel-opencl | MIT License| +|OpenVINO|Apache License v2.0| +|librdkafka|BSD 2-clause "Simplified" License| |json-c|MIT License| |gstreamer|GNU Lesser General Public License v2.1 or later| -|gst orc|GNU Lesser General Public License v2.1 or later| -|gst plugin base|GNU Lesser General Public License v2.1 or later| -|gst plugin good|GNU Lesser General Public License v2.1 or later| -|gst plugin bad|GNU Lesser General Public License v2.1 or later| -|gst plugin ugly|GNU Lesser General Public License v2.1 or later| -|gst plugin libav|GNU Library General Public License Version 2| -|gst plugin svt|GNU Lesser General Public License v2.1 or later| -|gst plugin vaapi|GNU Lesser General Public License v2.1 or later| -|opencv|BSD 3-clause "New" or "Revised" License| -|DLDT|Apache License v2.0| -|gst plugin gva|MIT License| +|gst plugins base|GNU Lesser General Public License v2.1 or later| +|gst plugins good|GNU Lesser General Public License v2.1 or later| +|gst plugins bad|GNU Lesser General Public License v2.1 or later| +|gst plugins ugly|GNU Lesser General Public License v2.1 or later| +|gst libav|GNU Library General Public License Version 2.1 or later| +|gst vaapi|GNU Lesser General Public License v2.1 or later| +|gst svt|GNU Lesser General Public License v2.1 or later| +|OpenCV|BSD 3-clause "New" or "Revised" License| +|gst video analytics|MIT License| +|gst python|GNU Library General Public License Version 2.1| |FFmpeg|GNU Lesser General Public License v2.1 or later| diff --git a/XeonE3/ubuntu-18.04/analytics/ffmpeg/README.md b/XeonE3/ubuntu-18.04/analytics/ffmpeg/README.md index 988429038..293e9f7a3 100644 --- a/XeonE3/ubuntu-18.04/analytics/ffmpeg/README.md +++ b/XeonE3/ubuntu-18.04/analytics/ffmpeg/README.md @@ -1,7 +1,7 @@ This docker image is part of Open Visual Cloud software stacks. Optimized for Media Analytics. Included what are in media delivery FFmpeg image, inferencing engine and video analytics plugins. Also included Intel hardware accelaration software stack such as media SDK, media driver, opencl, gmmlib and libva. The docker image can be used in the FROM field of a downstream Dockerfile. ## Supported tags and respective Dockerfile links - - [xeone3-ubuntu-1804-analytics-ffmpeg](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/XeonE3/ubuntu-18.04/analytics/ffmpeg/Dockerfile) + - [xeone3-ubuntu-1804-analytics-ffmpeg](https://github.com/OpenVisualCloud/Dockerfiles/blob/v21.3/XeonE3/ubuntu-18.04/analytics/ffmpeg/Dockerfile) ## Quick reference - #### Supported platform and OS @@ -36,15 +36,14 @@ This docker installs third party components licensed under various open source l |Intel SVT-AV1|BSD-2-Clause Plus Patent License| |Intel SVT-VP9|BSD-2-Clause Plus Patent License| |Intel Graphics Memory Management Library| MIT License| -|libdrm|MIT license| |Intel libva| MIT License -|Intel media-driver | MIT License| +|Intel opencl | MIT License| +|Intel media driver | MIT License| |Intel media SDK|MIT License| -|intel-opencl | MIT License| -|json-c|MIT License| +|OpenVINO|Apache License v2.0| |librdkafka|BSD 2-clause "Simplified" License| -|opencv|BSD 3-clause "New" or "Revised" License| -|DLDT|Apache License v2.0| +|json-c|MIT License| +|OpenCV|BSD 3-clause "New" or "Revised" License| |FFmpeg|GNU Lesser General Public License v2.1 or later| diff --git a/XeonE3/ubuntu-18.04/analytics/gst/README.md b/XeonE3/ubuntu-18.04/analytics/gst/README.md index 7db676980..f7d4d93b0 100644 --- a/XeonE3/ubuntu-18.04/analytics/gst/README.md +++ b/XeonE3/ubuntu-18.04/analytics/gst/README.md @@ -1,7 +1,7 @@ This docker image is part of Open Visual Cloud software stacks. Optimized for Media Analytics. Included what are in media delivery GStreamer image, inferencing engine and video analytics plugins. Also included Intel hardware accelaration software stack such as media SDK, media driver, opencl, gmmlib and libva. The docker image can be used in the FROM field of a downstream Dockerfile. ## Supported tags and respective Dockerfile links - - [xeone3-ubuntu-1804-analytics-gst](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/XeonE3/ubuntu-18.04/analytics/gst/Dockerfile) + - [xeone3-ubuntu-1804-analytics-gst](https://github.com/OpenVisualCloud/Dockerfiles/blob/v21.3/XeonE3/ubuntu-18.04/analytics/gst/Dockerfile) ## Quick reference - #### Supported platform and OS @@ -37,23 +37,23 @@ This docker installs third party components licensed under various open source l |Intel SVT-AV1|BSD-2-Clause Plus Patent License| |Intel SVT-VP9|BSD-2-Clause Plus Patent License| |Intel Graphics Memory Management Library| MIT License| -|libdrm|MIT license| |Intel libva| MIT License -|Intel media-driver | MIT License| -|Intel media SDK|MIT License| -|intel-opencl | MIT License| +|Intel opencl | MIT License| +|Intel media driver | MIT License| +|OpenVINO|Apache License v2.0| +|librdkafka|BSD 2-clause "Simplified" License| +|json-c|MIT License| |gstreamer|GNU Lesser General Public License v2.1 or later| -|gst orc|GNU Lesser General Public License v2.1 or later| -|gst plugin base|GNU Lesser General Public License v2.1 or later| -|gst plugin good|GNU Lesser General Public License v2.1 or later| -|gst plugin bad|GNU Lesser General Public License v2.1 or later| -|gst plugin ugly|GNU Lesser General Public License v2.1 or later| -|gst plugin libav|GNU Library General Public License Version 2| -|gst plugin svt|GNU Lesser General Public License v2.1 or later| -|gst plugin vaapi|GNU Lesser General Public License v2.1 or later| -|opencv|BSD 3-clause "New" or "Revised" License| -|DLDT|Apache License v2.0| -|gst plugin gva|MIT License| +|gst plugins base|GNU Lesser General Public License v2.1 or later| +|gst plugins good|GNU Lesser General Public License v2.1 or later| +|gst plugins bad|GNU Lesser General Public License v2.1 or later| +|gst plugins ugly|GNU Lesser General Public License v2.1 or later| +|gst libav|GNU Library General Public License Version 2.1 or later| +|gst vaapi|GNU Lesser General Public License v2.1 or later| +|gst svt|GNU Lesser General Public License v2.1 or later| +|OpenCV|BSD 3-clause "New" or "Revised" License| +|gst video analytics|MIT License| +|gst python|GNU Library General Public License Version 2.1| More license information can be found in [components source package](https://github.com/OpenVisualCloud/Dockerfiles-Resources). diff --git a/XeonE3/ubuntu-18.04/media/dev/README.md b/XeonE3/ubuntu-18.04/media/dev/README.md index de8cbf987..b0a8ccd8a 100644 --- a/XeonE3/ubuntu-18.04/media/dev/README.md +++ b/XeonE3/ubuntu-18.04/media/dev/README.md @@ -1,7 +1,7 @@ This docker image is part of Open Visual Cloud software stacks. This is development image aim towards enabling C++ application compilation, debugging (with the debugging, profiling tools) and optimization (with the optimization tools.) You can compile C++ applications with this image and then copy the applications to the corresponding deployment image. Included what are in FFmpeg or GStreamer media creation and delivery images . Also included Intel hardware accelaration software stack such as media SDK, media driver, gmmlib and libva. The docker image can be used in the FROM field of a downstream Dockerfile. ## Supported tags and respective Dockerfile links - - [xeone3-ubuntu-1804-media-dev](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/XeonE3/ubuntu-18.04/media/dev/Dockerfile) + - [xeone3-ubuntu-1804-media-dev](https://github.com/OpenVisualCloud/Dockerfiles/blob/v21.3/XeonE3/ubuntu-18.04/media/dev/Dockerfile) ## Quick reference - #### Supported platform and OS @@ -38,17 +38,17 @@ This docker installs third party components licensed under various open source l |Intel SVT-VP9|BSD-2-Clause Plus Patent License| |Intel Graphics Memory Management Library| MIT License| |Intel libva| MIT License -|Intel media-driver | MIT License| +|Intel media driver | MIT License| |Intel media SDK|MIT License| |gstreamer|GNU Lesser General Public License v2.1 or later| -|gst plugin base|GNU Lesser General Public License v2.1 or later| -|gst plugin good|GNU Lesser General Public License v2.1 or later| -|gst plugin bad|GNU Lesser General Public License v2.1 or later| -|gst plugin ugly|GNU Lesser General Public License v2.1 or later| -|gst plugin libav|GNU Library General Public License Version 2| -|gst plugin svt|GNU Lesser General Public License v2.1 or later| -|gst plugin vaapi|GNU Lesser General Public License v2.1 or later| +|gst plugins base|GNU Lesser General Public License v2.1 or later| +|gst plugins good|GNU Lesser General Public License v2.1 or later| +|gst plugins bad|GNU Lesser General Public License v2.1 or later| +|gst plugins ugly|GNU Lesser General Public License v2.1 or later| +|gst libav|GNU Library General Public License Version 2.1 or later| +|gst svt|GNU Lesser General Public License v2.1 or later| |FFmpeg|GNU Lesser General Public License v2.1 or later| +|gst vaapi|GNU Lesser General Public License v2.1 or later| More license information can be found in [components source package](https://github.com/OpenVisualCloud/Dockerfiles-Resources). diff --git a/XeonE3/ubuntu-18.04/media/ffmpeg/README.md b/XeonE3/ubuntu-18.04/media/ffmpeg/README.md index 0e68fa4ae..c169ccac3 100644 --- a/XeonE3/ubuntu-18.04/media/ffmpeg/README.md +++ b/XeonE3/ubuntu-18.04/media/ffmpeg/README.md @@ -1,7 +1,7 @@ This docker image is part of Open Visual Cloud software stacks. Optimized for the media creation and delivery use case. Included FFmpeg and codecs such as aac, opus, ogg, vorbis, x264, x265, vp8/9, av1 and SVT-HEVC. Also included Intel hardware accelaration software stack such as media SDK, media driver, gmmlib and libva. The docker image can be used in the FROM field of a downstream Dockerfile. ## Supported tags and respective Dockerfile links - - [xeone3-ubuntu-1804-media-ffmpeg](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/XeonE3/ubuntu-18.04/media/ffmpeg/Dockerfile) + - [xeone3-ubuntu-1804-media-ffmpeg](https://github.com/OpenVisualCloud/Dockerfiles/blob/v21.3/XeonE3/ubuntu-18.04/media/ffmpeg/Dockerfile) ## Quick reference - #### Supported platform and OS @@ -37,8 +37,9 @@ This docker installs third party components licensed under various open source l |Intel SVT-VP9|BSD-2-Clause Plus Patent License| |Intel Graphics Memory Management Library| MIT License| |Intel libva| MIT License -|Intel media-driver | MIT License| +|Intel media driver | MIT License| |Intel media SDK|MIT License| +|OpenCV|BSD 3-clause "New" or "Revised" License| |FFmpeg|GNU Lesser General Public License v2.1 or later| diff --git a/XeonE3/ubuntu-18.04/media/gst/README.md b/XeonE3/ubuntu-18.04/media/gst/README.md index 5ebdd9b40..0fb1a57f0 100644 --- a/XeonE3/ubuntu-18.04/media/gst/README.md +++ b/XeonE3/ubuntu-18.04/media/gst/README.md @@ -1,7 +1,7 @@ This docker image is part of Open Visual Cloud software stacks. Optimized for the media creation and delivery use case. Included gstreamer and audio and video plugins that can be connected to process audio and video content, such as creating, converting, transcoding. Also included Intel hardware accelaration software stack such as media SDK, media driver, gmmlib and libva. The docker image can be used in the FROM field of a downstream Dockerfile. ## Supported tags and respective Dockerfile links - - [xeone3-ubuntu-1804-media-gst](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/XeonE3/ubuntu-18.04/media/gst/Dockerfile) + - [xeone3-ubuntu-1804-media-gst](https://github.com/OpenVisualCloud/Dockerfiles/blob/v21.3/XeonE3/ubuntu-18.04/media/gst/Dockerfile) ## Quick reference - #### Supported platform and OS @@ -38,15 +38,15 @@ This docker installs third party components licensed under various open source l |Intel SVT-VP9|BSD-2-Clause Plus Patent License| |Intel Graphics Memory Management Library| MIT License| |Intel libva| MIT License -|Intel media-driver | MIT License| +|Intel media driver | MIT License| |gstreamer|GNU Lesser General Public License v2.1 or later| -|gst plugin base|GNU Lesser General Public License v2.1 or later| -|gst plugin good|GNU Lesser General Public License v2.1 or later| -|gst plugin bad|GNU Lesser General Public License v2.1 or later| -|gst plugin ugly|GNU Lesser General Public License v2.1 or later| -|gst plugin libav|GNU Library General Public License Version 2| -|gst plugin svt|GNU Lesser General Public License v2.1 or later| -|gst plugin vaapi|GNU Lesser General Public License v2.1 or later| +|gst plugins base|GNU Lesser General Public License v2.1 or later| +|gst plugins good|GNU Lesser General Public License v2.1 or later| +|gst plugins bad|GNU Lesser General Public License v2.1 or later| +|gst plugins ugly|GNU Lesser General Public License v2.1 or later| +|gst libav|GNU Library General Public License Version 2.1 or later| +|gst svt|GNU Lesser General Public License v2.1 or later| +|gst vaapi|GNU Lesser General Public License v2.1 or later| More license information can be found in [components source package](https://github.com/OpenVisualCloud/Dockerfiles-Resources). diff --git a/XeonE3/ubuntu-18.04/media/nginx/README.md b/XeonE3/ubuntu-18.04/media/nginx/README.md index 97662cf1c..02ca91dd2 100644 --- a/XeonE3/ubuntu-18.04/media/nginx/README.md +++ b/XeonE3/ubuntu-18.04/media/nginx/README.md @@ -1,7 +1,7 @@ This docker image is part of Open Visual Cloud software stacks. Optimized for the media creation and delivery use case. Optimized for NGINX web server that can be used for serving web content, load balancing, HTTP caching, or a reverse proxy. Also included Intel hardware accelaration software stack such as media SDK, media driver, gmmlib and libva. The docker image can be used in the FROM field of a downstream Dockerfile. ## Supported tags and respective Dockerfile links - - [xeone3-ubuntu-1804-media-nginx](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/XeonE3/ubuntu-18.04/media/nginx/Dockerfile) + - [xeone3-ubuntu-1804-media-nginx](https://github.com/OpenVisualCloud/Dockerfiles/blob/v21.3/XeonE3/ubuntu-18.04/media/nginx/Dockerfile) ## Quick reference - #### Supported platform and OS @@ -25,9 +25,9 @@ This docker installs third party components licensed under various open source l | Components | License | | ----- | ----- | |Ubuntu| [Various](https://hub.docker.com/_/ubuntu) | -|NGINX_HTTP_FLV|BSD 2-clause "Simplified" License| -|NGINX_Upload_Module|BSD 3-clause "Simplified" License| -|NGINX|BSD 2-clause "Simplified" License| +|nginx http flv|BSD 2-clause "Simplified" License| +|nginx upload module|BSD 3-clause "Simplified" License| +|nginx|BSD 2-clause "Simplified" License| |libogg|BSD 3-clause "New" or "Revised" License| |libvorbis|BSD 3-clause "New" or "Revised" License| |Opus Interactive Audio Codec|BSD 3-clause "New" or "Revised" License| @@ -40,8 +40,9 @@ This docker installs third party components licensed under various open source l |Intel SVT-VP9|BSD-2-Clause Plus Patent License| |Intel Graphics Memory Management Library| MIT License| |Intel libva| MIT License -|Intel media-driver | MIT License| +|Intel media driver | MIT License| |Intel media SDK|MIT License| +|OpenCV|BSD 3-clause "New" or "Revised" License| |FFmpeg|GNU Lesser General Public License v2.1 or later| diff --git a/XeonE3/ubuntu-18.04/service/owt-dev/README.md b/XeonE3/ubuntu-18.04/service/owt-dev/README.md new file mode 100644 index 000000000..f78c40b0e --- /dev/null +++ b/XeonE3/ubuntu-18.04/service/owt-dev/README.md @@ -0,0 +1,51 @@ +This docker image is part of Open Visual Cloud software stacks. Optimized for video conferencing service based on the WebRTC technology and Open WebRTC Toolkit (OWT). The docker image can be used in the FROM field of a downstream Dockerfile. + +## Supported tags and respective Dockerfile links + - [xeone3-ubuntu-1804-service-owt-dev](https://github.com/OpenVisualCloud/Dockerfiles/blob/v21.3/XeonE3/ubuntu-18.04/service/owt-dev/Dockerfile) + +## Quick reference +- #### Supported platform and OS + Intel® Xeon® E3 platform, Ubuntu 18.04 + + + + +- #### Getting started with Dockerfiles: + [OpenVisualCloud Dockerfiles Wiki](https://github.com/OpenVisualCloud/Dockerfiles/wiki) + +- #### File issues: + [OpenVisualCloud Dockerfiles Issues](https://github.com/OpenVisualCloud/Dockerfiles/issues) + + +## License +This docker installs third party components licensed under various open source licenses. The terms under which those components may be used and distributed can be found with the license document that is provided with those components. Please familiarize yourself with those terms to ensure your distribution of those components complies with the terms of those licenses. + + +| Components | License | +| ----- | ----- | +|Ubuntu| [Various](https://hub.docker.com/_/ubuntu) | +|OpenSSL|Apache License 2.0| +|Intel SVT-HEVC|BSD-2-Clause Plus Patent License| +|libvpx|BSD 3-clause "New" or "Revised" License| +|x264|GNU General Public License v2.0 or later| +|Intel Graphics Memory Management Library| MIT License| +|Intel libva| MIT License +|Intel media driver | MIT License| +|Intel media SDK|MIT License| +|OpenCV|BSD 3-clause "New" or "Revised" License| +|OpenVINO|Apache License v2.0| +|FFmpeg|GNU Lesser General Public License v2.1 or later| +|gstreamer|GNU Lesser General Public License v2.1 or later| +|gst plugins base|GNU Lesser General Public License v2.1 or later| +|gst plugins good|GNU Lesser General Public License v2.1 or later| +|gst plugins bad|GNU Lesser General Public License v2.1 or later| +|gst plugins ugly|GNU Lesser General Public License v2.1 or later| +|gst libav|GNU Library General Public License Version 2.1 or later| +|gst video analytics|MIT License| +|owt-server|Apache License v2.0| +|owt-sdk|Apache License v2.0| +|owt-deps-webrtc|BSD 3-clause License| + + +More license information can be found in [components source package](https://github.com/OpenVisualCloud/Dockerfiles-Resources). +As for any pre-built image usage, it is the image user's responsibility to ensure that any use of this image complies with any relevant licenses and potential fees for all software contained within. We will have no indemnity or warranty coverage from suppliers. diff --git a/XeonE3/ubuntu-18.04/service/owt/README.md b/XeonE3/ubuntu-18.04/service/owt/README.md new file mode 100644 index 000000000..276764e53 --- /dev/null +++ b/XeonE3/ubuntu-18.04/service/owt/README.md @@ -0,0 +1,52 @@ +This docker image is part of Open Visual Cloud software stacks. Optimized for video conferencing service based on the WebRTC technology and Open WebRTC Toolkit (OWT). Optimized for video conferencing service based on the WebRTC technology and Open WebRTC Toolkit (OWT). Included conferencing modes: 1:N, N:N with video and audio processing nodes. The docker image can be used in the FROM field of a downstream Dockerfile. + +## Supported tags and respective Dockerfile links + - [xeone3-ubuntu-1804-service-owt](https://github.com/OpenVisualCloud/Dockerfiles/blob/v21.3/XeonE3/ubuntu-18.04/service/owt/Dockerfile) + +## Quick reference +- #### Supported platform and OS + Intel® Xeon® E3 platform, Ubuntu 18.04 + +- #### Usage instructions: + [OWT](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/doc/owt.md) + + +- #### Getting started with Dockerfiles: + [OpenVisualCloud Dockerfiles Wiki](https://github.com/OpenVisualCloud/Dockerfiles/wiki) + +- #### File issues: + [OpenVisualCloud Dockerfiles Issues](https://github.com/OpenVisualCloud/Dockerfiles/issues) + + +## License +This docker installs third party components licensed under various open source licenses. The terms under which those components may be used and distributed can be found with the license document that is provided with those components. Please familiarize yourself with those terms to ensure your distribution of those components complies with the terms of those licenses. + + +| Components | License | +| ----- | ----- | +|Ubuntu| [Various](https://hub.docker.com/_/ubuntu) | +|OpenSSL|Apache License 2.0| +|Intel SVT-HEVC|BSD-2-Clause Plus Patent License| +|libvpx|BSD 3-clause "New" or "Revised" License| +|x264|GNU General Public License v2.0 or later| +|Intel Graphics Memory Management Library| MIT License| +|Intel libva| MIT License +|Intel media driver | MIT License| +|Intel media SDK|MIT License| +|OpenCV|BSD 3-clause "New" or "Revised" License| +|OpenVINO|Apache License v2.0| +|FFmpeg|GNU Lesser General Public License v2.1 or later| +|gstreamer|GNU Lesser General Public License v2.1 or later| +|gst plugins base|GNU Lesser General Public License v2.1 or later| +|gst plugins good|GNU Lesser General Public License v2.1 or later| +|gst plugins bad|GNU Lesser General Public License v2.1 or later| +|gst plugins ugly|GNU Lesser General Public License v2.1 or later| +|gst libav|GNU Library General Public License Version 2.1 or later| +|gst video analytics|MIT License| +|owt-server|Apache License v2.0| +|owt-sdk|Apache License v2.0| +|owt-deps-webrtc|BSD 3-clause License| + + +More license information can be found in [components source package](https://github.com/OpenVisualCloud/Dockerfiles-Resources). +As for any pre-built image usage, it is the image user's responsibility to ensure that any use of this image complies with any relevant licenses and potential fees for all software contained within. We will have no indemnity or warranty coverage from suppliers. diff --git a/XeonE3/ubuntu-18.04/service/owt360/README.md b/XeonE3/ubuntu-18.04/service/owt360/README.md new file mode 100644 index 000000000..775c6e0e8 --- /dev/null +++ b/XeonE3/ubuntu-18.04/service/owt360/README.md @@ -0,0 +1,46 @@ +This docker image is part of Open Visual Cloud software stacks. Optimized for video conferencing service based on the WebRTC technology and Open WebRTC Toolkit (OWT). Docker image optimized for ultra-high resolution immersive video low latency streaming, based on the WebRTC technology and the Open WebRTC Toolkit. Included SVT-HEVC tile-based 4K and 8K transcoding and field of view (FoV) adaptive streaming. The docker image can be used in the FROM field of a downstream Dockerfile. + +## Supported tags and respective Dockerfile links + - [xeone3-ubuntu-1804-service-owt360](https://github.com/OpenVisualCloud/Dockerfiles/blob/v21.3/XeonE3/ubuntu-18.04/service/owt360/Dockerfile) + +## Quick reference +- #### Supported platform and OS + Intel® Xeon® E3 platform, Ubuntu 18.04 + +- #### Usage instructions: + [OWT360](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/doc/owt360.md) + + +- #### Getting started with Dockerfiles: + [OpenVisualCloud Dockerfiles Wiki](https://github.com/OpenVisualCloud/Dockerfiles/wiki) + +- #### File issues: + [OpenVisualCloud Dockerfiles Issues](https://github.com/OpenVisualCloud/Dockerfiles/issues) + + +## License +This docker installs third party components licensed under various open source licenses. The terms under which those components may be used and distributed can be found with the license document that is provided with those components. Please familiarize yourself with those terms to ensure your distribution of those components complies with the terms of those licenses. + + +| Components | License | +| ----- | ----- | +|Ubuntu| [Various](https://hub.docker.com/_/ubuntu) | +|OpenSSL|Apache License 2.0| +|Intel SVT-HEVC|BSD-2-Clause Plus Patent License| +|libvpx|BSD 3-clause "New" or "Revised" License| +|x264|GNU General Public License v2.0 or later| +|Intel Graphics Memory Management Library| MIT License| +|Intel libva| MIT License +|Intel media driver | MIT License| +|Intel media SDK|MIT License| +|OpenCV|BSD 3-clause "New" or "Revised" License| +|OpenVINO|Apache License v2.0| +|FFmpeg|GNU Lesser General Public License v2.1 or later| +|360SCVP|BSD 3-clause "New" or "Revised" License| +|owt-server|Apache License v2.0| +|owt-sdk|Apache License v2.0| +|owt-deps-webrtc|BSD 3-clause License| + + +More license information can be found in [components source package](https://github.com/OpenVisualCloud/Dockerfiles-Resources). +As for any pre-built image usage, it is the image user's responsibility to ensure that any use of this image complies with any relevant licenses and potential fees for all software contained within. We will have no indemnity or warranty coverage from suppliers. diff --git a/XeonE3/ubuntu-20.04/analytics/dev/README.md b/XeonE3/ubuntu-20.04/analytics/dev/README.md index 6e4902cee..1ebea25a4 100644 --- a/XeonE3/ubuntu-20.04/analytics/dev/README.md +++ b/XeonE3/ubuntu-20.04/analytics/dev/README.md @@ -1,11 +1,11 @@ This docker image is part of Open Visual Cloud software stacks. This is development image aim towards enabling C++ application compilation, debugging (with the debugging, profiling tools) and optimization (with the optimization tools.) You can compile C++ applications with this image and then copy the applications to the corresponding deployment image. Included what are in FFmpeg & GStreamer media analytics images. Also included Intel hardware accelaration software stack such as media SDK, media driver, gmmlib and libva. The docker image can be used in the FROM field of a downstream Dockerfile. ## Supported tags and respective Dockerfile links - - [xeone3-ubuntu-1804-analytics-dev](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/XeonE3/ubuntu-18.04/analytics/dev/Dockerfile) + - [xeone3-ubuntu-2004-analytics-dev](https://github.com/OpenVisualCloud/Dockerfiles/blob/v21.3/XeonE3/ubuntu-20.04/analytics/dev/Dockerfile) ## Quick reference - #### Supported platform and OS - Intel® Xeon® E3 platform, Ubuntu 18.04 + Intel® Xeon® E3 platform, Ubuntu 20.04 - #### Usage instructions: [FFmpeg](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/doc/ffmpeg.md) [GStreamer](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/doc/gst.md) @@ -37,24 +37,24 @@ This docker installs third party components licensed under various open source l |Intel SVT-AV1|BSD-2-Clause Plus Patent License| |Intel SVT-VP9|BSD-2-Clause Plus Patent License| |Intel Graphics Memory Management Library| MIT License| -|libdrm|MIT license| |Intel libva| MIT License -|Intel media-driver | MIT License| +|Intel opencl | MIT License| +|Intel media driver | MIT License| |Intel media SDK|MIT License| -|intel-opencl | MIT License| +|OpenVINO|Apache License v2.0| +|librdkafka|BSD 2-clause "Simplified" License| |json-c|MIT License| |gstreamer|GNU Lesser General Public License v2.1 or later| -|gst orc|GNU Lesser General Public License v2.1 or later| -|gst plugin base|GNU Lesser General Public License v2.1 or later| -|gst plugin good|GNU Lesser General Public License v2.1 or later| -|gst plugin bad|GNU Lesser General Public License v2.1 or later| -|gst plugin ugly|GNU Lesser General Public License v2.1 or later| -|gst plugin libav|GNU Library General Public License Version 2| -|gst plugin svt|GNU Lesser General Public License v2.1 or later| -|gst plugin vaapi|GNU Lesser General Public License v2.1 or later| -|opencv|BSD 3-clause "New" or "Revised" License| -|DLDT|Apache License v2.0| -|gst plugin gva|MIT License| +|gst plugins base|GNU Lesser General Public License v2.1 or later| +|gst plugins good|GNU Lesser General Public License v2.1 or later| +|gst plugins bad|GNU Lesser General Public License v2.1 or later| +|gst plugins ugly|GNU Lesser General Public License v2.1 or later| +|gst libav|GNU Library General Public License Version 2.1 or later| +|gst vaapi|GNU Lesser General Public License v2.1 or later| +|gst svt|GNU Lesser General Public License v2.1 or later| +|OpenCV|BSD 3-clause "New" or "Revised" License| +|gst video analytics|MIT License| +|gst python|GNU Library General Public License Version 2.1| |FFmpeg|GNU Lesser General Public License v2.1 or later| diff --git a/XeonE3/ubuntu-20.04/analytics/ffmpeg/README.md b/XeonE3/ubuntu-20.04/analytics/ffmpeg/README.md index 988429038..dcca59fe7 100644 --- a/XeonE3/ubuntu-20.04/analytics/ffmpeg/README.md +++ b/XeonE3/ubuntu-20.04/analytics/ffmpeg/README.md @@ -1,11 +1,11 @@ This docker image is part of Open Visual Cloud software stacks. Optimized for Media Analytics. Included what are in media delivery FFmpeg image, inferencing engine and video analytics plugins. Also included Intel hardware accelaration software stack such as media SDK, media driver, opencl, gmmlib and libva. The docker image can be used in the FROM field of a downstream Dockerfile. ## Supported tags and respective Dockerfile links - - [xeone3-ubuntu-1804-analytics-ffmpeg](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/XeonE3/ubuntu-18.04/analytics/ffmpeg/Dockerfile) + - [xeone3-ubuntu-2004-analytics-ffmpeg](https://github.com/OpenVisualCloud/Dockerfiles/blob/v21.3/XeonE3/ubuntu-20.04/analytics/ffmpeg/Dockerfile) ## Quick reference - #### Supported platform and OS - Intel® Xeon® E3 platform, Ubuntu 18.04 + Intel® Xeon® E3 platform, Ubuntu 20.04 - #### Usage instructions: [FFmpeg](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/doc/ffmpeg.md) @@ -36,15 +36,14 @@ This docker installs third party components licensed under various open source l |Intel SVT-AV1|BSD-2-Clause Plus Patent License| |Intel SVT-VP9|BSD-2-Clause Plus Patent License| |Intel Graphics Memory Management Library| MIT License| -|libdrm|MIT license| |Intel libva| MIT License -|Intel media-driver | MIT License| +|Intel opencl | MIT License| +|Intel media driver | MIT License| |Intel media SDK|MIT License| -|intel-opencl | MIT License| -|json-c|MIT License| +|OpenVINO|Apache License v2.0| |librdkafka|BSD 2-clause "Simplified" License| -|opencv|BSD 3-clause "New" or "Revised" License| -|DLDT|Apache License v2.0| +|json-c|MIT License| +|OpenCV|BSD 3-clause "New" or "Revised" License| |FFmpeg|GNU Lesser General Public License v2.1 or later| diff --git a/XeonE3/ubuntu-20.04/analytics/gst/README.md b/XeonE3/ubuntu-20.04/analytics/gst/README.md index 7db676980..2b8638c1a 100644 --- a/XeonE3/ubuntu-20.04/analytics/gst/README.md +++ b/XeonE3/ubuntu-20.04/analytics/gst/README.md @@ -1,11 +1,11 @@ This docker image is part of Open Visual Cloud software stacks. Optimized for Media Analytics. Included what are in media delivery GStreamer image, inferencing engine and video analytics plugins. Also included Intel hardware accelaration software stack such as media SDK, media driver, opencl, gmmlib and libva. The docker image can be used in the FROM field of a downstream Dockerfile. ## Supported tags and respective Dockerfile links - - [xeone3-ubuntu-1804-analytics-gst](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/XeonE3/ubuntu-18.04/analytics/gst/Dockerfile) + - [xeone3-ubuntu-2004-analytics-gst](https://github.com/OpenVisualCloud/Dockerfiles/blob/v21.3/XeonE3/ubuntu-20.04/analytics/gst/Dockerfile) ## Quick reference - #### Supported platform and OS - Intel® Xeon® E3 platform, Ubuntu 18.04 + Intel® Xeon® E3 platform, Ubuntu 20.04 - #### Usage instructions: [GStreamer](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/doc/gst.md) @@ -37,23 +37,23 @@ This docker installs third party components licensed under various open source l |Intel SVT-AV1|BSD-2-Clause Plus Patent License| |Intel SVT-VP9|BSD-2-Clause Plus Patent License| |Intel Graphics Memory Management Library| MIT License| -|libdrm|MIT license| |Intel libva| MIT License -|Intel media-driver | MIT License| -|Intel media SDK|MIT License| -|intel-opencl | MIT License| +|Intel opencl | MIT License| +|Intel media driver | MIT License| +|OpenVINO|Apache License v2.0| +|librdkafka|BSD 2-clause "Simplified" License| +|json-c|MIT License| |gstreamer|GNU Lesser General Public License v2.1 or later| -|gst orc|GNU Lesser General Public License v2.1 or later| -|gst plugin base|GNU Lesser General Public License v2.1 or later| -|gst plugin good|GNU Lesser General Public License v2.1 or later| -|gst plugin bad|GNU Lesser General Public License v2.1 or later| -|gst plugin ugly|GNU Lesser General Public License v2.1 or later| -|gst plugin libav|GNU Library General Public License Version 2| -|gst plugin svt|GNU Lesser General Public License v2.1 or later| -|gst plugin vaapi|GNU Lesser General Public License v2.1 or later| -|opencv|BSD 3-clause "New" or "Revised" License| -|DLDT|Apache License v2.0| -|gst plugin gva|MIT License| +|gst plugins base|GNU Lesser General Public License v2.1 or later| +|gst plugins good|GNU Lesser General Public License v2.1 or later| +|gst plugins bad|GNU Lesser General Public License v2.1 or later| +|gst plugins ugly|GNU Lesser General Public License v2.1 or later| +|gst libav|GNU Library General Public License Version 2.1 or later| +|gst vaapi|GNU Lesser General Public License v2.1 or later| +|gst svt|GNU Lesser General Public License v2.1 or later| +|OpenCV|BSD 3-clause "New" or "Revised" License| +|gst video analytics|MIT License| +|gst python|GNU Library General Public License Version 2.1| More license information can be found in [components source package](https://github.com/OpenVisualCloud/Dockerfiles-Resources). diff --git a/XeonE3/ubuntu-20.04/media/dev/README.md b/XeonE3/ubuntu-20.04/media/dev/README.md new file mode 100644 index 000000000..46575b403 --- /dev/null +++ b/XeonE3/ubuntu-20.04/media/dev/README.md @@ -0,0 +1,55 @@ +This docker image is part of Open Visual Cloud software stacks. This is development image aim towards enabling C++ application compilation, debugging (with the debugging, profiling tools) and optimization (with the optimization tools.) You can compile C++ applications with this image and then copy the applications to the corresponding deployment image. Included what are in FFmpeg or GStreamer media creation and delivery images . Also included Intel hardware accelaration software stack such as media SDK, media driver, gmmlib and libva. The docker image can be used in the FROM field of a downstream Dockerfile. + +## Supported tags and respective Dockerfile links + - [xeone3-ubuntu-2004-media-dev](https://github.com/OpenVisualCloud/Dockerfiles/blob/v21.3/XeonE3/ubuntu-20.04/media/dev/Dockerfile) + +## Quick reference +- #### Supported platform and OS + Intel® Xeon® E3 platform, Ubuntu 20.04 + +- #### Usage instructions: + [FFmpeg](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/doc/ffmpeg.md) [GStreamer](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/doc/gst.md) + + +- #### Getting started with Dockerfiles: + [OpenVisualCloud Dockerfiles Wiki](https://github.com/OpenVisualCloud/Dockerfiles/wiki) + +- #### File issues: + [OpenVisualCloud Dockerfiles Issues](https://github.com/OpenVisualCloud/Dockerfiles/issues) + + +## License +This docker installs third party components licensed under various open source licenses. The terms under which those components may be used and distributed can be found with the license document that is provided with those components. Please familiarize yourself with those terms to ensure your distribution of those components complies with the terms of those licenses. + + +| Components | License | +| ----- | ----- | +|Ubuntu| [Various](https://hub.docker.com/_/ubuntu) | +|libogg|BSD 3-clause "New" or "Revised" License| +|libvorbis|BSD 3-clause "New" or "Revised" License| +|Opus Interactive Audio Codec|BSD 3-clause "New" or "Revised" License| +|libvpx|BSD 3-clause "New" or "Revised" License| +|Aomedia AV1 Codec Library|BSD 2-clause "Simplified" License| +|x264|GNU General Public License v2.0 or later| +|x265|GNU General Public License v2.0 or later| +|dav1d|BSD 2-clause "Simplified" License| +|Intel SVT-HEVC|BSD-2-Clause Plus Patent License| +|Intel SVT-AV1|BSD-2-Clause Plus Patent License| +|Intel SVT-VP9|BSD-2-Clause Plus Patent License| +|Intel Graphics Memory Management Library| MIT License| +|Intel libva| MIT License +|Intel media driver | MIT License| +|Intel media SDK|MIT License| +|gstreamer|GNU Lesser General Public License v2.1 or later| +|gst plugins base|GNU Lesser General Public License v2.1 or later| +|gst plugins good|GNU Lesser General Public License v2.1 or later| +|gst plugins bad|GNU Lesser General Public License v2.1 or later| +|gst plugins ugly|GNU Lesser General Public License v2.1 or later| +|gst libav|GNU Library General Public License Version 2.1 or later| +|gst svt|GNU Lesser General Public License v2.1 or later| +|gst vaapi|GNU Lesser General Public License v2.1 or later| +|FFmpeg|GNU Lesser General Public License v2.1 or later| + + +More license information can be found in [components source package](https://github.com/OpenVisualCloud/Dockerfiles-Resources). +As for any pre-built image usage, it is the image user's responsibility to ensure that any use of this image complies with any relevant licenses and potential fees for all software contained within. We will have no indemnity or warranty coverage from suppliers. diff --git a/XeonE3/ubuntu-20.04/media/ffmpeg/README.md b/XeonE3/ubuntu-20.04/media/ffmpeg/README.md new file mode 100644 index 000000000..ad641552a --- /dev/null +++ b/XeonE3/ubuntu-20.04/media/ffmpeg/README.md @@ -0,0 +1,47 @@ +This docker image is part of Open Visual Cloud software stacks. Optimized for the media creation and delivery use case. Included FFmpeg and codecs such as aac, opus, ogg, vorbis, x264, x265, vp8/9, av1 and SVT-HEVC. Also included Intel hardware accelaration software stack such as media SDK, media driver, gmmlib and libva. The docker image can be used in the FROM field of a downstream Dockerfile. + +## Supported tags and respective Dockerfile links + - [xeone3-ubuntu-2004-media-ffmpeg](https://github.com/OpenVisualCloud/Dockerfiles/blob/v21.3/XeonE3/ubuntu-20.04/media/ffmpeg/Dockerfile) + +## Quick reference +- #### Supported platform and OS + Intel® Xeon® E3 platform, Ubuntu 20.04 + +- #### Usage instructions: + [FFmpeg](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/doc/ffmpeg.md) + + +- #### Getting started with Dockerfiles: + [OpenVisualCloud Dockerfiles Wiki](https://github.com/OpenVisualCloud/Dockerfiles/wiki) + +- #### File issues: + [OpenVisualCloud Dockerfiles Issues](https://github.com/OpenVisualCloud/Dockerfiles/issues) + + +## License +This docker installs third party components licensed under various open source licenses. The terms under which those components may be used and distributed can be found with the license document that is provided with those components. Please familiarize yourself with those terms to ensure your distribution of those components complies with the terms of those licenses. + + +| Components | License | +| ----- | ----- | +|Ubuntu| [Various](https://hub.docker.com/_/ubuntu) | +|libogg|BSD 3-clause "New" or "Revised" License| +|libvorbis|BSD 3-clause "New" or "Revised" License| +|Opus Interactive Audio Codec|BSD 3-clause "New" or "Revised" License| +|libvpx|BSD 3-clause "New" or "Revised" License| +|x264|GNU General Public License v2.0 or later| +|x265|GNU General Public License v2.0 or later| +|dav1d|BSD 2-clause "Simplified" License| +|Intel SVT-HEVC|BSD-2-Clause Plus Patent License| +|Intel SVT-AV1|BSD-2-Clause Plus Patent License| +|Intel SVT-VP9|BSD-2-Clause Plus Patent License| +|Intel Graphics Memory Management Library| MIT License| +|Intel libva| MIT License +|Intel media driver | MIT License| +|Intel media SDK|MIT License| +|OpenCV|BSD 3-clause "New" or "Revised" License| +|FFmpeg|GNU Lesser General Public License v2.1 or later| + + +More license information can be found in [components source package](https://github.com/OpenVisualCloud/Dockerfiles-Resources). +As for any pre-built image usage, it is the image user's responsibility to ensure that any use of this image complies with any relevant licenses and potential fees for all software contained within. We will have no indemnity or warranty coverage from suppliers. diff --git a/XeonE3/ubuntu-20.04/media/gst/README.md b/XeonE3/ubuntu-20.04/media/gst/README.md new file mode 100644 index 000000000..7f2194374 --- /dev/null +++ b/XeonE3/ubuntu-20.04/media/gst/README.md @@ -0,0 +1,53 @@ +This docker image is part of Open Visual Cloud software stacks. Optimized for the media creation and delivery use case. Included gstreamer and audio and video plugins that can be connected to process audio and video content, such as creating, converting, transcoding. Also included Intel hardware accelaration software stack such as media SDK, media driver, gmmlib and libva. The docker image can be used in the FROM field of a downstream Dockerfile. + +## Supported tags and respective Dockerfile links + - [xeone3-ubuntu-2004-media-gst](https://github.com/OpenVisualCloud/Dockerfiles/blob/v21.3/XeonE3/ubuntu-20.04/media/gst/Dockerfile) + +## Quick reference +- #### Supported platform and OS + Intel® Xeon® E3 platform, Ubuntu 20.04 + +- #### Usage instructions: + [GStreamer](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/doc/gst.md) + + +- #### Getting started with Dockerfiles: + [OpenVisualCloud Dockerfiles Wiki](https://github.com/OpenVisualCloud/Dockerfiles/wiki) + +- #### File issues: + [OpenVisualCloud Dockerfiles Issues](https://github.com/OpenVisualCloud/Dockerfiles/issues) + + +## License +This docker installs third party components licensed under various open source licenses. The terms under which those components may be used and distributed can be found with the license document that is provided with those components. Please familiarize yourself with those terms to ensure your distribution of those components complies with the terms of those licenses. + + +| Components | License | +| ----- | ----- | +|Ubuntu| [Various](https://hub.docker.com/_/ubuntu) | +|libogg|BSD 3-clause "New" or "Revised" License| +|libvorbis|BSD 3-clause "New" or "Revised" License| +|Opus Interactive Audio Codec|BSD 3-clause "New" or "Revised" License| +|libvpx|BSD 3-clause "New" or "Revised" License| +|Aomedia AV1 Codec Library|BSD 2-clause "Simplified" License| +|x264|GNU General Public License v2.0 or later| +|x265|GNU General Public License v2.0 or later| +|dav1d|BSD 2-clause "Simplified" License| +|Intel SVT-HEVC|BSD-2-Clause Plus Patent License| +|Intel SVT-AV1|BSD-2-Clause Plus Patent License| +|Intel SVT-VP9|BSD-2-Clause Plus Patent License| +|Intel Graphics Memory Management Library| MIT License| +|Intel libva| MIT License +|Intel media driver | MIT License| +|gstreamer|GNU Lesser General Public License v2.1 or later| +|gst plugins base|GNU Lesser General Public License v2.1 or later| +|gst plugins good|GNU Lesser General Public License v2.1 or later| +|gst plugins bad|GNU Lesser General Public License v2.1 or later| +|gst plugins ugly|GNU Lesser General Public License v2.1 or later| +|gst libav|GNU Library General Public License Version 2.1 or later| +|gst svt|GNU Lesser General Public License v2.1 or later| +|gst vaapi|GNU Lesser General Public License v2.1 or later| + + +More license information can be found in [components source package](https://github.com/OpenVisualCloud/Dockerfiles-Resources). +As for any pre-built image usage, it is the image user's responsibility to ensure that any use of this image complies with any relevant licenses and potential fees for all software contained within. We will have no indemnity or warranty coverage from suppliers. diff --git a/XeonE3/ubuntu-20.04/media/nginx/README.md b/XeonE3/ubuntu-20.04/media/nginx/README.md new file mode 100644 index 000000000..f462aa9dc --- /dev/null +++ b/XeonE3/ubuntu-20.04/media/nginx/README.md @@ -0,0 +1,50 @@ +This docker image is part of Open Visual Cloud software stacks. Optimized for the media creation and delivery use case. Optimized for NGINX web server that can be used for serving web content, load balancing, HTTP caching, or a reverse proxy. Also included Intel hardware accelaration software stack such as media SDK, media driver, gmmlib and libva. The docker image can be used in the FROM field of a downstream Dockerfile. + +## Supported tags and respective Dockerfile links + - [xeone3-ubuntu-2004-media-nginx](https://github.com/OpenVisualCloud/Dockerfiles/blob/v21.3/XeonE3/ubuntu-20.04/media/nginx/Dockerfile) + +## Quick reference +- #### Supported platform and OS + Intel® Xeon® E3 platform, Ubuntu 20.04 + +- #### Usage instructions: + [NGINX](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/doc/nginx.md) + + +- #### Getting started with Dockerfiles: + [OpenVisualCloud Dockerfiles Wiki](https://github.com/OpenVisualCloud/Dockerfiles/wiki) + +- #### File issues: + [OpenVisualCloud Dockerfiles Issues](https://github.com/OpenVisualCloud/Dockerfiles/issues) + + +## License +This docker installs third party components licensed under various open source licenses. The terms under which those components may be used and distributed can be found with the license document that is provided with those components. Please familiarize yourself with those terms to ensure your distribution of those components complies with the terms of those licenses. + + +| Components | License | +| ----- | ----- | +|Ubuntu| [Various](https://hub.docker.com/_/ubuntu) | +|nginx http flv|BSD 2-clause "Simplified" License| +|nginx upload module|BSD 3-clause "Simplified" License| +|nginx|BSD 2-clause "Simplified" License| +|libogg|BSD 3-clause "New" or "Revised" License| +|libvorbis|BSD 3-clause "New" or "Revised" License| +|Opus Interactive Audio Codec|BSD 3-clause "New" or "Revised" License| +|libvpx|BSD 3-clause "New" or "Revised" License| +|x264|GNU General Public License v2.0 or later| +|x265|GNU General Public License v2.0 or later| +|dav1d|BSD 2-clause "Simplified" License| +|Intel SVT-HEVC|BSD-2-Clause Plus Patent License| +|Intel SVT-AV1|BSD-2-Clause Plus Patent License| +|Intel SVT-VP9|BSD-2-Clause Plus Patent License| +|Intel Graphics Memory Management Library| MIT License| +|Intel libva| MIT License +|Intel media driver | MIT License| +|Intel media SDK|MIT License| +|OpenCV|BSD 3-clause "New" or "Revised" License| +|FFmpeg|GNU Lesser General Public License v2.1 or later| + + +More license information can be found in [components source package](https://github.com/OpenVisualCloud/Dockerfiles-Resources). +As for any pre-built image usage, it is the image user's responsibility to ensure that any use of this image complies with any relevant licenses and potential fees for all software contained within. We will have no indemnity or warranty coverage from suppliers. diff --git a/script/generate_readme.py b/script/generate_readme.py index cd300b6e3..df7447c6b 100755 --- a/script/generate_readme.py +++ b/script/generate_readme.py @@ -5,7 +5,7 @@ import os import sys -REPO_LINK = "https://github.com/OpenVisualCloud/Dockerfiles/blob/master/" +REPO_LINK = "https://github.com/OpenVisualCloud/Dockerfiles/blob/v21.3/" #Platform to full name platform_subs = { @@ -14,23 +14,60 @@ "VCA2" : "VCA2 platform", "QAT" : "QAT platform", "VCAC-A" : "VCAC-A platform", + "SG1": "SG1 platform" } #When image is based on another OVC image, this is used to find path of inherited image path_subs = { - "xeone3-ubuntu1804-media-ffmpeg" : "XeonE3/ubuntu-18.04/media/ffmpeg/", "xeone3-centos7-media-ffmpeg" : "XeonE3/centos-7/media/ffmpeg/", + "xeone3-ubuntu1804-media-ffmpeg" : "XeonE3/ubuntu-18.04/media/ffmpeg/", + "xeone3-ubuntu2004-media-ffmpeg" : "XeonE3/ubuntu-20.04/media/ffmpeg/", + "xeone3-centos7-media-dev" : "XeonE3/centos-7/media/dev/", + "xeone3-ubuntu1804-media-dev" : "XeonE3/ubuntu-18.04/media/dev/", + "xeone3-ubuntu2004-media-dev" : "XeonE3/ubuntu-20.04/media/dev/", + "xeon-centos7-media-ffmpeg" : "Xeon/centos-7/media/ffmpeg/", "xeon-ubuntu1804-media-ffmpeg" : "Xeon/ubuntu-18.04/media/ffmpeg/", + "xeon-ubuntu2004-media-ffmpeg" : "Xeon/ubuntu-20.04/media/ffmpeg/", + "xeon-centos7-media-dev" : "Xeon/centos-7/media/dev/", "xeon-ubuntu1804-media-dev" : "Xeon/ubuntu-18.04/media/dev/", + "xeon-ubuntu2004-media-dev" : "Xeon/ubuntu-20.04/media/dev/", + } + +#OS subs to their version detail +os_subs = { + "centos-7" : "CentOS-7", + "ubuntu-18.04" : "Ubuntu 18.04", + "ubuntu-20.04" : "Ubuntu 20.04" + } + +#included components links +included_subs = { + "nginx" : ["[NGINX](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/doc/nginx.md)"], + "svt" : ["[SVT](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/doc/svt.md)"], + "owt" : ["[OWT](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/doc/owt.md)"], + "owt360" : ["[OWT360](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/doc/owt360.md)"], + "ospray" : ["[OSPRay](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/doc/ospray.md)"], + "ospray-mpi" : ["[OSPRay-MPI](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/doc/ospray-mpi.md)"], + "ffmpeg" : ["[FFmpeg](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/doc/ffmpeg.md)"], + "gst" : ["[GStreamer](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/doc/gst.md)"], + "dev" : ["[FFmpeg](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/doc/ffmpeg.md)","[GStreamer](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/doc/gst.md)"] + } + +# License to be included based on m4 templates +license_subs = { "xeon-centos7-media-ffmpeg" : "Xeon/centos-7/media/ffmpeg/", + "xeon-ubuntu1804-media-ffmpeg" : "Xeon/ubuntu-18.04/media/ffmpeg/", + "xeon-ubuntu2004-media-ffmpeg" : "Xeon/ubuntu-20.04/media/ffmpeg/", "xeon-centos7-media-dev" : "Xeon/centos-7/media/dev/", + "xeon-ubuntu1804-media-dev" : "Xeon/ubuntu-18.04/media/dev/", + "xeon-ubuntu2004-media-dev" : "Xeon/ubuntu-20.04/media/dev/" } #OS subs to their version detail os_subs = { "centos-7" : "CentOS-7", - "centos-7.6" : "CentOS-7.6.1810", - "ubuntu-18.04" : "Ubuntu 18.04" + "ubuntu-18.04" : "Ubuntu 18.04", + "ubuntu-20.04" : "Ubuntu 20.04" } #included components links @@ -49,21 +86,23 @@ # License to be included based on m4 templates license_subs = { "dav1d" : ["|dav1d|BSD 2-clause \"Simplified\" License|"], - "dldt-ie" : ["|DLDT|Apache License v2.0|"], + "dldt-ie" : ["|OpenVINO|Apache License v2.0|"], "embree" : ["|embree|Apache License 2.0|"], "ffmpeg" : ["|FFmpeg|GNU Lesser General Public License v2.1 or later|"], - "ffmpeg-n4.1" : ["|FFmpeg|GNU Lesser General Public License v2.1 or later|"], "gmmlib" : ["|Intel Graphics Memory Management Library| MIT License|"], - "gst" : ["|gstreamer|GNU Lesser General Public License v2.1 or later|"], + "gmmlib.sg1" : ["|Intel Graphics Memory Management Library| MIT License|"], + "gst-core" : ["|gstreamer|GNU Lesser General Public License v2.1 or later|"], "gst-orc" : ["|gst orc|GNU Lesser General Public License v2.1 or later|"], - "gst-plugin-base" : ["|gst plugin base|GNU Lesser General Public License v2.1 or later|"], - "gst-plugin-bad" : ["|gst plugin bad|GNU Lesser General Public License v2.1 or later|"], - "gst-plugin-good" : ["|gst plugin good|GNU Lesser General Public License v2.1 or later|"], - "gst-plugin-libav" : ["|gst plugin libav|GNU Library General Public License Version 2|"], - "gst-plugin-svt" : ["|gst plugin svt|GNU Lesser General Public License v2.1 or later|"], - "gst-plugin-ugly" : ["|gst plugin ugly|GNU Lesser General Public License v2.1 or later|"], - "gst-plugin-vaapi" : ["|gst plugin vaapi|GNU Lesser General Public License v2.1 or later|"], - "gst-plugin-gva" : ["|gst plugin gva|MIT License|"], + "gst-plugins-base" : ["|gst plugins base|GNU Lesser General Public License v2.1 or later|"], + "gst-plugins-bad" : ["|gst plugins bad|GNU Lesser General Public License v2.1 or later|"], + "gst-plugins-good" : ["|gst plugins good|GNU Lesser General Public License v2.1 or later|"], + "gst-libav" : ["|gst libav|GNU Library General Public License Version 2.1 or later|"], + "gst-python" : ["|gst python|GNU Library General Public License Version 2.1|"], + "gst-svt" : ["|gst svt|GNU Lesser General Public License v2.1 or later|"], + "gst-plugins-ugly" : ["|gst plugins ugly|GNU Lesser General Public License v2.1 or later|"], + "gst-vaapi" : ["|gst vaapi|GNU Lesser General Public License v2.1 or later|"], + "gst-gva" : ["|gst video analytics|MIT License|"], + "hddl-openvino" : ["|openvino|End User License Agreement for the Intel(R) Software Development Products|"], "ispc" : ["|ispc|BSD 3-clause License|"], "libaom" : ["|Aomedia AV1 Codec Library|BSD 2-clause \"Simplified\" License|"], "libdrm" : ["|libdrm|MIT license|"], @@ -72,32 +111,44 @@ "libogg" : ["|libogg|BSD 3-clause \"New\" or \"Revised\" License|"], "libopus" : ["|Opus Interactive Audio Codec|BSD 3-clause \"New\" or \"Revised\" License|"], "librdkafka" : ["|librdkafka|BSD 2-clause \"Simplified\" License|"], + "libpahomqtt" : ["|paho.mqtt.c|Eclipse Public License - v 2.0|"], "libre" : ["|libre|BSD 3-clause License|"], "libsrtp2" : ["|libsrtp2|BSD 3-clause License|"], - "libva" : ["|Intel libva| MIT License"], + "libva2" : ["|Intel libva| MIT License"], + "libva2.sg1" : ["|Intel libva| MIT License"], "libvorbis" : ["|libvorbis|BSD 3-clause \"New\" or \"Revised\" License|"], "libvpx" : ["|libvpx|BSD 3-clause \"New\" or \"Revised\" License|"], "libx264" : ["|x264|GNU General Public License v2.0 or later|"], "libx265" : ["|x265|GNU General Public License v2.0 or later|"], - "media-driver" : ["|Intel media-driver | MIT License|"], - "media-sdk" : ["|Intel media SDK|MIT License|"], - "nginx-http-flv" : ["|NGINX_HTTP_FLV|BSD 2-clause \"Simplified\" License|"], - "nginx" : ["|NGINX|BSD 2-clause \"Simplified\" License|"], - "nginx-qat" : ["|asynch_mode_nginx |BSD 3-clause \"New\" or \"Revised\" License|"], - "nginx-upload" : ["|NGINX_Upload_Module|BSD 3-clause \"Simplified\" License|"], + "media-driver" : ["|Intel media driver | MIT License|"], + "media-driver.sg1" : ["|Intel media driver | MIT License|"], + "msdk" : ["|Intel media SDK|MIT License|"], + "msdk.sg1" : ["|Intel media SDK|MIT License|"], + "nginx-flv" : ["|nginx http flv|BSD 2-clause \"Simplified\" License|"], + "nginx" : ["|nginx|BSD 2-clause \"Simplified\" License|"], + "nginx-upload" : ["|nginx upload module|BSD 3-clause \"Simplified\" License|"], "nodetools" : ["|nodejs| MIT Open Source License|"], - "opencl" : ["|intel-opencl | MIT License|"], - "opencv" : ["|opencv|BSD 3-clause \"New\" or \"Revised\" License|"], - "OpenImageIO" : ["|oiio|BSD 3-clause License|,|openexr|BSD 3-clause \"New\" or \"Revised\" License|"], - "openssl" : ["|openssl|Apache License 2.0|"], - "openvino.binary" : ["|OpenVINO|End User License Agreement for the Intel(R) Software Development Products|"], + "oiio" : ["|OpenImageIO|BSD 3-clause License|,|openexr|BSD 3-clause \"New\" or \"Revised\" License|"], + "opencl" : ["|Intel opencl | MIT License|"], + "opencv" : ["|OpenCV|BSD 3-clause \"New\" or \"Revised\" License|"], + "openssl" : ["|OpenSSL|Apache License 2.0|"], + "openvino" : ["|OpenVINO|End User License Agreement for the Intel(R) Software Development Products|"], "ospray" : ["|ospray|Apache License v2.0|"], "ospray-mpi" : ["|ospray|Apache License v2.0|"], "owt360" : ["|owt-server|Apache License v2.0|","|owt-sdk|Apache License v2.0|","|owt-deps-webrtc|BSD 3-clause License|"], "owt" : ["|owt-server|Apache License v2.0|","|owt-sdk|Apache License v2.0|","|owt-deps-webrtc|BSD 3-clause License|"], - "qat-engine" : ["|qat-engine|BSD 3-clause \"New\" or \"Revised\" License|"], - "qat-openssl" : ["|openssl|Apache License 2.0|"], - "qat-zip" : ["|qat-zip|BSD 3-clause \"New\" or \"Revised\" License|"], + "owt-gst-base" : ["|gst plugins base|GNU Lesser General Public License v2.1 or later|"], + "owt-gst-bad" : ["|gst plugins bad|GNU Lesser General Public License v2.1 or later|"], + "owt-gst-good" : ["|gst plugins good|GNU Lesser General Public License v2.1 or later|"], + "owt-gst-gva" : ["|gst video analytics|MIT License|"], + "owt-gst-ugly" : ["|gst plugins ugly|GNU Lesser General Public License v2.1 or later|"], + "qat-cryptomb" : ["|ipp crypo|Apache-2.0 License|"], + "qat-engine" : ["|QAT OpenSSL engine|BSD 3-clause \"New\" or \"Revised\" License|"], + "qat-nginx" : ["|asynch mode nginx |BSD 3-clause \"New\" or \"Revised\" License|"], + "qat-openssl" : ["|OpenSSL|Apache License 2.0|"], + "qat-zip" : ["|QATzip|BSD 3-clause \"New\" or \"Revised\" License|"], + "scvp" : ["|360SCVP|BSD 3-clause \"New\" or \"Revised\" License|"], + "srs" : ["|Simple Realtime Server|MIT License|"], "svt-av1" : ["|Intel SVT-AV1|BSD-2-Clause Plus Patent License|"], "svt-hevc.1-3-0" : ["|Intel SVT-HEVC|BSD-2-Clause Plus Patent License|"], "svt-hevc" : ["|Intel SVT-HEVC|BSD-2-Clause Plus Patent License|"], @@ -106,7 +157,7 @@ } # M4 files for which no license is needed -license_exclude = ['automake', 'build-tools', 'build-tools-hddl', 'build-tools-hddl-layer', 'cleanup', 'cmake', 'install', 'install.pkgs', 'install.pkgs.owt', 'libfdk-aac', 'libmp3lame', 'nasm', 'nginx-cert', 'nginx-conf', 'qat', 'transform360', 'yasm', 'libva-utils', 'ospray-example_san-miguel', 'ospray-example_xfrog','libusb'] +license_exclude = ['automake', 'build-tools', 'build-tools-hddl', 'build-tools-hddl-layer', 'cleanup', 'cmake', 'install', 'install.pkgs', 'install.pkgs.owt', 'libfdk-aac', 'libmp3lame', 'nasm', 'nginx-cert', 'nginx-conf', 'qat-core', 'transform360', 'yasm', 'libva-utils', 'ospray-example_san-miguel', 'ospray-example_xfrog','libusb','begin','end','ubuntu', 'centos-repo','ipsecmb','meson','boost','vcaca-gst-gva'] # Find image platform / OS / image type / image name from file path def parse_ingredients(path): @@ -167,8 +218,14 @@ def inheritance_populate(handler_list, inherited_file_path): line = fh.readline() return inherited_entry_holder +def parse_inherited_file(inherited_file,image_os): + parsed_inherited_file = '' + image_os1 = image_os.replace("-","").replace(".","") + parsed_inherited_file = inherited_file.replace("OS_NAME`'patsubst(OS_VERSION,\\.)", image_os1) + return parsed_inherited_file + # Parse M4 to populate license info -def parse_m4(local_path): +def parse_m4(local_path,image_os): entry_holder = '' os_flag = False ovc_inheritance_flag = False @@ -176,19 +233,19 @@ def parse_m4(local_path): with open(local_path+'/Dockerfile.m4', 'r') as fp: line = fp.readline() while line: - if 'FROM' in line: - if 'FROM ubuntu' in line and not os_flag: - entry_holder += '|Ubuntu| [Various](https://hub.docker.com/_/ubuntu) |' - entry_holder += '\n' - os_flag = True - elif 'FROM centos' in line and not os_flag: - entry_holder += '|CentOS| [Various](https://hub.docker.com/_/centos) |' - entry_holder += '\n' - os_flag = True - elif 'FROM openvisualcloud' in line and not ovc_inheritance_flag: - inherited_file = line.split('/')[1].split(':')[0] - entry_holder += inheritance_populate(handler_list, path_subs[inherited_file]) - ovc_inheritance_flag = True + if 'ubuntu' in image_os and not os_flag: + entry_holder += '|Ubuntu| [Various](https://hub.docker.com/_/ubuntu) |' + entry_holder += '\n' + os_flag = True + elif 'centos' in image_os and not os_flag: + entry_holder += '|CentOS| [Various](https://hub.docker.com/_/centos) |' + entry_holder += '\n' + os_flag = True + elif 'FROM openvisualcloud' in line and not ovc_inheritance_flag: + inherited_file = line.split('/')[1].split(':')[0] + inherited_file_1 = parse_inherited_file(inherited_file,image_os) + entry_holder += inheritance_populate(handler_list, path_subs[inherited_file_1]) + ovc_inheritance_flag = True if 'm4' in line: m = re.search('[a-zA-Z0-9\-\.\_]+.m4', line) if m: @@ -208,7 +265,7 @@ def generate_license(local_path, image_name, image_type, image_os, image_platfor """ text_holder += "| Components | License |\n" text_holder += "| ----- | ----- |\n" - text_holder += parse_m4(local_path) + text_holder += parse_m4(local_path, image_os) text_holder += "\n\n" text_holder += """More license information can be found in [components source package](https://github.com/OpenVisualCloud/Dockerfiles-Resources). As for any pre-built image usage, it is the image user's responsibility to ensure that any use of this image complies with any relevant licenses and potential fees for all software contained within. We will have no indemnity or warranty coverage from suppliers. @@ -233,7 +290,7 @@ def create_readme(path, path_components): my_file.write("Included what are in FFmpeg or GStreamer media creation and delivery images . ") if image_type=="graphics": my_file.write("This image is for Intel OSPRay C++ application development. ") - if image_platform=="XeonE3" or image_platform=="VCA2" or image_platform=="VCAC-A": + if image_platform=="XeonE3" or image_platform=="SG1" or image_platform=="VCAC-A": my_file.write("Also included Intel hardware accelaration software stack such as media SDK, media driver, gmmlib and libva. ") my_file.write("The docker image can be used in the FROM field of a downstream Dockerfile. ") elif image_type=="analytics": @@ -244,7 +301,7 @@ def create_readme(path, path_components): my_file.write("Included what are in media delivery FFmpeg image, inferencing engine and video analytics plugins. ") if image_name=="hddldaemon": my_file.write("With OpenVINO HDDL daemon installed and configured. ") - if image_platform=="XeonE3" or image_platform=="VCA2" or image_platform=="VCAC-A" and image_name!="hddldaemon": + if image_platform=="XeonE3" or image_platform=="SG1" or image_platform=="VCAC-A" and image_name!="hddldaemon": my_file.write("Also included Intel hardware accelaration software stack such as media SDK, media driver, opencl, gmmlib and libva. ") my_file.write("The docker image can be used in the FROM field of a downstream Dockerfile. ") elif image_type=="media": @@ -257,7 +314,9 @@ def create_readme(path, path_components): my_file.write("Optimized for NGINX web server that can be used for serving web content, load balancing, HTTP caching, or a reverse proxy. ") if image_name=="svt": my_file.write("Image with SVT (Scalable Video Technology) Encoder and decoders. Ready to use SVT apps to try AV1, HEVC, VP9 transcoders. ") - if image_platform=="XeonE3" or image_platform=="VCA2": + if image_name=="srs": + my_file.write("Image with SRS high efficiency, stable and simple RTMP/HLS/FLV streaming cluster. ") + if image_platform=="XeonE3" or image_platform=="SG1" or image_platform=="VCAC-A": my_file.write("Also included Intel hardware accelaration software stack such as media SDK, media driver, gmmlib and libva. ") my_file.write("The docker image can be used in the FROM field of a downstream Dockerfile. ") elif image_type=="service": @@ -289,4 +348,5 @@ def create_readme(path, path_components): exit(1) path=sys.argv[1] +path1=path.split('/') create_readme(path, parse_ingredients(path)) From 21eac8924e852ff4e01bc3abf80365f10629e67b Mon Sep 17 00:00:00 2001 From: "Patel, Dhaval R" Date: Fri, 9 Apr 2021 09:46:31 -0700 Subject: [PATCH 02/13] Update dockerfiles --- QAT/centos-7/media/dev/Dockerfile | 4 ++-- QAT/centos-7/media/nginx/Dockerfile | 4 ++-- QAT/ubuntu-18.04/media/dev/Dockerfile | 4 ++-- QAT/ubuntu-18.04/media/nginx/Dockerfile | 4 ++-- QAT/ubuntu-20.04/media/dev/Dockerfile | 4 ++-- QAT/ubuntu-20.04/media/nginx/Dockerfile | 4 ++-- Xeon/centos-7/media/srs/Dockerfile | 4 ++-- Xeon/centos-7/service/owt-dev/Dockerfile | 6 +++--- Xeon/centos-7/service/owt/Dockerfile | 6 +++--- Xeon/centos-7/service/owt360/Dockerfile | 4 ++-- Xeon/ubuntu-18.04/media/srs/Dockerfile | 4 ++-- Xeon/ubuntu-18.04/service/owt-dev/Dockerfile | 6 +++--- Xeon/ubuntu-18.04/service/owt/Dockerfile | 6 +++--- Xeon/ubuntu-18.04/service/owt360/Dockerfile | 4 ++-- Xeon/ubuntu-20.04/media/srs/Dockerfile | 4 ++-- XeonE3/centos-7/service/owt-dev/Dockerfile | 6 +++--- XeonE3/centos-7/service/owt/Dockerfile | 6 +++--- XeonE3/centos-7/service/owt360/Dockerfile | 4 ++-- XeonE3/ubuntu-18.04/service/owt-dev/Dockerfile | 6 +++--- XeonE3/ubuntu-18.04/service/owt/Dockerfile | 6 +++--- XeonE3/ubuntu-18.04/service/owt360/Dockerfile | 4 ++-- 21 files changed, 50 insertions(+), 50 deletions(-) diff --git a/QAT/centos-7/media/dev/Dockerfile b/QAT/centos-7/media/dev/Dockerfile index 49af71c5f..22fdd9158 100644 --- a/QAT/centos-7/media/dev/Dockerfile +++ b/QAT/centos-7/media/dev/Dockerfile @@ -86,10 +86,10 @@ RUN cd /opt/build && \ RUN yum install -y wget tar gcc-c++ make libtool autoconf # build openssl -ARG OPENSSL_REPO=https://github.com/openssl/openssl/archive/OpenSSL_1_1_1i.tar.gz +ARG OPENSSL_REPO=https://github.com/openssl/openssl/archive/OpenSSL_1_1_1j.tar.gz RUN cd /opt/build && \ wget -O - ${OPENSSL_REPO} | tar xz && \ - cd openssl-OpenSSL_1_1_1i && \ + cd openssl-OpenSSL_1_1_1j && \ ./config no-ssl3 shared --prefix=/usr/local/ssl --openssldir=/usr/local/ssl -fPIC -Wl,-rpath=/usr/local/ssl/lib && \ make depend && \ make -s V=0 && \ diff --git a/QAT/centos-7/media/nginx/Dockerfile b/QAT/centos-7/media/nginx/Dockerfile index db9696e5c..99551ed3a 100644 --- a/QAT/centos-7/media/nginx/Dockerfile +++ b/QAT/centos-7/media/nginx/Dockerfile @@ -86,10 +86,10 @@ RUN cd /opt/build && \ RUN yum install -y wget tar gcc-c++ make libtool autoconf # build openssl -ARG OPENSSL_REPO=https://github.com/openssl/openssl/archive/OpenSSL_1_1_1i.tar.gz +ARG OPENSSL_REPO=https://github.com/openssl/openssl/archive/OpenSSL_1_1_1j.tar.gz RUN cd /opt/build && \ wget -O - ${OPENSSL_REPO} | tar xz && \ - cd openssl-OpenSSL_1_1_1i && \ + cd openssl-OpenSSL_1_1_1j && \ ./config no-ssl3 shared --prefix=/usr/local/ssl --openssldir=/usr/local/ssl -fPIC -Wl,-rpath=/usr/local/ssl/lib && \ make depend && \ make -s V=0 && \ diff --git a/QAT/ubuntu-18.04/media/dev/Dockerfile b/QAT/ubuntu-18.04/media/dev/Dockerfile index 4e75b9974..92551651f 100644 --- a/QAT/ubuntu-18.04/media/dev/Dockerfile +++ b/QAT/ubuntu-18.04/media/dev/Dockerfile @@ -83,10 +83,10 @@ RUN apt-get update && \ rm -rf /var/lib/apt/lists/* # build openssl -ARG OPENSSL_REPO=https://github.com/openssl/openssl/archive/OpenSSL_1_1_1i.tar.gz +ARG OPENSSL_REPO=https://github.com/openssl/openssl/archive/OpenSSL_1_1_1j.tar.gz RUN cd /opt/build && \ wget -O - ${OPENSSL_REPO} | tar xz && \ - cd openssl-OpenSSL_1_1_1i && \ + cd openssl-OpenSSL_1_1_1j && \ ./config no-ssl3 shared --prefix=/usr/local/ssl --openssldir=/usr/local/ssl -fPIC -Wl,-rpath=/usr/local/ssl/lib && \ make depend && \ make -s V=0 && \ diff --git a/QAT/ubuntu-18.04/media/nginx/Dockerfile b/QAT/ubuntu-18.04/media/nginx/Dockerfile index 2fc274cef..2ad2d7136 100644 --- a/QAT/ubuntu-18.04/media/nginx/Dockerfile +++ b/QAT/ubuntu-18.04/media/nginx/Dockerfile @@ -83,10 +83,10 @@ RUN apt-get update && \ rm -rf /var/lib/apt/lists/* # build openssl -ARG OPENSSL_REPO=https://github.com/openssl/openssl/archive/OpenSSL_1_1_1i.tar.gz +ARG OPENSSL_REPO=https://github.com/openssl/openssl/archive/OpenSSL_1_1_1j.tar.gz RUN cd /opt/build && \ wget -O - ${OPENSSL_REPO} | tar xz && \ - cd openssl-OpenSSL_1_1_1i && \ + cd openssl-OpenSSL_1_1_1j && \ ./config no-ssl3 shared --prefix=/usr/local/ssl --openssldir=/usr/local/ssl -fPIC -Wl,-rpath=/usr/local/ssl/lib && \ make depend && \ make -s V=0 && \ diff --git a/QAT/ubuntu-20.04/media/dev/Dockerfile b/QAT/ubuntu-20.04/media/dev/Dockerfile index 26b4e39d8..b4156f56d 100644 --- a/QAT/ubuntu-20.04/media/dev/Dockerfile +++ b/QAT/ubuntu-20.04/media/dev/Dockerfile @@ -83,10 +83,10 @@ RUN apt-get update && \ rm -rf /var/lib/apt/lists/* # build openssl -ARG OPENSSL_REPO=https://github.com/openssl/openssl/archive/OpenSSL_1_1_1i.tar.gz +ARG OPENSSL_REPO=https://github.com/openssl/openssl/archive/OpenSSL_1_1_1j.tar.gz RUN cd /opt/build && \ wget -O - ${OPENSSL_REPO} | tar xz && \ - cd openssl-OpenSSL_1_1_1i && \ + cd openssl-OpenSSL_1_1_1j && \ ./config no-ssl3 shared --prefix=/usr/local/ssl --openssldir=/usr/local/ssl -fPIC -Wl,-rpath=/usr/local/ssl/lib && \ make depend && \ make -s V=0 && \ diff --git a/QAT/ubuntu-20.04/media/nginx/Dockerfile b/QAT/ubuntu-20.04/media/nginx/Dockerfile index b55995fa5..899f4d8fa 100644 --- a/QAT/ubuntu-20.04/media/nginx/Dockerfile +++ b/QAT/ubuntu-20.04/media/nginx/Dockerfile @@ -83,10 +83,10 @@ RUN apt-get update && \ rm -rf /var/lib/apt/lists/* # build openssl -ARG OPENSSL_REPO=https://github.com/openssl/openssl/archive/OpenSSL_1_1_1i.tar.gz +ARG OPENSSL_REPO=https://github.com/openssl/openssl/archive/OpenSSL_1_1_1j.tar.gz RUN cd /opt/build && \ wget -O - ${OPENSSL_REPO} | tar xz && \ - cd openssl-OpenSSL_1_1_1i && \ + cd openssl-OpenSSL_1_1_1j && \ ./config no-ssl3 shared --prefix=/usr/local/ssl --openssldir=/usr/local/ssl -fPIC -Wl,-rpath=/usr/local/ssl/lib && \ make depend && \ make -s V=0 && \ diff --git a/Xeon/centos-7/media/srs/Dockerfile b/Xeon/centos-7/media/srs/Dockerfile index 0f3e14dbf..2d4cd090d 100644 --- a/Xeon/centos-7/media/srs/Dockerfile +++ b/Xeon/centos-7/media/srs/Dockerfile @@ -42,10 +42,10 @@ ENV PKG_CONFIG_PATH=/usr/local/lib64/pkgconfig RUN yum install -y wget tar gcc-c++ make libtool autoconf # build openssl -ARG OPENSSL_REPO=https://github.com/openssl/openssl/archive/OpenSSL_1_1_1i.tar.gz +ARG OPENSSL_REPO=https://github.com/openssl/openssl/archive/OpenSSL_1_1_1j.tar.gz RUN cd /opt/build && \ wget -O - ${OPENSSL_REPO} | tar xz && \ - cd openssl-OpenSSL_1_1_1i && \ + cd openssl-OpenSSL_1_1_1j && \ ./config no-ssl3 shared --prefix=/usr/local/ssl --openssldir=/usr/local/ssl -fPIC -Wl,-rpath=/usr/local/ssl/lib && \ make depend && \ make -s V=0 && \ diff --git a/Xeon/centos-7/service/owt-dev/Dockerfile b/Xeon/centos-7/service/owt-dev/Dockerfile index 4e210e323..4ac873595 100644 --- a/Xeon/centos-7/service/owt-dev/Dockerfile +++ b/Xeon/centos-7/service/owt-dev/Dockerfile @@ -57,10 +57,10 @@ ENV PKG_CONFIG_PATH=/usr/local/lib64/pkgconfig RUN yum install -y wget tar gcc-c++ make libtool autoconf # build openssl -ARG OPENSSL_REPO=https://github.com/openssl/openssl/archive/OpenSSL_1_1_1i.tar.gz +ARG OPENSSL_REPO=https://github.com/openssl/openssl/archive/OpenSSL_1_1_1j.tar.gz RUN cd /opt/build && \ wget -O - ${OPENSSL_REPO} | tar xz && \ - cd openssl-OpenSSL_1_1_1i && \ + cd openssl-OpenSSL_1_1_1j && \ ./config no-ssl3 shared --prefix=/usr/local/ssl --openssldir=/usr/local/ssl -fPIC -Wl,-rpath=/usr/local/ssl/lib && \ make depend && \ make -s V=0 && \ @@ -615,7 +615,7 @@ ARG OWT_REPO=https://github.com/open-webrtc-toolkit/owt-server RUN cd /opt/build && \ git clone -b master ${OWT_REPO} && \ cd owt-server && \ - git reset --hard 387db8dfeaf52818cc248b34d990f6bdb222ecc4 + git reset --hard 37bc75675b9b28e638abc532b3ef0b37704eb4e3 # Prep OpenH264 RUN mkdir -p /opt/build/owt-server/third_party/openh264 && \ diff --git a/Xeon/centos-7/service/owt/Dockerfile b/Xeon/centos-7/service/owt/Dockerfile index 5f24fbac8..bab5d0450 100644 --- a/Xeon/centos-7/service/owt/Dockerfile +++ b/Xeon/centos-7/service/owt/Dockerfile @@ -58,10 +58,10 @@ ENV PKG_CONFIG_PATH=/usr/local/lib64/pkgconfig RUN yum install -y wget tar gcc-c++ make libtool autoconf # build openssl -ARG OPENSSL_REPO=https://github.com/openssl/openssl/archive/OpenSSL_1_1_1i.tar.gz +ARG OPENSSL_REPO=https://github.com/openssl/openssl/archive/OpenSSL_1_1_1j.tar.gz RUN cd /opt/build && \ wget -O - ${OPENSSL_REPO} | tar xz && \ - cd openssl-OpenSSL_1_1_1i && \ + cd openssl-OpenSSL_1_1_1j && \ ./config no-ssl3 shared --prefix=/usr/local/ssl --openssldir=/usr/local/ssl -fPIC -Wl,-rpath=/usr/local/ssl/lib && \ make depend && \ make -s V=0 && \ @@ -616,7 +616,7 @@ ARG OWT_REPO=https://github.com/open-webrtc-toolkit/owt-server RUN cd /opt/build && \ git clone -b master ${OWT_REPO} && \ cd owt-server && \ - git reset --hard 387db8dfeaf52818cc248b34d990f6bdb222ecc4 + git reset --hard 37bc75675b9b28e638abc532b3ef0b37704eb4e3 # Prep OpenH264 RUN mkdir -p /opt/build/owt-server/third_party/openh264 && \ diff --git a/Xeon/centos-7/service/owt360/Dockerfile b/Xeon/centos-7/service/owt360/Dockerfile index 471aa9e2c..f77323b26 100644 --- a/Xeon/centos-7/service/owt360/Dockerfile +++ b/Xeon/centos-7/service/owt360/Dockerfile @@ -58,10 +58,10 @@ ENV PKG_CONFIG_PATH=/usr/local/lib64/pkgconfig RUN yum install -y wget tar gcc-c++ make libtool autoconf # build openssl -ARG OPENSSL_REPO=https://github.com/openssl/openssl/archive/OpenSSL_1_1_1i.tar.gz +ARG OPENSSL_REPO=https://github.com/openssl/openssl/archive/OpenSSL_1_1_1j.tar.gz RUN cd /opt/build && \ wget -O - ${OPENSSL_REPO} | tar xz && \ - cd openssl-OpenSSL_1_1_1i && \ + cd openssl-OpenSSL_1_1_1j && \ ./config no-ssl3 shared --prefix=/usr/local/ssl --openssldir=/usr/local/ssl -fPIC -Wl,-rpath=/usr/local/ssl/lib && \ make depend && \ make -s V=0 && \ diff --git a/Xeon/ubuntu-18.04/media/srs/Dockerfile b/Xeon/ubuntu-18.04/media/srs/Dockerfile index 4d1eaac67..78a8e7cca 100644 --- a/Xeon/ubuntu-18.04/media/srs/Dockerfile +++ b/Xeon/ubuntu-18.04/media/srs/Dockerfile @@ -45,10 +45,10 @@ RUN apt-get update && \ rm -rf /var/lib/apt/lists/* # build openssl -ARG OPENSSL_REPO=https://github.com/openssl/openssl/archive/OpenSSL_1_1_1i.tar.gz +ARG OPENSSL_REPO=https://github.com/openssl/openssl/archive/OpenSSL_1_1_1j.tar.gz RUN cd /opt/build && \ wget -O - ${OPENSSL_REPO} | tar xz && \ - cd openssl-OpenSSL_1_1_1i && \ + cd openssl-OpenSSL_1_1_1j && \ ./config no-ssl3 shared --prefix=/usr/local/ssl --openssldir=/usr/local/ssl -fPIC -Wl,-rpath=/usr/local/ssl/lib && \ make depend && \ make -s V=0 && \ diff --git a/Xeon/ubuntu-18.04/service/owt-dev/Dockerfile b/Xeon/ubuntu-18.04/service/owt-dev/Dockerfile index 2a39acd4e..990baae77 100644 --- a/Xeon/ubuntu-18.04/service/owt-dev/Dockerfile +++ b/Xeon/ubuntu-18.04/service/owt-dev/Dockerfile @@ -59,10 +59,10 @@ RUN apt-get update && \ rm -rf /var/lib/apt/lists/* # build openssl -ARG OPENSSL_REPO=https://github.com/openssl/openssl/archive/OpenSSL_1_1_1i.tar.gz +ARG OPENSSL_REPO=https://github.com/openssl/openssl/archive/OpenSSL_1_1_1j.tar.gz RUN cd /opt/build && \ wget -O - ${OPENSSL_REPO} | tar xz && \ - cd openssl-OpenSSL_1_1_1i && \ + cd openssl-OpenSSL_1_1_1j && \ ./config no-ssl3 shared --prefix=/usr/local/ssl --openssldir=/usr/local/ssl -fPIC -Wl,-rpath=/usr/local/ssl/lib && \ make depend && \ make -s V=0 && \ @@ -658,7 +658,7 @@ ARG OWT_REPO=https://github.com/open-webrtc-toolkit/owt-server RUN cd /opt/build && \ git clone -b master ${OWT_REPO} && \ cd owt-server && \ - git reset --hard 387db8dfeaf52818cc248b34d990f6bdb222ecc4 + git reset --hard 37bc75675b9b28e638abc532b3ef0b37704eb4e3 # Prep OpenH264 RUN mkdir -p /opt/build/owt-server/third_party/openh264 && \ diff --git a/Xeon/ubuntu-18.04/service/owt/Dockerfile b/Xeon/ubuntu-18.04/service/owt/Dockerfile index 0ed49c68c..9f4fee3b9 100644 --- a/Xeon/ubuntu-18.04/service/owt/Dockerfile +++ b/Xeon/ubuntu-18.04/service/owt/Dockerfile @@ -59,10 +59,10 @@ RUN apt-get update && \ rm -rf /var/lib/apt/lists/* # build openssl -ARG OPENSSL_REPO=https://github.com/openssl/openssl/archive/OpenSSL_1_1_1i.tar.gz +ARG OPENSSL_REPO=https://github.com/openssl/openssl/archive/OpenSSL_1_1_1j.tar.gz RUN cd /opt/build && \ wget -O - ${OPENSSL_REPO} | tar xz && \ - cd openssl-OpenSSL_1_1_1i && \ + cd openssl-OpenSSL_1_1_1j && \ ./config no-ssl3 shared --prefix=/usr/local/ssl --openssldir=/usr/local/ssl -fPIC -Wl,-rpath=/usr/local/ssl/lib && \ make depend && \ make -s V=0 && \ @@ -658,7 +658,7 @@ ARG OWT_REPO=https://github.com/open-webrtc-toolkit/owt-server RUN cd /opt/build && \ git clone -b master ${OWT_REPO} && \ cd owt-server && \ - git reset --hard 387db8dfeaf52818cc248b34d990f6bdb222ecc4 + git reset --hard 37bc75675b9b28e638abc532b3ef0b37704eb4e3 # Prep OpenH264 RUN mkdir -p /opt/build/owt-server/third_party/openh264 && \ diff --git a/Xeon/ubuntu-18.04/service/owt360/Dockerfile b/Xeon/ubuntu-18.04/service/owt360/Dockerfile index 7520c1ddd..622bd8e8d 100644 --- a/Xeon/ubuntu-18.04/service/owt360/Dockerfile +++ b/Xeon/ubuntu-18.04/service/owt360/Dockerfile @@ -60,10 +60,10 @@ RUN apt-get update && \ rm -rf /var/lib/apt/lists/* # build openssl -ARG OPENSSL_REPO=https://github.com/openssl/openssl/archive/OpenSSL_1_1_1i.tar.gz +ARG OPENSSL_REPO=https://github.com/openssl/openssl/archive/OpenSSL_1_1_1j.tar.gz RUN cd /opt/build && \ wget -O - ${OPENSSL_REPO} | tar xz && \ - cd openssl-OpenSSL_1_1_1i && \ + cd openssl-OpenSSL_1_1_1j && \ ./config no-ssl3 shared --prefix=/usr/local/ssl --openssldir=/usr/local/ssl -fPIC -Wl,-rpath=/usr/local/ssl/lib && \ make depend && \ make -s V=0 && \ diff --git a/Xeon/ubuntu-20.04/media/srs/Dockerfile b/Xeon/ubuntu-20.04/media/srs/Dockerfile index 52552af83..6d6b38c6a 100644 --- a/Xeon/ubuntu-20.04/media/srs/Dockerfile +++ b/Xeon/ubuntu-20.04/media/srs/Dockerfile @@ -45,10 +45,10 @@ RUN apt-get update && \ rm -rf /var/lib/apt/lists/* # build openssl -ARG OPENSSL_REPO=https://github.com/openssl/openssl/archive/OpenSSL_1_1_1i.tar.gz +ARG OPENSSL_REPO=https://github.com/openssl/openssl/archive/OpenSSL_1_1_1j.tar.gz RUN cd /opt/build && \ wget -O - ${OPENSSL_REPO} | tar xz && \ - cd openssl-OpenSSL_1_1_1i && \ + cd openssl-OpenSSL_1_1_1j && \ ./config no-ssl3 shared --prefix=/usr/local/ssl --openssldir=/usr/local/ssl -fPIC -Wl,-rpath=/usr/local/ssl/lib && \ make depend && \ make -s V=0 && \ diff --git a/XeonE3/centos-7/service/owt-dev/Dockerfile b/XeonE3/centos-7/service/owt-dev/Dockerfile index 66ce8a666..14279d3e1 100644 --- a/XeonE3/centos-7/service/owt-dev/Dockerfile +++ b/XeonE3/centos-7/service/owt-dev/Dockerfile @@ -68,10 +68,10 @@ RUN cd /opt/build && \ RUN yum install -y wget tar gcc-c++ make libtool autoconf # build openssl -ARG OPENSSL_REPO=https://github.com/openssl/openssl/archive/OpenSSL_1_1_1i.tar.gz +ARG OPENSSL_REPO=https://github.com/openssl/openssl/archive/OpenSSL_1_1_1j.tar.gz RUN cd /opt/build && \ wget -O - ${OPENSSL_REPO} | tar xz && \ - cd openssl-OpenSSL_1_1_1i && \ + cd openssl-OpenSSL_1_1_1j && \ ./config no-ssl3 shared --prefix=/usr/local/ssl --openssldir=/usr/local/ssl -fPIC -Wl,-rpath=/usr/local/ssl/lib && \ make depend && \ make -s V=0 && \ @@ -668,7 +668,7 @@ ARG OWT_REPO=https://github.com/open-webrtc-toolkit/owt-server RUN cd /opt/build && \ git clone -b master ${OWT_REPO} && \ cd owt-server && \ - git reset --hard 387db8dfeaf52818cc248b34d990f6bdb222ecc4 + git reset --hard 37bc75675b9b28e638abc532b3ef0b37704eb4e3 # Prep OpenH264 RUN mkdir -p /opt/build/owt-server/third_party/openh264 && \ diff --git a/XeonE3/centos-7/service/owt/Dockerfile b/XeonE3/centos-7/service/owt/Dockerfile index 5ef9fa70e..87fe776dd 100644 --- a/XeonE3/centos-7/service/owt/Dockerfile +++ b/XeonE3/centos-7/service/owt/Dockerfile @@ -69,10 +69,10 @@ RUN cd /opt/build && \ RUN yum install -y wget tar gcc-c++ make libtool autoconf # build openssl -ARG OPENSSL_REPO=https://github.com/openssl/openssl/archive/OpenSSL_1_1_1i.tar.gz +ARG OPENSSL_REPO=https://github.com/openssl/openssl/archive/OpenSSL_1_1_1j.tar.gz RUN cd /opt/build && \ wget -O - ${OPENSSL_REPO} | tar xz && \ - cd openssl-OpenSSL_1_1_1i && \ + cd openssl-OpenSSL_1_1_1j && \ ./config no-ssl3 shared --prefix=/usr/local/ssl --openssldir=/usr/local/ssl -fPIC -Wl,-rpath=/usr/local/ssl/lib && \ make depend && \ make -s V=0 && \ @@ -669,7 +669,7 @@ ARG OWT_REPO=https://github.com/open-webrtc-toolkit/owt-server RUN cd /opt/build && \ git clone -b master ${OWT_REPO} && \ cd owt-server && \ - git reset --hard 387db8dfeaf52818cc248b34d990f6bdb222ecc4 + git reset --hard 37bc75675b9b28e638abc532b3ef0b37704eb4e3 # Prep OpenH264 RUN mkdir -p /opt/build/owt-server/third_party/openh264 && \ diff --git a/XeonE3/centos-7/service/owt360/Dockerfile b/XeonE3/centos-7/service/owt360/Dockerfile index 0dd0f1a67..f4a6eeb18 100644 --- a/XeonE3/centos-7/service/owt360/Dockerfile +++ b/XeonE3/centos-7/service/owt360/Dockerfile @@ -69,10 +69,10 @@ RUN cd /opt/build && \ RUN yum install -y wget tar gcc-c++ make libtool autoconf # build openssl -ARG OPENSSL_REPO=https://github.com/openssl/openssl/archive/OpenSSL_1_1_1i.tar.gz +ARG OPENSSL_REPO=https://github.com/openssl/openssl/archive/OpenSSL_1_1_1j.tar.gz RUN cd /opt/build && \ wget -O - ${OPENSSL_REPO} | tar xz && \ - cd openssl-OpenSSL_1_1_1i && \ + cd openssl-OpenSSL_1_1_1j && \ ./config no-ssl3 shared --prefix=/usr/local/ssl --openssldir=/usr/local/ssl -fPIC -Wl,-rpath=/usr/local/ssl/lib && \ make depend && \ make -s V=0 && \ diff --git a/XeonE3/ubuntu-18.04/service/owt-dev/Dockerfile b/XeonE3/ubuntu-18.04/service/owt-dev/Dockerfile index b6b760eb4..41d441f94 100644 --- a/XeonE3/ubuntu-18.04/service/owt-dev/Dockerfile +++ b/XeonE3/ubuntu-18.04/service/owt-dev/Dockerfile @@ -59,10 +59,10 @@ RUN apt-get update && \ rm -rf /var/lib/apt/lists/* # build openssl -ARG OPENSSL_REPO=https://github.com/openssl/openssl/archive/OpenSSL_1_1_1i.tar.gz +ARG OPENSSL_REPO=https://github.com/openssl/openssl/archive/OpenSSL_1_1_1j.tar.gz RUN cd /opt/build && \ wget -O - ${OPENSSL_REPO} | tar xz && \ - cd openssl-OpenSSL_1_1_1i && \ + cd openssl-OpenSSL_1_1_1j && \ ./config no-ssl3 shared --prefix=/usr/local/ssl --openssldir=/usr/local/ssl -fPIC -Wl,-rpath=/usr/local/ssl/lib && \ make depend && \ make -s V=0 && \ @@ -729,7 +729,7 @@ ARG OWT_REPO=https://github.com/open-webrtc-toolkit/owt-server RUN cd /opt/build && \ git clone -b master ${OWT_REPO} && \ cd owt-server && \ - git reset --hard 387db8dfeaf52818cc248b34d990f6bdb222ecc4 + git reset --hard 37bc75675b9b28e638abc532b3ef0b37704eb4e3 # Prep OpenH264 RUN mkdir -p /opt/build/owt-server/third_party/openh264 && \ diff --git a/XeonE3/ubuntu-18.04/service/owt/Dockerfile b/XeonE3/ubuntu-18.04/service/owt/Dockerfile index 744b07497..dc32d2188 100644 --- a/XeonE3/ubuntu-18.04/service/owt/Dockerfile +++ b/XeonE3/ubuntu-18.04/service/owt/Dockerfile @@ -59,10 +59,10 @@ RUN apt-get update && \ rm -rf /var/lib/apt/lists/* # build openssl -ARG OPENSSL_REPO=https://github.com/openssl/openssl/archive/OpenSSL_1_1_1i.tar.gz +ARG OPENSSL_REPO=https://github.com/openssl/openssl/archive/OpenSSL_1_1_1j.tar.gz RUN cd /opt/build && \ wget -O - ${OPENSSL_REPO} | tar xz && \ - cd openssl-OpenSSL_1_1_1i && \ + cd openssl-OpenSSL_1_1_1j && \ ./config no-ssl3 shared --prefix=/usr/local/ssl --openssldir=/usr/local/ssl -fPIC -Wl,-rpath=/usr/local/ssl/lib && \ make depend && \ make -s V=0 && \ @@ -729,7 +729,7 @@ ARG OWT_REPO=https://github.com/open-webrtc-toolkit/owt-server RUN cd /opt/build && \ git clone -b master ${OWT_REPO} && \ cd owt-server && \ - git reset --hard 387db8dfeaf52818cc248b34d990f6bdb222ecc4 + git reset --hard 37bc75675b9b28e638abc532b3ef0b37704eb4e3 # Prep OpenH264 RUN mkdir -p /opt/build/owt-server/third_party/openh264 && \ diff --git a/XeonE3/ubuntu-18.04/service/owt360/Dockerfile b/XeonE3/ubuntu-18.04/service/owt360/Dockerfile index f863d617b..2d3092bf6 100644 --- a/XeonE3/ubuntu-18.04/service/owt360/Dockerfile +++ b/XeonE3/ubuntu-18.04/service/owt360/Dockerfile @@ -60,10 +60,10 @@ RUN apt-get update && \ rm -rf /var/lib/apt/lists/* # build openssl -ARG OPENSSL_REPO=https://github.com/openssl/openssl/archive/OpenSSL_1_1_1i.tar.gz +ARG OPENSSL_REPO=https://github.com/openssl/openssl/archive/OpenSSL_1_1_1j.tar.gz RUN cd /opt/build && \ wget -O - ${OPENSSL_REPO} | tar xz && \ - cd openssl-OpenSSL_1_1_1i && \ + cd openssl-OpenSSL_1_1_1j && \ ./config no-ssl3 shared --prefix=/usr/local/ssl --openssldir=/usr/local/ssl -fPIC -Wl,-rpath=/usr/local/ssl/lib && \ make depend && \ make -s V=0 && \ From b9b31a7a1ce181192887185200c3efd54a958795 Mon Sep 17 00:00:00 2001 From: dpatel257 Date: Mon, 21 Jun 2021 23:32:43 -0700 Subject: [PATCH 03/13] [master] Fix Opencv 4.5.2 build with Toolset on Centos 7 (#746) * Update Docker image README (#704) * update README * Update dockerfiles * fix opencv 4.5.2 build with toolset Co-authored-by: jhou5 --- SG1/centos-7/media/ffmpeg/Dockerfile | 10 +++++----- SG1/ubuntu-18.04/media/ffmpeg/Dockerfile | 4 ++-- SG1/ubuntu-20.04/media/ffmpeg/Dockerfile | 4 ++-- VCAC-A/ubuntu-18.04/analytics/dev/Dockerfile | 4 ++-- VCAC-A/ubuntu-18.04/analytics/ffmpeg/Dockerfile | 4 ++-- VCAC-A/ubuntu-18.04/analytics/gst/Dockerfile | 4 ++-- VCAC-A/ubuntu-20.04/analytics/dev/Dockerfile | 4 ++-- VCAC-A/ubuntu-20.04/analytics/ffmpeg/Dockerfile | 4 ++-- VCAC-A/ubuntu-20.04/analytics/gst/Dockerfile | 4 ++-- Xeon/centos-7/analytics/dev/Dockerfile | 10 +++++----- Xeon/centos-7/analytics/ffmpeg/Dockerfile | 10 +++++----- Xeon/centos-7/analytics/gst/Dockerfile | 10 +++++----- Xeon/centos-7/media/ffmpeg/Dockerfile | 10 +++++----- Xeon/centos-7/service/owt-dev/Dockerfile | 10 +++++----- Xeon/centos-7/service/owt/Dockerfile | 10 +++++----- Xeon/centos-7/service/owt360/Dockerfile | 10 +++++----- Xeon/ubuntu-18.04/analytics/dev/Dockerfile | 4 ++-- Xeon/ubuntu-18.04/analytics/ffmpeg/Dockerfile | 4 ++-- Xeon/ubuntu-18.04/analytics/gst/Dockerfile | 4 ++-- Xeon/ubuntu-18.04/media/ffmpeg/Dockerfile | 4 ++-- Xeon/ubuntu-18.04/service/owt-dev/Dockerfile | 4 ++-- Xeon/ubuntu-18.04/service/owt/Dockerfile | 4 ++-- Xeon/ubuntu-18.04/service/owt360/Dockerfile | 4 ++-- Xeon/ubuntu-20.04/analytics/dev/Dockerfile | 4 ++-- Xeon/ubuntu-20.04/analytics/ffmpeg/Dockerfile | 4 ++-- Xeon/ubuntu-20.04/analytics/gst/Dockerfile | 4 ++-- Xeon/ubuntu-20.04/media/ffmpeg/Dockerfile | 4 ++-- XeonE3/centos-7/analytics/dev/Dockerfile | 10 +++++----- XeonE3/centos-7/analytics/ffmpeg/Dockerfile | 10 +++++----- XeonE3/centos-7/analytics/gst/Dockerfile | 10 +++++----- XeonE3/centos-7/media/ffmpeg/Dockerfile | 10 +++++----- XeonE3/centos-7/service/owt-dev/Dockerfile | 10 +++++----- XeonE3/centos-7/service/owt/Dockerfile | 10 +++++----- XeonE3/centos-7/service/owt360/Dockerfile | 10 +++++----- XeonE3/ubuntu-18.04/analytics/dev/Dockerfile | 4 ++-- XeonE3/ubuntu-18.04/analytics/ffmpeg/Dockerfile | 4 ++-- XeonE3/ubuntu-18.04/analytics/gst/Dockerfile | 4 ++-- XeonE3/ubuntu-18.04/media/ffmpeg/Dockerfile | 4 ++-- XeonE3/ubuntu-18.04/service/owt-dev/Dockerfile | 4 ++-- XeonE3/ubuntu-18.04/service/owt/Dockerfile | 4 ++-- XeonE3/ubuntu-18.04/service/owt360/Dockerfile | 4 ++-- XeonE3/ubuntu-20.04/analytics/dev/Dockerfile | 4 ++-- XeonE3/ubuntu-20.04/analytics/ffmpeg/Dockerfile | 4 ++-- XeonE3/ubuntu-20.04/analytics/gst/Dockerfile | 4 ++-- XeonE3/ubuntu-20.04/media/ffmpeg/Dockerfile | 4 ++-- template/components/opencv.m4 | 13 ++++++++----- 46 files changed, 143 insertions(+), 140 deletions(-) diff --git a/SG1/centos-7/media/ffmpeg/Dockerfile b/SG1/centos-7/media/ffmpeg/Dockerfile index 272b7368b..99370b139 100644 --- a/SG1/centos-7/media/ffmpeg/Dockerfile +++ b/SG1/centos-7/media/ffmpeg/Dockerfile @@ -293,7 +293,7 @@ RUN cd /opt/build && \ wget -O - ${OPENCV_REPO} | tar xz # TODO: file a bug against opencv since they do not accept full libdir RUN cd /opt/build/opencv-4.5.2 && mkdir build && cd build && \ - cmake \ + (. /opt/rh/devtoolset-9/enable && cmake \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr/local \ -DCMAKE_INSTALL_LIBDIR=lib64 \ @@ -303,7 +303,7 @@ RUN cd /opt/build/opencv-4.5.2 && mkdir build && cd build && \ -DBUILD_PERF_TESTS=OFF \ -DBUILD_TESTS=OFF \ .. && \ - make -j "$(nproc)" && \ + make -j $(nproc) ) && \ make install DESTDIR=/opt/dist && \ make install @@ -339,7 +339,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/opencv-4.5.2/build && \ rm -rf ./* && \ - cmake \ + (. /opt/rh/devtoolset-9/enable && cmake \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr/local \ -DCMAKE_INSTALL_LIBDIR=lib64 \ @@ -350,8 +350,8 @@ RUN cd /opt/build/opencv-4.5.2/build && \ -DBUILD_TESTS=OFF \ .. && \ cd modules/videoio && \ - make -j "$(nproc)" && \ - cp -f ../../lib/libopencv_videoio.so.4.5.2 /opt/dist/usr/local/lib64 + make -j $(nproc) && \ + cp -f ../../lib/libopencv_videoio.so.4.5.2 /opt/dist/usr/local/lib64 ) # cleanup RUN rm -rf /opt/dist/usr/local/include && \ diff --git a/SG1/ubuntu-18.04/media/ffmpeg/Dockerfile b/SG1/ubuntu-18.04/media/ffmpeg/Dockerfile index 64d145c13..14d1a6abc 100644 --- a/SG1/ubuntu-18.04/media/ffmpeg/Dockerfile +++ b/SG1/ubuntu-18.04/media/ffmpeg/Dockerfile @@ -358,7 +358,7 @@ RUN cd /opt/build/opencv-4.5.2 && mkdir build && cd build && \ -DBUILD_PERF_TESTS=OFF \ -DBUILD_TESTS=OFF \ .. && \ - make -j "$(nproc)" && \ + make -j $(nproc) && \ make install DESTDIR=/opt/dist && \ make install @@ -408,7 +408,7 @@ RUN cd /opt/build/opencv-4.5.2/build && \ -DBUILD_TESTS=OFF \ .. && \ cd modules/videoio && \ - make -j "$(nproc)" && \ + make -j $(nproc) && \ cp -f ../../lib/libopencv_videoio.so.4.5.2 /opt/dist/usr/local/lib # cleanup diff --git a/SG1/ubuntu-20.04/media/ffmpeg/Dockerfile b/SG1/ubuntu-20.04/media/ffmpeg/Dockerfile index 283d3b030..23cb7f4a8 100644 --- a/SG1/ubuntu-20.04/media/ffmpeg/Dockerfile +++ b/SG1/ubuntu-20.04/media/ffmpeg/Dockerfile @@ -346,7 +346,7 @@ RUN cd /opt/build/opencv-4.5.2 && mkdir build && cd build && \ -DBUILD_PERF_TESTS=OFF \ -DBUILD_TESTS=OFF \ .. && \ - make -j "$(nproc)" && \ + make -j $(nproc) && \ make install DESTDIR=/opt/dist && \ make install @@ -396,7 +396,7 @@ RUN cd /opt/build/opencv-4.5.2/build && \ -DBUILD_TESTS=OFF \ .. && \ cd modules/videoio && \ - make -j "$(nproc)" && \ + make -j $(nproc) && \ cp -f ../../lib/libopencv_videoio.so.4.5.2 /opt/dist/usr/local/lib # cleanup diff --git a/VCAC-A/ubuntu-18.04/analytics/dev/Dockerfile b/VCAC-A/ubuntu-18.04/analytics/dev/Dockerfile index a53360deb..ecd3520df 100644 --- a/VCAC-A/ubuntu-18.04/analytics/dev/Dockerfile +++ b/VCAC-A/ubuntu-18.04/analytics/dev/Dockerfile @@ -422,7 +422,7 @@ RUN cd /opt/build/opencv-4.5.2 && mkdir build && cd build && \ -DBUILD_PERF_TESTS=OFF \ -DBUILD_TESTS=OFF \ .. && \ - make -j "$(nproc)" && \ + make -j $(nproc) && \ make install DESTDIR=/opt/dist && \ make install @@ -595,7 +595,7 @@ RUN cd /opt/build/opencv-4.5.2/build && \ -DBUILD_TESTS=OFF \ .. && \ cd modules/videoio && \ - make -j "$(nproc)" && \ + make -j $(nproc) && \ cp -f ../../lib/libopencv_videoio.so.4.5.2 /opt/dist/usr/local/lib RUN apt-get update && \ diff --git a/VCAC-A/ubuntu-18.04/analytics/ffmpeg/Dockerfile b/VCAC-A/ubuntu-18.04/analytics/ffmpeg/Dockerfile index 7bca15ffb..a79e518fb 100644 --- a/VCAC-A/ubuntu-18.04/analytics/ffmpeg/Dockerfile +++ b/VCAC-A/ubuntu-18.04/analytics/ffmpeg/Dockerfile @@ -407,7 +407,7 @@ RUN cd /opt/build/opencv-4.5.2 && mkdir build && cd build && \ -DBUILD_PERF_TESTS=OFF \ -DBUILD_TESTS=OFF \ .. && \ - make -j "$(nproc)" && \ + make -j $(nproc) && \ make install DESTDIR=/opt/dist && \ make install @@ -455,7 +455,7 @@ RUN cd /opt/build/opencv-4.5.2/build && \ -DBUILD_TESTS=OFF \ .. && \ cd modules/videoio && \ - make -j "$(nproc)" && \ + make -j $(nproc) && \ cp -f ../../lib/libopencv_videoio.so.4.5.2 /opt/dist/usr/local/lib # cleanup diff --git a/VCAC-A/ubuntu-18.04/analytics/gst/Dockerfile b/VCAC-A/ubuntu-18.04/analytics/gst/Dockerfile index cf954cdd3..810f51732 100644 --- a/VCAC-A/ubuntu-18.04/analytics/gst/Dockerfile +++ b/VCAC-A/ubuntu-18.04/analytics/gst/Dockerfile @@ -401,7 +401,7 @@ RUN cd /opt/build/opencv-4.5.2 && mkdir build && cd build && \ -DBUILD_PERF_TESTS=OFF \ -DBUILD_TESTS=OFF \ .. && \ - make -j "$(nproc)" && \ + make -j $(nproc) && \ make install DESTDIR=/opt/dist && \ make install @@ -574,7 +574,7 @@ RUN cd /opt/build/opencv-4.5.2/build && \ -DBUILD_TESTS=OFF \ .. && \ cd modules/videoio && \ - make -j "$(nproc)" && \ + make -j $(nproc) && \ cp -f ../../lib/libopencv_videoio.so.4.5.2 /opt/dist/usr/local/lib RUN apt-get update && \ diff --git a/VCAC-A/ubuntu-20.04/analytics/dev/Dockerfile b/VCAC-A/ubuntu-20.04/analytics/dev/Dockerfile index e762f758b..9e4a6d8ba 100644 --- a/VCAC-A/ubuntu-20.04/analytics/dev/Dockerfile +++ b/VCAC-A/ubuntu-20.04/analytics/dev/Dockerfile @@ -396,7 +396,7 @@ RUN cd /opt/build/opencv-4.5.2 && mkdir build && cd build && \ -DBUILD_PERF_TESTS=OFF \ -DBUILD_TESTS=OFF \ .. && \ - make -j "$(nproc)" && \ + make -j $(nproc) && \ make install DESTDIR=/opt/dist && \ make install @@ -569,7 +569,7 @@ RUN cd /opt/build/opencv-4.5.2/build && \ -DBUILD_TESTS=OFF \ .. && \ cd modules/videoio && \ - make -j "$(nproc)" && \ + make -j $(nproc) && \ cp -f ../../lib/libopencv_videoio.so.4.5.2 /opt/dist/usr/local/lib RUN apt-get update && \ diff --git a/VCAC-A/ubuntu-20.04/analytics/ffmpeg/Dockerfile b/VCAC-A/ubuntu-20.04/analytics/ffmpeg/Dockerfile index decb7610d..f08140b33 100644 --- a/VCAC-A/ubuntu-20.04/analytics/ffmpeg/Dockerfile +++ b/VCAC-A/ubuntu-20.04/analytics/ffmpeg/Dockerfile @@ -381,7 +381,7 @@ RUN cd /opt/build/opencv-4.5.2 && mkdir build && cd build && \ -DBUILD_PERF_TESTS=OFF \ -DBUILD_TESTS=OFF \ .. && \ - make -j "$(nproc)" && \ + make -j $(nproc) && \ make install DESTDIR=/opt/dist && \ make install @@ -429,7 +429,7 @@ RUN cd /opt/build/opencv-4.5.2/build && \ -DBUILD_TESTS=OFF \ .. && \ cd modules/videoio && \ - make -j "$(nproc)" && \ + make -j $(nproc) && \ cp -f ../../lib/libopencv_videoio.so.4.5.2 /opt/dist/usr/local/lib # cleanup diff --git a/VCAC-A/ubuntu-20.04/analytics/gst/Dockerfile b/VCAC-A/ubuntu-20.04/analytics/gst/Dockerfile index 5c0a68a8a..415256f12 100644 --- a/VCAC-A/ubuntu-20.04/analytics/gst/Dockerfile +++ b/VCAC-A/ubuntu-20.04/analytics/gst/Dockerfile @@ -375,7 +375,7 @@ RUN cd /opt/build/opencv-4.5.2 && mkdir build && cd build && \ -DBUILD_PERF_TESTS=OFF \ -DBUILD_TESTS=OFF \ .. && \ - make -j "$(nproc)" && \ + make -j $(nproc) && \ make install DESTDIR=/opt/dist && \ make install @@ -548,7 +548,7 @@ RUN cd /opt/build/opencv-4.5.2/build && \ -DBUILD_TESTS=OFF \ .. && \ cd modules/videoio && \ - make -j "$(nproc)" && \ + make -j $(nproc) && \ cp -f ../../lib/libopencv_videoio.so.4.5.2 /opt/dist/usr/local/lib RUN apt-get update && \ diff --git a/Xeon/centos-7/analytics/dev/Dockerfile b/Xeon/centos-7/analytics/dev/Dockerfile index a619f9cd6..531d14a4d 100644 --- a/Xeon/centos-7/analytics/dev/Dockerfile +++ b/Xeon/centos-7/analytics/dev/Dockerfile @@ -239,7 +239,7 @@ RUN cd /opt/build && \ wget -O - ${OPENCV_REPO} | tar xz # TODO: file a bug against opencv since they do not accept full libdir RUN cd /opt/build/opencv-4.5.2 && mkdir build && cd build && \ - cmake \ + (. /opt/rh/devtoolset-9/enable && cmake \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr/local \ -DCMAKE_INSTALL_LIBDIR=lib64 \ @@ -249,7 +249,7 @@ RUN cd /opt/build/opencv-4.5.2 && mkdir build && cd build && \ -DBUILD_PERF_TESTS=OFF \ -DBUILD_TESTS=OFF \ .. && \ - make -j "$(nproc)" && \ + make -j $(nproc) ) && \ make install DESTDIR=/opt/dist && \ make install @@ -507,7 +507,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/opencv-4.5.2/build && \ rm -rf ./* && \ - cmake \ + (. /opt/rh/devtoolset-9/enable && cmake \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr/local \ -DCMAKE_INSTALL_LIBDIR=lib64 \ @@ -518,8 +518,8 @@ RUN cd /opt/build/opencv-4.5.2/build && \ -DBUILD_TESTS=OFF \ .. && \ cd modules/videoio && \ - make -j "$(nproc)" && \ - cp -f ../../lib/libopencv_videoio.so.4.5.2 /opt/dist/usr/local/lib64 + make -j $(nproc) && \ + cp -f ../../lib/libopencv_videoio.so.4.5.2 /opt/dist/usr/local/lib64 ) RUN yum install -y wget tar gcc-c++ meson diff --git a/Xeon/centos-7/analytics/ffmpeg/Dockerfile b/Xeon/centos-7/analytics/ffmpeg/Dockerfile index 1f8e09ece..72a4d5644 100644 --- a/Xeon/centos-7/analytics/ffmpeg/Dockerfile +++ b/Xeon/centos-7/analytics/ffmpeg/Dockerfile @@ -224,7 +224,7 @@ RUN cd /opt/build && \ wget -O - ${OPENCV_REPO} | tar xz # TODO: file a bug against opencv since they do not accept full libdir RUN cd /opt/build/opencv-4.5.2 && mkdir build && cd build && \ - cmake \ + (. /opt/rh/devtoolset-9/enable && cmake \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr/local \ -DCMAKE_INSTALL_LIBDIR=lib64 \ @@ -234,7 +234,7 @@ RUN cd /opt/build/opencv-4.5.2 && mkdir build && cd build && \ -DBUILD_PERF_TESTS=OFF \ -DBUILD_TESTS=OFF \ .. && \ - make -j "$(nproc)" && \ + make -j $(nproc) ) && \ make install DESTDIR=/opt/dist && \ make install @@ -382,7 +382,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/opencv-4.5.2/build && \ rm -rf ./* && \ - cmake \ + (. /opt/rh/devtoolset-9/enable && cmake \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr/local \ -DCMAKE_INSTALL_LIBDIR=lib64 \ @@ -393,8 +393,8 @@ RUN cd /opt/build/opencv-4.5.2/build && \ -DBUILD_TESTS=OFF \ .. && \ cd modules/videoio && \ - make -j "$(nproc)" && \ - cp -f ../../lib/libopencv_videoio.so.4.5.2 /opt/dist/usr/local/lib64 + make -j $(nproc) && \ + cp -f ../../lib/libopencv_videoio.so.4.5.2 /opt/dist/usr/local/lib64 ) # cleanup RUN rm -rf /opt/dist/usr/local/include && \ diff --git a/Xeon/centos-7/analytics/gst/Dockerfile b/Xeon/centos-7/analytics/gst/Dockerfile index 12149ab6b..cef662edb 100644 --- a/Xeon/centos-7/analytics/gst/Dockerfile +++ b/Xeon/centos-7/analytics/gst/Dockerfile @@ -239,7 +239,7 @@ RUN cd /opt/build && \ wget -O - ${OPENCV_REPO} | tar xz # TODO: file a bug against opencv since they do not accept full libdir RUN cd /opt/build/opencv-4.5.2 && mkdir build && cd build && \ - cmake \ + (. /opt/rh/devtoolset-9/enable && cmake \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr/local \ -DCMAKE_INSTALL_LIBDIR=lib64 \ @@ -249,7 +249,7 @@ RUN cd /opt/build/opencv-4.5.2 && mkdir build && cd build && \ -DBUILD_PERF_TESTS=OFF \ -DBUILD_TESTS=OFF \ .. && \ - make -j "$(nproc)" && \ + make -j $(nproc) ) && \ make install DESTDIR=/opt/dist && \ make install @@ -507,7 +507,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/opencv-4.5.2/build && \ rm -rf ./* && \ - cmake \ + (. /opt/rh/devtoolset-9/enable && cmake \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr/local \ -DCMAKE_INSTALL_LIBDIR=lib64 \ @@ -518,8 +518,8 @@ RUN cd /opt/build/opencv-4.5.2/build && \ -DBUILD_TESTS=OFF \ .. && \ cd modules/videoio && \ - make -j "$(nproc)" && \ - cp -f ../../lib/libopencv_videoio.so.4.5.2 /opt/dist/usr/local/lib64 + make -j $(nproc) && \ + cp -f ../../lib/libopencv_videoio.so.4.5.2 /opt/dist/usr/local/lib64 ) RUN yum install -y wget tar gcc-c++ meson diff --git a/Xeon/centos-7/media/ffmpeg/Dockerfile b/Xeon/centos-7/media/ffmpeg/Dockerfile index eb40993dd..9e68c1bff 100644 --- a/Xeon/centos-7/media/ffmpeg/Dockerfile +++ b/Xeon/centos-7/media/ffmpeg/Dockerfile @@ -228,7 +228,7 @@ RUN cd /opt/build && \ wget -O - ${OPENCV_REPO} | tar xz # TODO: file a bug against opencv since they do not accept full libdir RUN cd /opt/build/opencv-4.5.2 && mkdir build && cd build && \ - cmake3 \ + (. /opt/rh/devtoolset-9/enable && cmake3 \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr/local \ -DCMAKE_INSTALL_LIBDIR=lib64 \ @@ -238,7 +238,7 @@ RUN cd /opt/build/opencv-4.5.2 && mkdir build && cd build && \ -DBUILD_PERF_TESTS=OFF \ -DBUILD_TESTS=OFF \ .. && \ - make -j "$(nproc)" && \ + make -j $(nproc) ) && \ make install DESTDIR=/opt/dist && \ make install @@ -269,7 +269,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/opencv-4.5.2/build && \ rm -rf ./* && \ - cmake3 \ + (. /opt/rh/devtoolset-9/enable && cmake3 \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr/local \ -DCMAKE_INSTALL_LIBDIR=lib64 \ @@ -280,8 +280,8 @@ RUN cd /opt/build/opencv-4.5.2/build && \ -DBUILD_TESTS=OFF \ .. && \ cd modules/videoio && \ - make -j "$(nproc)" && \ - cp -f ../../lib/libopencv_videoio.so.4.5.2 /opt/dist/usr/local/lib64 + make -j $(nproc) && \ + cp -f ../../lib/libopencv_videoio.so.4.5.2 /opt/dist/usr/local/lib64 ) # cleanup RUN rm -rf /opt/dist/usr/local/include && \ diff --git a/Xeon/centos-7/service/owt-dev/Dockerfile b/Xeon/centos-7/service/owt-dev/Dockerfile index 9f3198cb1..8abe61c03 100644 --- a/Xeon/centos-7/service/owt-dev/Dockerfile +++ b/Xeon/centos-7/service/owt-dev/Dockerfile @@ -152,7 +152,7 @@ RUN cd /opt/build && \ wget -O - ${OPENCV_REPO} | tar xz # TODO: file a bug against opencv since they do not accept full libdir RUN cd /opt/build/opencv-4.5.2 && mkdir build && cd build && \ - cmake3 \ + (. /opt/rh/devtoolset-9/enable && cmake3 \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr/local \ -DCMAKE_INSTALL_LIBDIR=lib64 \ @@ -162,7 +162,7 @@ RUN cd /opt/build/opencv-4.5.2 && mkdir build && cd build && \ -DBUILD_PERF_TESTS=OFF \ -DBUILD_TESTS=OFF \ .. && \ - make -j "$(nproc)" && \ + make -j $(nproc) ) && \ make install DESTDIR=/opt/dist && \ make install @@ -304,7 +304,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/opencv-4.5.2/build && \ rm -rf ./* && \ - cmake3 \ + (. /opt/rh/devtoolset-9/enable && cmake3 \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr/local \ -DCMAKE_INSTALL_LIBDIR=lib64 \ @@ -315,8 +315,8 @@ RUN cd /opt/build/opencv-4.5.2/build && \ -DBUILD_TESTS=OFF \ .. && \ cd modules/videoio && \ - make -j "$(nproc)" && \ - cp -f ../../lib/libopencv_videoio.so.4.5.2 /opt/dist/usr/local/lib64 + make -j $(nproc) && \ + cp -f ../../lib/libopencv_videoio.so.4.5.2 /opt/dist/usr/local/lib64 ) RUN yum install -y meson wget tar gcc-c++ glib2-devel bison flex gobject-introspection-devel diff --git a/Xeon/centos-7/service/owt/Dockerfile b/Xeon/centos-7/service/owt/Dockerfile index 09b4844bd..c039ede46 100644 --- a/Xeon/centos-7/service/owt/Dockerfile +++ b/Xeon/centos-7/service/owt/Dockerfile @@ -153,7 +153,7 @@ RUN cd /opt/build && \ wget -O - ${OPENCV_REPO} | tar xz # TODO: file a bug against opencv since they do not accept full libdir RUN cd /opt/build/opencv-4.5.2 && mkdir build && cd build && \ - cmake3 \ + (. /opt/rh/devtoolset-9/enable && cmake3 \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr/local \ -DCMAKE_INSTALL_LIBDIR=lib64 \ @@ -163,7 +163,7 @@ RUN cd /opt/build/opencv-4.5.2 && mkdir build && cd build && \ -DBUILD_PERF_TESTS=OFF \ -DBUILD_TESTS=OFF \ .. && \ - make -j "$(nproc)" && \ + make -j $(nproc) ) && \ make install DESTDIR=/opt/dist && \ make install @@ -305,7 +305,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/opencv-4.5.2/build && \ rm -rf ./* && \ - cmake3 \ + (. /opt/rh/devtoolset-9/enable && cmake3 \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr/local \ -DCMAKE_INSTALL_LIBDIR=lib64 \ @@ -316,8 +316,8 @@ RUN cd /opt/build/opencv-4.5.2/build && \ -DBUILD_TESTS=OFF \ .. && \ cd modules/videoio && \ - make -j "$(nproc)" && \ - cp -f ../../lib/libopencv_videoio.so.4.5.2 /opt/dist/usr/local/lib64 + make -j $(nproc) && \ + cp -f ../../lib/libopencv_videoio.so.4.5.2 /opt/dist/usr/local/lib64 ) RUN yum install -y meson wget tar gcc-c++ glib2-devel bison flex gobject-introspection-devel diff --git a/Xeon/centos-7/service/owt360/Dockerfile b/Xeon/centos-7/service/owt360/Dockerfile index 31143bd11..08b6a3e5f 100644 --- a/Xeon/centos-7/service/owt360/Dockerfile +++ b/Xeon/centos-7/service/owt360/Dockerfile @@ -153,7 +153,7 @@ RUN cd /opt/build && \ wget -O - ${OPENCV_REPO} | tar xz # TODO: file a bug against opencv since they do not accept full libdir RUN cd /opt/build/opencv-4.5.2 && mkdir build && cd build && \ - cmake3 \ + (. /opt/rh/devtoolset-9/enable && cmake3 \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr/local \ -DCMAKE_INSTALL_LIBDIR=lib64 \ @@ -163,7 +163,7 @@ RUN cd /opt/build/opencv-4.5.2 && mkdir build && cd build && \ -DBUILD_PERF_TESTS=OFF \ -DBUILD_TESTS=OFF \ .. && \ - make -j "$(nproc)" && \ + make -j $(nproc) ) && \ make install DESTDIR=/opt/dist && \ make install @@ -288,7 +288,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/opencv-4.5.2/build && \ rm -rf ./* && \ - cmake3 \ + (. /opt/rh/devtoolset-9/enable && cmake3 \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr/local \ -DCMAKE_INSTALL_LIBDIR=lib64 \ @@ -299,8 +299,8 @@ RUN cd /opt/build/opencv-4.5.2/build && \ -DBUILD_TESTS=OFF \ .. && \ cd modules/videoio && \ - make -j "$(nproc)" && \ - cp -f ../../lib/libopencv_videoio.so.4.5.2 /opt/dist/usr/local/lib64 + make -j $(nproc) && \ + cp -f ../../lib/libopencv_videoio.so.4.5.2 /opt/dist/usr/local/lib64 ) diff --git a/Xeon/ubuntu-18.04/analytics/dev/Dockerfile b/Xeon/ubuntu-18.04/analytics/dev/Dockerfile index 912f4ede7..6a53ab8a0 100644 --- a/Xeon/ubuntu-18.04/analytics/dev/Dockerfile +++ b/Xeon/ubuntu-18.04/analytics/dev/Dockerfile @@ -303,7 +303,7 @@ RUN cd /opt/build/opencv-4.5.2 && mkdir build && cd build && \ -DBUILD_PERF_TESTS=OFF \ -DBUILD_TESTS=OFF \ .. && \ - make -j "$(nproc)" && \ + make -j $(nproc) && \ make install DESTDIR=/opt/dist && \ make install @@ -593,7 +593,7 @@ RUN cd /opt/build/opencv-4.5.2/build && \ -DBUILD_TESTS=OFF \ .. && \ cd modules/videoio && \ - make -j "$(nproc)" && \ + make -j $(nproc) && \ cp -f ../../lib/libopencv_videoio.so.4.5.2 /opt/dist/usr/local/lib RUN apt-get update && \ diff --git a/Xeon/ubuntu-18.04/analytics/ffmpeg/Dockerfile b/Xeon/ubuntu-18.04/analytics/ffmpeg/Dockerfile index 893eef59d..e0fa7ad26 100644 --- a/Xeon/ubuntu-18.04/analytics/ffmpeg/Dockerfile +++ b/Xeon/ubuntu-18.04/analytics/ffmpeg/Dockerfile @@ -288,7 +288,7 @@ RUN cd /opt/build/opencv-4.5.2 && mkdir build && cd build && \ -DBUILD_PERF_TESTS=OFF \ -DBUILD_TESTS=OFF \ .. && \ - make -j "$(nproc)" && \ + make -j $(nproc) && \ make install DESTDIR=/opt/dist && \ make install @@ -453,7 +453,7 @@ RUN cd /opt/build/opencv-4.5.2/build && \ -DBUILD_TESTS=OFF \ .. && \ cd modules/videoio && \ - make -j "$(nproc)" && \ + make -j $(nproc) && \ cp -f ../../lib/libopencv_videoio.so.4.5.2 /opt/dist/usr/local/lib # cleanup diff --git a/Xeon/ubuntu-18.04/analytics/gst/Dockerfile b/Xeon/ubuntu-18.04/analytics/gst/Dockerfile index e3724b1bc..b7a04e1d5 100644 --- a/Xeon/ubuntu-18.04/analytics/gst/Dockerfile +++ b/Xeon/ubuntu-18.04/analytics/gst/Dockerfile @@ -303,7 +303,7 @@ RUN cd /opt/build/opencv-4.5.2 && mkdir build && cd build && \ -DBUILD_PERF_TESTS=OFF \ -DBUILD_TESTS=OFF \ .. && \ - make -j "$(nproc)" && \ + make -j $(nproc) && \ make install DESTDIR=/opt/dist && \ make install @@ -593,7 +593,7 @@ RUN cd /opt/build/opencv-4.5.2/build && \ -DBUILD_TESTS=OFF \ .. && \ cd modules/videoio && \ - make -j "$(nproc)" && \ + make -j $(nproc) && \ cp -f ../../lib/libopencv_videoio.so.4.5.2 /opt/dist/usr/local/lib RUN apt-get update && \ diff --git a/Xeon/ubuntu-18.04/media/ffmpeg/Dockerfile b/Xeon/ubuntu-18.04/media/ffmpeg/Dockerfile index eb7177779..a2d2e05c6 100644 --- a/Xeon/ubuntu-18.04/media/ffmpeg/Dockerfile +++ b/Xeon/ubuntu-18.04/media/ffmpeg/Dockerfile @@ -292,7 +292,7 @@ RUN cd /opt/build/opencv-4.5.2 && mkdir build && cd build && \ -DBUILD_PERF_TESTS=OFF \ -DBUILD_TESTS=OFF \ .. && \ - make -j "$(nproc)" && \ + make -j $(nproc) && \ make install DESTDIR=/opt/dist && \ make install @@ -337,7 +337,7 @@ RUN cd /opt/build/opencv-4.5.2/build && \ -DBUILD_TESTS=OFF \ .. && \ cd modules/videoio && \ - make -j "$(nproc)" && \ + make -j $(nproc) && \ cp -f ../../lib/libopencv_videoio.so.4.5.2 /opt/dist/usr/local/lib # cleanup diff --git a/Xeon/ubuntu-18.04/service/owt-dev/Dockerfile b/Xeon/ubuntu-18.04/service/owt-dev/Dockerfile index 986147695..1bb88ce9d 100644 --- a/Xeon/ubuntu-18.04/service/owt-dev/Dockerfile +++ b/Xeon/ubuntu-18.04/service/owt-dev/Dockerfile @@ -185,7 +185,7 @@ RUN cd /opt/build/opencv-4.5.2 && mkdir build && cd build && \ -DBUILD_PERF_TESTS=OFF \ -DBUILD_TESTS=OFF \ .. && \ - make -j "$(nproc)" && \ + make -j $(nproc) && \ make install DESTDIR=/opt/dist && \ make install @@ -327,7 +327,7 @@ RUN cd /opt/build/opencv-4.5.2/build && \ -DBUILD_TESTS=OFF \ .. && \ cd modules/videoio && \ - make -j "$(nproc)" && \ + make -j $(nproc) && \ cp -f ../../lib/libopencv_videoio.so.4.5.2 /opt/dist/usr/local/lib RUN apt-get update && \ diff --git a/Xeon/ubuntu-18.04/service/owt/Dockerfile b/Xeon/ubuntu-18.04/service/owt/Dockerfile index 3d24bd8fa..6f256db71 100644 --- a/Xeon/ubuntu-18.04/service/owt/Dockerfile +++ b/Xeon/ubuntu-18.04/service/owt/Dockerfile @@ -185,7 +185,7 @@ RUN cd /opt/build/opencv-4.5.2 && mkdir build && cd build && \ -DBUILD_PERF_TESTS=OFF \ -DBUILD_TESTS=OFF \ .. && \ - make -j "$(nproc)" && \ + make -j $(nproc) && \ make install DESTDIR=/opt/dist && \ make install @@ -327,7 +327,7 @@ RUN cd /opt/build/opencv-4.5.2/build && \ -DBUILD_TESTS=OFF \ .. && \ cd modules/videoio && \ - make -j "$(nproc)" && \ + make -j $(nproc) && \ cp -f ../../lib/libopencv_videoio.so.4.5.2 /opt/dist/usr/local/lib RUN apt-get update && \ diff --git a/Xeon/ubuntu-18.04/service/owt360/Dockerfile b/Xeon/ubuntu-18.04/service/owt360/Dockerfile index d7b70080d..f5eb365ff 100644 --- a/Xeon/ubuntu-18.04/service/owt360/Dockerfile +++ b/Xeon/ubuntu-18.04/service/owt360/Dockerfile @@ -186,7 +186,7 @@ RUN cd /opt/build/opencv-4.5.2 && mkdir build && cd build && \ -DBUILD_PERF_TESTS=OFF \ -DBUILD_TESTS=OFF \ .. && \ - make -j "$(nproc)" && \ + make -j $(nproc) && \ make install DESTDIR=/opt/dist && \ make install @@ -328,7 +328,7 @@ RUN cd /opt/build/opencv-4.5.2/build && \ -DBUILD_TESTS=OFF \ .. && \ cd modules/videoio && \ - make -j "$(nproc)" && \ + make -j $(nproc) && \ cp -f ../../lib/libopencv_videoio.so.4.5.2 /opt/dist/usr/local/lib diff --git a/Xeon/ubuntu-20.04/analytics/dev/Dockerfile b/Xeon/ubuntu-20.04/analytics/dev/Dockerfile index 8fa4e89b7..3dc3fad29 100644 --- a/Xeon/ubuntu-20.04/analytics/dev/Dockerfile +++ b/Xeon/ubuntu-20.04/analytics/dev/Dockerfile @@ -300,7 +300,7 @@ RUN cd /opt/build/opencv-4.5.2 && mkdir build && cd build && \ -DBUILD_PERF_TESTS=OFF \ -DBUILD_TESTS=OFF \ .. && \ - make -j "$(nproc)" && \ + make -j $(nproc) && \ make install DESTDIR=/opt/dist && \ make install @@ -567,7 +567,7 @@ RUN cd /opt/build/opencv-4.5.2/build && \ -DBUILD_TESTS=OFF \ .. && \ cd modules/videoio && \ - make -j "$(nproc)" && \ + make -j $(nproc) && \ cp -f ../../lib/libopencv_videoio.so.4.5.2 /opt/dist/usr/local/lib RUN apt-get update && \ diff --git a/Xeon/ubuntu-20.04/analytics/ffmpeg/Dockerfile b/Xeon/ubuntu-20.04/analytics/ffmpeg/Dockerfile index 4d8699a3c..dae262c67 100644 --- a/Xeon/ubuntu-20.04/analytics/ffmpeg/Dockerfile +++ b/Xeon/ubuntu-20.04/analytics/ffmpeg/Dockerfile @@ -262,7 +262,7 @@ RUN cd /opt/build/opencv-4.5.2 && mkdir build && cd build && \ -DBUILD_PERF_TESTS=OFF \ -DBUILD_TESTS=OFF \ .. && \ - make -j "$(nproc)" && \ + make -j $(nproc) && \ make install DESTDIR=/opt/dist && \ make install @@ -427,7 +427,7 @@ RUN cd /opt/build/opencv-4.5.2/build && \ -DBUILD_TESTS=OFF \ .. && \ cd modules/videoio && \ - make -j "$(nproc)" && \ + make -j $(nproc) && \ cp -f ../../lib/libopencv_videoio.so.4.5.2 /opt/dist/usr/local/lib # cleanup diff --git a/Xeon/ubuntu-20.04/analytics/gst/Dockerfile b/Xeon/ubuntu-20.04/analytics/gst/Dockerfile index cde11ace6..56b7627e8 100644 --- a/Xeon/ubuntu-20.04/analytics/gst/Dockerfile +++ b/Xeon/ubuntu-20.04/analytics/gst/Dockerfile @@ -277,7 +277,7 @@ RUN cd /opt/build/opencv-4.5.2 && mkdir build && cd build && \ -DBUILD_PERF_TESTS=OFF \ -DBUILD_TESTS=OFF \ .. && \ - make -j "$(nproc)" && \ + make -j $(nproc) && \ make install DESTDIR=/opt/dist && \ make install @@ -567,7 +567,7 @@ RUN cd /opt/build/opencv-4.5.2/build && \ -DBUILD_TESTS=OFF \ .. && \ cd modules/videoio && \ - make -j "$(nproc)" && \ + make -j $(nproc) && \ cp -f ../../lib/libopencv_videoio.so.4.5.2 /opt/dist/usr/local/lib RUN apt-get update && \ diff --git a/Xeon/ubuntu-20.04/media/ffmpeg/Dockerfile b/Xeon/ubuntu-20.04/media/ffmpeg/Dockerfile index 18e0dd621..f329c1b49 100644 --- a/Xeon/ubuntu-20.04/media/ffmpeg/Dockerfile +++ b/Xeon/ubuntu-20.04/media/ffmpeg/Dockerfile @@ -280,7 +280,7 @@ RUN cd /opt/build/opencv-4.5.2 && mkdir build && cd build && \ -DBUILD_PERF_TESTS=OFF \ -DBUILD_TESTS=OFF \ .. && \ - make -j "$(nproc)" && \ + make -j $(nproc) && \ make install DESTDIR=/opt/dist && \ make install @@ -325,7 +325,7 @@ RUN cd /opt/build/opencv-4.5.2/build && \ -DBUILD_TESTS=OFF \ .. && \ cd modules/videoio && \ - make -j "$(nproc)" && \ + make -j $(nproc) && \ cp -f ../../lib/libopencv_videoio.so.4.5.2 /opt/dist/usr/local/lib # cleanup diff --git a/XeonE3/centos-7/analytics/dev/Dockerfile b/XeonE3/centos-7/analytics/dev/Dockerfile index 5407205ab..1ea539566 100644 --- a/XeonE3/centos-7/analytics/dev/Dockerfile +++ b/XeonE3/centos-7/analytics/dev/Dockerfile @@ -300,7 +300,7 @@ RUN cd /opt/build && \ wget -O - ${OPENCV_REPO} | tar xz # TODO: file a bug against opencv since they do not accept full libdir RUN cd /opt/build/opencv-4.5.2 && mkdir build && cd build && \ - cmake \ + (. /opt/rh/devtoolset-9/enable && cmake \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr/local \ -DCMAKE_INSTALL_LIBDIR=lib64 \ @@ -310,7 +310,7 @@ RUN cd /opt/build/opencv-4.5.2 && mkdir build && cd build && \ -DBUILD_PERF_TESTS=OFF \ -DBUILD_TESTS=OFF \ .. && \ - make -j "$(nproc)" && \ + make -j $(nproc) ) && \ make install DESTDIR=/opt/dist && \ make install @@ -562,7 +562,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/opencv-4.5.2/build && \ rm -rf ./* && \ - cmake \ + (. /opt/rh/devtoolset-9/enable && cmake \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr/local \ -DCMAKE_INSTALL_LIBDIR=lib64 \ @@ -573,8 +573,8 @@ RUN cd /opt/build/opencv-4.5.2/build && \ -DBUILD_TESTS=OFF \ .. && \ cd modules/videoio && \ - make -j "$(nproc)" && \ - cp -f ../../lib/libopencv_videoio.so.4.5.2 /opt/dist/usr/local/lib64 + make -j $(nproc) && \ + cp -f ../../lib/libopencv_videoio.so.4.5.2 /opt/dist/usr/local/lib64 ) RUN yum install -y wget tar gcc-c++ meson diff --git a/XeonE3/centos-7/analytics/ffmpeg/Dockerfile b/XeonE3/centos-7/analytics/ffmpeg/Dockerfile index 3fdc8bebd..eca6483c8 100644 --- a/XeonE3/centos-7/analytics/ffmpeg/Dockerfile +++ b/XeonE3/centos-7/analytics/ffmpeg/Dockerfile @@ -285,7 +285,7 @@ RUN cd /opt/build && \ wget -O - ${OPENCV_REPO} | tar xz # TODO: file a bug against opencv since they do not accept full libdir RUN cd /opt/build/opencv-4.5.2 && mkdir build && cd build && \ - cmake \ + (. /opt/rh/devtoolset-9/enable && cmake \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr/local \ -DCMAKE_INSTALL_LIBDIR=lib64 \ @@ -295,7 +295,7 @@ RUN cd /opt/build/opencv-4.5.2 && mkdir build && cd build && \ -DBUILD_PERF_TESTS=OFF \ -DBUILD_TESTS=OFF \ .. && \ - make -j "$(nproc)" && \ + make -j $(nproc) ) && \ make install DESTDIR=/opt/dist && \ make install @@ -448,7 +448,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/opencv-4.5.2/build && \ rm -rf ./* && \ - cmake \ + (. /opt/rh/devtoolset-9/enable && cmake \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr/local \ -DCMAKE_INSTALL_LIBDIR=lib64 \ @@ -459,8 +459,8 @@ RUN cd /opt/build/opencv-4.5.2/build && \ -DBUILD_TESTS=OFF \ .. && \ cd modules/videoio && \ - make -j "$(nproc)" && \ - cp -f ../../lib/libopencv_videoio.so.4.5.2 /opt/dist/usr/local/lib64 + make -j $(nproc) && \ + cp -f ../../lib/libopencv_videoio.so.4.5.2 /opt/dist/usr/local/lib64 ) # cleanup RUN rm -rf /opt/dist/usr/local/include && \ diff --git a/XeonE3/centos-7/analytics/gst/Dockerfile b/XeonE3/centos-7/analytics/gst/Dockerfile index e3913bb3c..318c3afa0 100644 --- a/XeonE3/centos-7/analytics/gst/Dockerfile +++ b/XeonE3/centos-7/analytics/gst/Dockerfile @@ -282,7 +282,7 @@ RUN cd /opt/build && \ wget -O - ${OPENCV_REPO} | tar xz # TODO: file a bug against opencv since they do not accept full libdir RUN cd /opt/build/opencv-4.5.2 && mkdir build && cd build && \ - cmake \ + (. /opt/rh/devtoolset-9/enable && cmake \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr/local \ -DCMAKE_INSTALL_LIBDIR=lib64 \ @@ -292,7 +292,7 @@ RUN cd /opt/build/opencv-4.5.2 && mkdir build && cd build && \ -DBUILD_PERF_TESTS=OFF \ -DBUILD_TESTS=OFF \ .. && \ - make -j "$(nproc)" && \ + make -j $(nproc) ) && \ make install DESTDIR=/opt/dist && \ make install @@ -544,7 +544,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/opencv-4.5.2/build && \ rm -rf ./* && \ - cmake \ + (. /opt/rh/devtoolset-9/enable && cmake \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr/local \ -DCMAKE_INSTALL_LIBDIR=lib64 \ @@ -555,8 +555,8 @@ RUN cd /opt/build/opencv-4.5.2/build && \ -DBUILD_TESTS=OFF \ .. && \ cd modules/videoio && \ - make -j "$(nproc)" && \ - cp -f ../../lib/libopencv_videoio.so.4.5.2 /opt/dist/usr/local/lib64 + make -j $(nproc) && \ + cp -f ../../lib/libopencv_videoio.so.4.5.2 /opt/dist/usr/local/lib64 ) RUN yum install -y wget tar gcc-c++ meson diff --git a/XeonE3/centos-7/media/ffmpeg/Dockerfile b/XeonE3/centos-7/media/ffmpeg/Dockerfile index 692cac29e..b9f247064 100644 --- a/XeonE3/centos-7/media/ffmpeg/Dockerfile +++ b/XeonE3/centos-7/media/ffmpeg/Dockerfile @@ -293,7 +293,7 @@ RUN cd /opt/build && \ wget -O - ${OPENCV_REPO} | tar xz # TODO: file a bug against opencv since they do not accept full libdir RUN cd /opt/build/opencv-4.5.2 && mkdir build && cd build && \ - cmake \ + (. /opt/rh/devtoolset-9/enable && cmake \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr/local \ -DCMAKE_INSTALL_LIBDIR=lib64 \ @@ -303,7 +303,7 @@ RUN cd /opt/build/opencv-4.5.2 && mkdir build && cd build && \ -DBUILD_PERF_TESTS=OFF \ -DBUILD_TESTS=OFF \ .. && \ - make -j "$(nproc)" && \ + make -j $(nproc) ) && \ make install DESTDIR=/opt/dist && \ make install @@ -339,7 +339,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/opencv-4.5.2/build && \ rm -rf ./* && \ - cmake \ + (. /opt/rh/devtoolset-9/enable && cmake \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr/local \ -DCMAKE_INSTALL_LIBDIR=lib64 \ @@ -350,8 +350,8 @@ RUN cd /opt/build/opencv-4.5.2/build && \ -DBUILD_TESTS=OFF \ .. && \ cd modules/videoio && \ - make -j "$(nproc)" && \ - cp -f ../../lib/libopencv_videoio.so.4.5.2 /opt/dist/usr/local/lib64 + make -j $(nproc) && \ + cp -f ../../lib/libopencv_videoio.so.4.5.2 /opt/dist/usr/local/lib64 ) # cleanup RUN rm -rf /opt/dist/usr/local/include && \ diff --git a/XeonE3/centos-7/service/owt-dev/Dockerfile b/XeonE3/centos-7/service/owt-dev/Dockerfile index 0087d60f8..77073ab86 100644 --- a/XeonE3/centos-7/service/owt-dev/Dockerfile +++ b/XeonE3/centos-7/service/owt-dev/Dockerfile @@ -217,7 +217,7 @@ RUN cd /opt/build && \ wget -O - ${OPENCV_REPO} | tar xz # TODO: file a bug against opencv since they do not accept full libdir RUN cd /opt/build/opencv-4.5.2 && mkdir build && cd build && \ - cmake \ + (. /opt/rh/devtoolset-9/enable && cmake \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr/local \ -DCMAKE_INSTALL_LIBDIR=lib64 \ @@ -227,7 +227,7 @@ RUN cd /opt/build/opencv-4.5.2 && mkdir build && cd build && \ -DBUILD_PERF_TESTS=OFF \ -DBUILD_TESTS=OFF \ .. && \ - make -j "$(nproc)" && \ + make -j $(nproc) ) && \ make install DESTDIR=/opt/dist && \ make install @@ -357,7 +357,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/opencv-4.5.2/build && \ rm -rf ./* && \ - cmake \ + (. /opt/rh/devtoolset-9/enable && cmake \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr/local \ -DCMAKE_INSTALL_LIBDIR=lib64 \ @@ -368,8 +368,8 @@ RUN cd /opt/build/opencv-4.5.2/build && \ -DBUILD_TESTS=OFF \ .. && \ cd modules/videoio && \ - make -j "$(nproc)" && \ - cp -f ../../lib/libopencv_videoio.so.4.5.2 /opt/dist/usr/local/lib64 + make -j $(nproc) && \ + cp -f ../../lib/libopencv_videoio.so.4.5.2 /opt/dist/usr/local/lib64 ) RUN yum install -y meson wget tar gcc-c++ glib2-devel bison flex gobject-introspection-devel diff --git a/XeonE3/centos-7/service/owt/Dockerfile b/XeonE3/centos-7/service/owt/Dockerfile index 5636d3fd6..9460481ff 100644 --- a/XeonE3/centos-7/service/owt/Dockerfile +++ b/XeonE3/centos-7/service/owt/Dockerfile @@ -164,7 +164,7 @@ RUN cd /opt/build && \ wget -O - ${OPENCV_REPO} | tar xz # TODO: file a bug against opencv since they do not accept full libdir RUN cd /opt/build/opencv-4.5.2 && mkdir build && cd build && \ - cmake \ + (. /opt/rh/devtoolset-9/enable && cmake \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr/local \ -DCMAKE_INSTALL_LIBDIR=lib64 \ @@ -174,7 +174,7 @@ RUN cd /opt/build/opencv-4.5.2 && mkdir build && cd build && \ -DBUILD_PERF_TESTS=OFF \ -DBUILD_TESTS=OFF \ .. && \ - make -j "$(nproc)" && \ + make -j $(nproc) ) && \ make install DESTDIR=/opt/dist && \ make install @@ -358,7 +358,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/opencv-4.5.2/build && \ rm -rf ./* && \ - cmake \ + (. /opt/rh/devtoolset-9/enable && cmake \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr/local \ -DCMAKE_INSTALL_LIBDIR=lib64 \ @@ -369,8 +369,8 @@ RUN cd /opt/build/opencv-4.5.2/build && \ -DBUILD_TESTS=OFF \ .. && \ cd modules/videoio && \ - make -j "$(nproc)" && \ - cp -f ../../lib/libopencv_videoio.so.4.5.2 /opt/dist/usr/local/lib64 + make -j $(nproc) && \ + cp -f ../../lib/libopencv_videoio.so.4.5.2 /opt/dist/usr/local/lib64 ) RUN yum install -y meson wget tar gcc-c++ glib2-devel bison flex gobject-introspection-devel diff --git a/XeonE3/centos-7/service/owt360/Dockerfile b/XeonE3/centos-7/service/owt360/Dockerfile index ed294c4c0..c90f83693 100644 --- a/XeonE3/centos-7/service/owt360/Dockerfile +++ b/XeonE3/centos-7/service/owt360/Dockerfile @@ -218,7 +218,7 @@ RUN cd /opt/build && \ wget -O - ${OPENCV_REPO} | tar xz # TODO: file a bug against opencv since they do not accept full libdir RUN cd /opt/build/opencv-4.5.2 && mkdir build && cd build && \ - cmake \ + (. /opt/rh/devtoolset-9/enable && cmake \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr/local \ -DCMAKE_INSTALL_LIBDIR=lib64 \ @@ -228,7 +228,7 @@ RUN cd /opt/build/opencv-4.5.2 && mkdir build && cd build && \ -DBUILD_PERF_TESTS=OFF \ -DBUILD_TESTS=OFF \ .. && \ - make -j "$(nproc)" && \ + make -j $(nproc) ) && \ make install DESTDIR=/opt/dist && \ make install @@ -358,7 +358,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/opencv-4.5.2/build && \ rm -rf ./* && \ - cmake \ + (. /opt/rh/devtoolset-9/enable && cmake \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr/local \ -DCMAKE_INSTALL_LIBDIR=lib64 \ @@ -369,8 +369,8 @@ RUN cd /opt/build/opencv-4.5.2/build && \ -DBUILD_TESTS=OFF \ .. && \ cd modules/videoio && \ - make -j "$(nproc)" && \ - cp -f ../../lib/libopencv_videoio.so.4.5.2 /opt/dist/usr/local/lib64 + make -j $(nproc) && \ + cp -f ../../lib/libopencv_videoio.so.4.5.2 /opt/dist/usr/local/lib64 ) diff --git a/XeonE3/ubuntu-18.04/analytics/dev/Dockerfile b/XeonE3/ubuntu-18.04/analytics/dev/Dockerfile index 8345d8199..46bb32eaa 100644 --- a/XeonE3/ubuntu-18.04/analytics/dev/Dockerfile +++ b/XeonE3/ubuntu-18.04/analytics/dev/Dockerfile @@ -386,7 +386,7 @@ RUN cd /opt/build/opencv-4.5.2 && mkdir build && cd build && \ -DBUILD_PERF_TESTS=OFF \ -DBUILD_TESTS=OFF \ .. && \ - make -j "$(nproc)" && \ + make -j $(nproc) && \ make install DESTDIR=/opt/dist && \ make install @@ -681,7 +681,7 @@ RUN cd /opt/build/opencv-4.5.2/build && \ -DBUILD_TESTS=OFF \ .. && \ cd modules/videoio && \ - make -j "$(nproc)" && \ + make -j $(nproc) && \ cp -f ../../lib/libopencv_videoio.so.4.5.2 /opt/dist/usr/local/lib RUN apt-get update && \ diff --git a/XeonE3/ubuntu-18.04/analytics/ffmpeg/Dockerfile b/XeonE3/ubuntu-18.04/analytics/ffmpeg/Dockerfile index 8ac2d518f..f317902ca 100644 --- a/XeonE3/ubuntu-18.04/analytics/ffmpeg/Dockerfile +++ b/XeonE3/ubuntu-18.04/analytics/ffmpeg/Dockerfile @@ -371,7 +371,7 @@ RUN cd /opt/build/opencv-4.5.2 && mkdir build && cd build && \ -DBUILD_PERF_TESTS=OFF \ -DBUILD_TESTS=OFF \ .. && \ - make -j "$(nproc)" && \ + make -j $(nproc) && \ make install DESTDIR=/opt/dist && \ make install @@ -541,7 +541,7 @@ RUN cd /opt/build/opencv-4.5.2/build && \ -DBUILD_TESTS=OFF \ .. && \ cd modules/videoio && \ - make -j "$(nproc)" && \ + make -j $(nproc) && \ cp -f ../../lib/libopencv_videoio.so.4.5.2 /opt/dist/usr/local/lib # cleanup diff --git a/XeonE3/ubuntu-18.04/analytics/gst/Dockerfile b/XeonE3/ubuntu-18.04/analytics/gst/Dockerfile index 58cff425a..76d53948a 100644 --- a/XeonE3/ubuntu-18.04/analytics/gst/Dockerfile +++ b/XeonE3/ubuntu-18.04/analytics/gst/Dockerfile @@ -365,7 +365,7 @@ RUN cd /opt/build/opencv-4.5.2 && mkdir build && cd build && \ -DBUILD_PERF_TESTS=OFF \ -DBUILD_TESTS=OFF \ .. && \ - make -j "$(nproc)" && \ + make -j $(nproc) && \ make install DESTDIR=/opt/dist && \ make install @@ -660,7 +660,7 @@ RUN cd /opt/build/opencv-4.5.2/build && \ -DBUILD_TESTS=OFF \ .. && \ cd modules/videoio && \ - make -j "$(nproc)" && \ + make -j $(nproc) && \ cp -f ../../lib/libopencv_videoio.so.4.5.2 /opt/dist/usr/local/lib RUN apt-get update && \ diff --git a/XeonE3/ubuntu-18.04/media/ffmpeg/Dockerfile b/XeonE3/ubuntu-18.04/media/ffmpeg/Dockerfile index 8513efadd..8e46ee188 100644 --- a/XeonE3/ubuntu-18.04/media/ffmpeg/Dockerfile +++ b/XeonE3/ubuntu-18.04/media/ffmpeg/Dockerfile @@ -358,7 +358,7 @@ RUN cd /opt/build/opencv-4.5.2 && mkdir build && cd build && \ -DBUILD_PERF_TESTS=OFF \ -DBUILD_TESTS=OFF \ .. && \ - make -j "$(nproc)" && \ + make -j $(nproc) && \ make install DESTDIR=/opt/dist && \ make install @@ -408,7 +408,7 @@ RUN cd /opt/build/opencv-4.5.2/build && \ -DBUILD_TESTS=OFF \ .. && \ cd modules/videoio && \ - make -j "$(nproc)" && \ + make -j $(nproc) && \ cp -f ../../lib/libopencv_videoio.so.4.5.2 /opt/dist/usr/local/lib # cleanup diff --git a/XeonE3/ubuntu-18.04/service/owt-dev/Dockerfile b/XeonE3/ubuntu-18.04/service/owt-dev/Dockerfile index 78b34c46d..24f0b8e41 100644 --- a/XeonE3/ubuntu-18.04/service/owt-dev/Dockerfile +++ b/XeonE3/ubuntu-18.04/service/owt-dev/Dockerfile @@ -251,7 +251,7 @@ RUN cd /opt/build/opencv-4.5.2 && mkdir build && cd build && \ -DBUILD_PERF_TESTS=OFF \ -DBUILD_TESTS=OFF \ .. && \ - make -j "$(nproc)" && \ + make -j $(nproc) && \ make install DESTDIR=/opt/dist && \ make install @@ -398,7 +398,7 @@ RUN cd /opt/build/opencv-4.5.2/build && \ -DBUILD_TESTS=OFF \ .. && \ cd modules/videoio && \ - make -j "$(nproc)" && \ + make -j $(nproc) && \ cp -f ../../lib/libopencv_videoio.so.4.5.2 /opt/dist/usr/local/lib RUN apt-get update && \ diff --git a/XeonE3/ubuntu-18.04/service/owt/Dockerfile b/XeonE3/ubuntu-18.04/service/owt/Dockerfile index 2ff279250..d8dad4b84 100644 --- a/XeonE3/ubuntu-18.04/service/owt/Dockerfile +++ b/XeonE3/ubuntu-18.04/service/owt/Dockerfile @@ -251,7 +251,7 @@ RUN cd /opt/build/opencv-4.5.2 && mkdir build && cd build && \ -DBUILD_PERF_TESTS=OFF \ -DBUILD_TESTS=OFF \ .. && \ - make -j "$(nproc)" && \ + make -j $(nproc) && \ make install DESTDIR=/opt/dist && \ make install @@ -398,7 +398,7 @@ RUN cd /opt/build/opencv-4.5.2/build && \ -DBUILD_TESTS=OFF \ .. && \ cd modules/videoio && \ - make -j "$(nproc)" && \ + make -j $(nproc) && \ cp -f ../../lib/libopencv_videoio.so.4.5.2 /opt/dist/usr/local/lib RUN apt-get update && \ diff --git a/XeonE3/ubuntu-18.04/service/owt360/Dockerfile b/XeonE3/ubuntu-18.04/service/owt360/Dockerfile index f2774ab0a..ed454152e 100644 --- a/XeonE3/ubuntu-18.04/service/owt360/Dockerfile +++ b/XeonE3/ubuntu-18.04/service/owt360/Dockerfile @@ -252,7 +252,7 @@ RUN cd /opt/build/opencv-4.5.2 && mkdir build && cd build && \ -DBUILD_PERF_TESTS=OFF \ -DBUILD_TESTS=OFF \ .. && \ - make -j "$(nproc)" && \ + make -j $(nproc) && \ make install DESTDIR=/opt/dist && \ make install @@ -399,7 +399,7 @@ RUN cd /opt/build/opencv-4.5.2/build && \ -DBUILD_TESTS=OFF \ .. && \ cd modules/videoio && \ - make -j "$(nproc)" && \ + make -j $(nproc) && \ cp -f ../../lib/libopencv_videoio.so.4.5.2 /opt/dist/usr/local/lib diff --git a/XeonE3/ubuntu-20.04/analytics/dev/Dockerfile b/XeonE3/ubuntu-20.04/analytics/dev/Dockerfile index 7081e00ce..1f465a5ae 100644 --- a/XeonE3/ubuntu-20.04/analytics/dev/Dockerfile +++ b/XeonE3/ubuntu-20.04/analytics/dev/Dockerfile @@ -360,7 +360,7 @@ RUN cd /opt/build/opencv-4.5.2 && mkdir build && cd build && \ -DBUILD_PERF_TESTS=OFF \ -DBUILD_TESTS=OFF \ .. && \ - make -j "$(nproc)" && \ + make -j $(nproc) && \ make install DESTDIR=/opt/dist && \ make install @@ -655,7 +655,7 @@ RUN cd /opt/build/opencv-4.5.2/build && \ -DBUILD_TESTS=OFF \ .. && \ cd modules/videoio && \ - make -j "$(nproc)" && \ + make -j $(nproc) && \ cp -f ../../lib/libopencv_videoio.so.4.5.2 /opt/dist/usr/local/lib RUN apt-get update && \ diff --git a/XeonE3/ubuntu-20.04/analytics/ffmpeg/Dockerfile b/XeonE3/ubuntu-20.04/analytics/ffmpeg/Dockerfile index 6e182663a..8a0225e3c 100644 --- a/XeonE3/ubuntu-20.04/analytics/ffmpeg/Dockerfile +++ b/XeonE3/ubuntu-20.04/analytics/ffmpeg/Dockerfile @@ -345,7 +345,7 @@ RUN cd /opt/build/opencv-4.5.2 && mkdir build && cd build && \ -DBUILD_PERF_TESTS=OFF \ -DBUILD_TESTS=OFF \ .. && \ - make -j "$(nproc)" && \ + make -j $(nproc) && \ make install DESTDIR=/opt/dist && \ make install @@ -515,7 +515,7 @@ RUN cd /opt/build/opencv-4.5.2/build && \ -DBUILD_TESTS=OFF \ .. && \ cd modules/videoio && \ - make -j "$(nproc)" && \ + make -j $(nproc) && \ cp -f ../../lib/libopencv_videoio.so.4.5.2 /opt/dist/usr/local/lib # cleanup diff --git a/XeonE3/ubuntu-20.04/analytics/gst/Dockerfile b/XeonE3/ubuntu-20.04/analytics/gst/Dockerfile index a6017124b..52ea55987 100644 --- a/XeonE3/ubuntu-20.04/analytics/gst/Dockerfile +++ b/XeonE3/ubuntu-20.04/analytics/gst/Dockerfile @@ -339,7 +339,7 @@ RUN cd /opt/build/opencv-4.5.2 && mkdir build && cd build && \ -DBUILD_PERF_TESTS=OFF \ -DBUILD_TESTS=OFF \ .. && \ - make -j "$(nproc)" && \ + make -j $(nproc) && \ make install DESTDIR=/opt/dist && \ make install @@ -634,7 +634,7 @@ RUN cd /opt/build/opencv-4.5.2/build && \ -DBUILD_TESTS=OFF \ .. && \ cd modules/videoio && \ - make -j "$(nproc)" && \ + make -j $(nproc) && \ cp -f ../../lib/libopencv_videoio.so.4.5.2 /opt/dist/usr/local/lib RUN apt-get update && \ diff --git a/XeonE3/ubuntu-20.04/media/ffmpeg/Dockerfile b/XeonE3/ubuntu-20.04/media/ffmpeg/Dockerfile index bd10b44aa..7e11d4515 100644 --- a/XeonE3/ubuntu-20.04/media/ffmpeg/Dockerfile +++ b/XeonE3/ubuntu-20.04/media/ffmpeg/Dockerfile @@ -346,7 +346,7 @@ RUN cd /opt/build/opencv-4.5.2 && mkdir build && cd build && \ -DBUILD_PERF_TESTS=OFF \ -DBUILD_TESTS=OFF \ .. && \ - make -j "$(nproc)" && \ + make -j $(nproc) && \ make install DESTDIR=/opt/dist && \ make install @@ -396,7 +396,7 @@ RUN cd /opt/build/opencv-4.5.2/build && \ -DBUILD_TESTS=OFF \ .. && \ cd modules/videoio && \ - make -j "$(nproc)" && \ + make -j $(nproc) && \ cp -f ../../lib/libopencv_videoio.so.4.5.2 /opt/dist/usr/local/lib # cleanup diff --git a/template/components/opencv.m4 b/template/components/opencv.m4 index 7444d3b9e..f109131e7 100644 --- a/template/components/opencv.m4 +++ b/template/components/opencv.m4 @@ -40,6 +40,9 @@ ifelse(OS_NAME,centos,` define(`OPENCV_BUILD_DEPS',`ifdef(`BUILD_CMAKE',,cmake3) gcc gcc-c++ make wget python36-numpy ccache eigen3-devel') ') + ifelse(OS_NAME:OS_VERSION,centos:7,`(. /opt/rh/devtoolset-9/enable && ')ifdef(`BUILD_CMAKE',cmake,ifelse(OS_NAME,centos,cmake3,cmake)) -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=BUILD_PREFIX -DCMAKE_INSTALL_LIBDIR=BUILD_LIBDIR -DCMAKE_ASM_NASM_COMPILER=yasm ../.. && \ + make -j $(nproc)ifelse(OS_NAME:OS_VERSION,centos:7,` )') && \ + define(`BUILD_OPENCV',` # build opencv ARG OPENCV_REPO=https://github.com/opencv/opencv/archive/OPENCV_VER.tar.gz @@ -47,7 +50,7 @@ RUN cd BUILD_HOME && \ wget -O - ${OPENCV_REPO} | tar xz # TODO: file a bug against opencv since they do not accept full libdir RUN cd BUILD_HOME/opencv-OPENCV_VER && mkdir build && cd build && \ - ifdef(`BUILD_CMAKE',cmake,ifelse(OS_NAME,centos,cmake3,cmake)) \ + ifelse(OS_NAME:OS_VERSION,centos:7,`(. /opt/rh/devtoolset-9/enable && ')ifdef(`BUILD_CMAKE',cmake,ifelse(OS_NAME,centos,cmake3,cmake)) \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=BUILD_PREFIX \ -DCMAKE_INSTALL_LIBDIR=patsubst(BUILD_LIBDIR,BUILD_PREFIX/) \ @@ -57,7 +60,7 @@ RUN cd BUILD_HOME/opencv-OPENCV_VER && mkdir build && cd build && \ -DBUILD_PERF_TESTS=OFF \ -DBUILD_TESTS=OFF \ .. && \ - make -j "$(nproc)" && \ + make -j $(nproc)ifelse(OS_NAME:OS_VERSION,centos:7,` )') && \ make install DESTDIR=BUILD_DESTDIR && \ make install ') @@ -65,7 +68,7 @@ RUN cd BUILD_HOME/opencv-OPENCV_VER && mkdir build && cd build && \ define(`REBUILD_OPENCV_VIDEOIO',` RUN cd BUILD_HOME/opencv-OPENCV_VER/build && \ rm -rf ./* && \ - ifdef(`BUILD_CMAKE',cmake,ifelse(OS_NAME,centos,cmake3,cmake)) \ + ifelse(OS_NAME:OS_VERSION,centos:7,`(. /opt/rh/devtoolset-9/enable && ')ifdef(`BUILD_CMAKE',cmake,ifelse(OS_NAME,centos,cmake3,cmake)) \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=BUILD_PREFIX \ -DCMAKE_INSTALL_LIBDIR=patsubst(BUILD_LIBDIR,BUILD_PREFIX/) \ @@ -76,8 +79,8 @@ RUN cd BUILD_HOME/opencv-OPENCV_VER/build && \ -DBUILD_TESTS=OFF \ .. && \ cd modules/videoio && \ - make -j "$(nproc)" && \ - cp -f ../../lib/libopencv_videoio.so.OPENCV_VER defn(`BUILD_DESTDIR',`BUILD_LIBDIR') + make -j $(nproc) && \ + cp -f ../../lib/libopencv_videoio.so.OPENCV_VER defn(`BUILD_DESTDIR',`BUILD_LIBDIR')ifelse(OS_NAME:OS_VERSION,centos:7,` )') ') REG(OPENCV) From 3946f920acfb2217c1ecf7937503c05919567fed Mon Sep 17 00:00:00 2001 From: dpatel257 Date: Tue, 22 Jun 2021 09:55:55 -0700 Subject: [PATCH 04/13] [master] Upgrade Meson for Ubuntu-20.04 (#748) * Update Docker image README (#704) * update README * Update dockerfiles * meson version fix Co-authored-by: jhou5 --- VCAC-A/ubuntu-20.04/analytics/dev/Dockerfile | 28 +++++++++++----- .../ubuntu-20.04/analytics/dev/Dockerfile.m4 | 1 + VCAC-A/ubuntu-20.04/analytics/gst/Dockerfile | 28 +++++++++++----- .../ubuntu-20.04/analytics/gst/Dockerfile.m4 | 1 + Xeon/ubuntu-20.04/analytics/dev/Dockerfile | 28 +++++++++++----- Xeon/ubuntu-20.04/analytics/dev/Dockerfile.m4 | 1 + Xeon/ubuntu-20.04/analytics/gst/Dockerfile | 28 +++++++++++----- Xeon/ubuntu-20.04/analytics/gst/Dockerfile.m4 | 1 + Xeon/ubuntu-20.04/media/dev/Dockerfile | 30 +++++++++++------ Xeon/ubuntu-20.04/media/dev/Dockerfile.m4 | 1 + Xeon/ubuntu-20.04/media/gst/Dockerfile | 28 +++++++++++----- Xeon/ubuntu-20.04/media/gst/Dockerfile.m4 | 1 + XeonE3/ubuntu-20.04/analytics/dev/Dockerfile | 30 +++++++++++------ .../ubuntu-20.04/analytics/dev/Dockerfile.m4 | 1 + XeonE3/ubuntu-20.04/analytics/gst/Dockerfile | 30 +++++++++++------ .../ubuntu-20.04/analytics/gst/Dockerfile.m4 | 1 + XeonE3/ubuntu-20.04/media/dev/Dockerfile | 32 +++++++++++++------ XeonE3/ubuntu-20.04/media/dev/Dockerfile.m4 | 1 + XeonE3/ubuntu-20.04/media/gst/Dockerfile | 30 +++++++++++------ XeonE3/ubuntu-20.04/media/gst/Dockerfile.m4 | 1 + 20 files changed, 216 insertions(+), 86 deletions(-) diff --git a/VCAC-A/ubuntu-20.04/analytics/dev/Dockerfile b/VCAC-A/ubuntu-20.04/analytics/dev/Dockerfile index 9e4a6d8ba..bad89f24f 100644 --- a/VCAC-A/ubuntu-20.04/analytics/dev/Dockerfile +++ b/VCAC-A/ubuntu-20.04/analytics/dev/Dockerfile @@ -196,7 +196,19 @@ RUN cd /opt/build && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates meson tar g++ wget pkg-config && \ + python3-pip ninja-build python3-setuptools && \ + rm -rf /var/lib/apt/lists/* + +# build meson +ARG MESON_REPO=https://github.com/mesonbuild/meson +RUN git clone ${MESON_REPO}; \ + cd meson; \ + git checkout 0.58.1; \ + python3 setup.py install; + +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + ca-certificates tar g++ wget pkg-config && \ rm -rf /var/lib/apt/lists/* # build dav1d @@ -402,7 +414,7 @@ RUN cd /opt/build/opencv-4.5.2 && mkdir build && cd build && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates meson tar g++ wget pkg-config libglib2.0-dev flex bison gobject-introspection libgirepository1.0-dev && \ + ca-certificates tar g++ wget pkg-config libglib2.0-dev flex bison gobject-introspection libgirepository1.0-dev && \ rm -rf /var/lib/apt/lists/* # build gst-core @@ -424,7 +436,7 @@ RUN cd /opt/build/gstreamer-1.19.1 && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates meson tar g++ gobjc wget pkg-config libglib2.0-dev flex bison gobject-introspection libgirepository1.0-dev libx11-dev libxv-dev libxt-dev libasound2-dev libpango1.0-dev libtheora-dev libvisual-0.4-dev libgl1-mesa-dev libx11-xcb-dev && \ + ca-certificates tar g++ gobjc wget pkg-config libglib2.0-dev flex bison gobject-introspection libgirepository1.0-dev libx11-dev libxv-dev libxt-dev libasound2-dev libpango1.0-dev libtheora-dev libvisual-0.4-dev libgl1-mesa-dev libx11-xcb-dev && \ rm -rf /var/lib/apt/lists/* # build gst-plugin-base @@ -453,7 +465,7 @@ RUN cd /opt/build/gst-plugins-base-1.19.1 && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - git ca-certificates meson tar g++ wget pkg-config libglib2.0-dev flex bison libx11-dev libxv-dev libxt-dev libgdk-pixbuf2.0-dev libjpeg-turbo8-dev libpng-dev zlib1g-dev libsoup2.4-dev && \ + git ca-certificates tar g++ wget pkg-config libglib2.0-dev flex bison libx11-dev libxv-dev libxt-dev libgdk-pixbuf2.0-dev libjpeg-turbo8-dev libpng-dev zlib1g-dev libsoup2.4-dev && \ rm -rf /var/lib/apt/lists/* # build gst-plugin-good @@ -479,7 +491,7 @@ RUN cd /opt/build/gst-plugins-good-1.19.1 && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates meson tar g++ wget pkg-config libglib2.0-dev flex bison gobject-introspection libgirepository1.0-dev openssl libcurl4-gnutls-dev librtmp-dev mjpegtools libde265-dev && \ + ca-certificates tar g++ wget pkg-config libglib2.0-dev flex bison gobject-introspection libgirepository1.0-dev openssl libcurl4-gnutls-dev librtmp-dev mjpegtools libde265-dev && \ rm -rf /var/lib/apt/lists/* # build gst-plugin-bad @@ -508,7 +520,7 @@ RUN cd /opt/build && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates meson tar g++ wget pkg-config libglib2.0-dev flex bison && \ + ca-certificates tar g++ wget pkg-config libglib2.0-dev flex bison && \ rm -rf /var/lib/apt/lists/* # build gst-plugin-ugly @@ -574,7 +586,7 @@ RUN cd /opt/build/opencv-4.5.2/build && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates tar g++ wget meson && \ + ca-certificates tar g++ wget && \ rm -rf /var/lib/apt/lists/* # build gst-plugin-libav @@ -591,7 +603,7 @@ RUN cd /opt/build/gst-libav-1.19.1 && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates meson tar g++ wget pkg-config libdrm-dev libglib2.0-dev libudev-dev flex bison && \ + ca-certificates tar g++ wget pkg-config libdrm-dev libglib2.0-dev libudev-dev flex bison && \ rm -rf /var/lib/apt/lists/* # patch gst-vaapi with gst-video-analytics patch diff --git a/VCAC-A/ubuntu-20.04/analytics/dev/Dockerfile.m4 b/VCAC-A/ubuntu-20.04/analytics/dev/Dockerfile.m4 index 8c8760da8..f63c5d8e3 100644 --- a/VCAC-A/ubuntu-20.04/analytics/dev/Dockerfile.m4 +++ b/VCAC-A/ubuntu-20.04/analytics/dev/Dockerfile.m4 @@ -8,6 +8,7 @@ include(libvpx.m4) include(libaom.m4) include(libx264.m4) include(libx265.m4) +include(meson.m4) include(dav1d.m4) include(gmmlib.m4) include(libva2.m4) diff --git a/VCAC-A/ubuntu-20.04/analytics/gst/Dockerfile b/VCAC-A/ubuntu-20.04/analytics/gst/Dockerfile index 415256f12..40ad5b847 100644 --- a/VCAC-A/ubuntu-20.04/analytics/gst/Dockerfile +++ b/VCAC-A/ubuntu-20.04/analytics/gst/Dockerfile @@ -196,7 +196,19 @@ RUN cd /opt/build && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates meson tar g++ wget pkg-config && \ + python3-pip ninja-build python3-setuptools && \ + rm -rf /var/lib/apt/lists/* + +# build meson +ARG MESON_REPO=https://github.com/mesonbuild/meson +RUN git clone ${MESON_REPO}; \ + cd meson; \ + git checkout 0.58.1; \ + python3 setup.py install; + +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + ca-certificates tar g++ wget pkg-config && \ rm -rf /var/lib/apt/lists/* # build dav1d @@ -381,7 +393,7 @@ RUN cd /opt/build/opencv-4.5.2 && mkdir build && cd build && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates meson tar g++ wget pkg-config libglib2.0-dev flex bison gobject-introspection libgirepository1.0-dev && \ + ca-certificates tar g++ wget pkg-config libglib2.0-dev flex bison gobject-introspection libgirepository1.0-dev && \ rm -rf /var/lib/apt/lists/* # build gst-core @@ -403,7 +415,7 @@ RUN cd /opt/build/gstreamer-1.19.1 && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates meson tar g++ gobjc wget pkg-config libglib2.0-dev flex bison gobject-introspection libgirepository1.0-dev libx11-dev libxv-dev libxt-dev libasound2-dev libpango1.0-dev libtheora-dev libvisual-0.4-dev libgl1-mesa-dev libx11-xcb-dev && \ + ca-certificates tar g++ gobjc wget pkg-config libglib2.0-dev flex bison gobject-introspection libgirepository1.0-dev libx11-dev libxv-dev libxt-dev libasound2-dev libpango1.0-dev libtheora-dev libvisual-0.4-dev libgl1-mesa-dev libx11-xcb-dev && \ rm -rf /var/lib/apt/lists/* # build gst-plugin-base @@ -432,7 +444,7 @@ RUN cd /opt/build/gst-plugins-base-1.19.1 && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - git ca-certificates meson tar g++ wget pkg-config libglib2.0-dev flex bison libx11-dev libxv-dev libxt-dev libgdk-pixbuf2.0-dev libjpeg-turbo8-dev libpng-dev zlib1g-dev libsoup2.4-dev && \ + git ca-certificates tar g++ wget pkg-config libglib2.0-dev flex bison libx11-dev libxv-dev libxt-dev libgdk-pixbuf2.0-dev libjpeg-turbo8-dev libpng-dev zlib1g-dev libsoup2.4-dev && \ rm -rf /var/lib/apt/lists/* # build gst-plugin-good @@ -458,7 +470,7 @@ RUN cd /opt/build/gst-plugins-good-1.19.1 && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates meson tar g++ wget pkg-config libglib2.0-dev flex bison gobject-introspection libgirepository1.0-dev openssl libcurl4-gnutls-dev librtmp-dev mjpegtools libde265-dev && \ + ca-certificates tar g++ wget pkg-config libglib2.0-dev flex bison gobject-introspection libgirepository1.0-dev openssl libcurl4-gnutls-dev librtmp-dev mjpegtools libde265-dev && \ rm -rf /var/lib/apt/lists/* # build gst-plugin-bad @@ -487,7 +499,7 @@ RUN cd /opt/build && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates meson tar g++ wget pkg-config libglib2.0-dev flex bison && \ + ca-certificates tar g++ wget pkg-config libglib2.0-dev flex bison && \ rm -rf /var/lib/apt/lists/* # build gst-plugin-ugly @@ -553,7 +565,7 @@ RUN cd /opt/build/opencv-4.5.2/build && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates tar g++ wget meson && \ + ca-certificates tar g++ wget && \ rm -rf /var/lib/apt/lists/* # build gst-plugin-libav @@ -570,7 +582,7 @@ RUN cd /opt/build/gst-libav-1.19.1 && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates meson tar g++ wget pkg-config libdrm-dev libglib2.0-dev libudev-dev flex bison && \ + ca-certificates tar g++ wget pkg-config libdrm-dev libglib2.0-dev libudev-dev flex bison && \ rm -rf /var/lib/apt/lists/* # patch gst-vaapi with gst-video-analytics patch diff --git a/VCAC-A/ubuntu-20.04/analytics/gst/Dockerfile.m4 b/VCAC-A/ubuntu-20.04/analytics/gst/Dockerfile.m4 index f067d4d23..18fbc7f36 100644 --- a/VCAC-A/ubuntu-20.04/analytics/gst/Dockerfile.m4 +++ b/VCAC-A/ubuntu-20.04/analytics/gst/Dockerfile.m4 @@ -8,6 +8,7 @@ include(libvpx.m4) include(libaom.m4) include(libx264.m4) include(libx265.m4) +include(meson.m4) include(dav1d.m4) include(gmmlib.m4) include(libva2.m4) diff --git a/Xeon/ubuntu-20.04/analytics/dev/Dockerfile b/Xeon/ubuntu-20.04/analytics/dev/Dockerfile index 3dc3fad29..b3f68a593 100644 --- a/Xeon/ubuntu-20.04/analytics/dev/Dockerfile +++ b/Xeon/ubuntu-20.04/analytics/dev/Dockerfile @@ -196,7 +196,19 @@ RUN cd /opt/build && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates meson tar g++ wget pkg-config && \ + python3-pip ninja-build python3-setuptools && \ + rm -rf /var/lib/apt/lists/* + +# build meson +ARG MESON_REPO=https://github.com/mesonbuild/meson +RUN git clone ${MESON_REPO}; \ + cd meson; \ + git checkout 0.58.1; \ + python3 setup.py install; + +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + ca-certificates tar g++ wget pkg-config && \ rm -rf /var/lib/apt/lists/* # build dav1d @@ -403,7 +415,7 @@ RUN { \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates meson tar g++ wget pkg-config libglib2.0-dev flex bison gobject-introspection libgirepository1.0-dev && \ + ca-certificates tar g++ wget pkg-config libglib2.0-dev flex bison gobject-introspection libgirepository1.0-dev && \ rm -rf /var/lib/apt/lists/* # build gst-core @@ -425,7 +437,7 @@ RUN cd /opt/build/gstreamer-1.19.1 && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates meson tar g++ gobjc wget pkg-config libglib2.0-dev flex bison gobject-introspection libgirepository1.0-dev libx11-dev libxv-dev libxt-dev libasound2-dev libpango1.0-dev libtheora-dev libvisual-0.4-dev libgl1-mesa-dev libx11-xcb-dev && \ + ca-certificates tar g++ gobjc wget pkg-config libglib2.0-dev flex bison gobject-introspection libgirepository1.0-dev libx11-dev libxv-dev libxt-dev libasound2-dev libpango1.0-dev libtheora-dev libvisual-0.4-dev libgl1-mesa-dev libx11-xcb-dev && \ rm -rf /var/lib/apt/lists/* # build gst-plugin-base @@ -454,7 +466,7 @@ RUN cd /opt/build/gst-plugins-base-1.19.1 && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - git ca-certificates meson tar g++ wget pkg-config libglib2.0-dev flex bison libx11-dev libxv-dev libxt-dev libgdk-pixbuf2.0-dev libjpeg-turbo8-dev libpng-dev zlib1g-dev libsoup2.4-dev && \ + git ca-certificates tar g++ wget pkg-config libglib2.0-dev flex bison libx11-dev libxv-dev libxt-dev libgdk-pixbuf2.0-dev libjpeg-turbo8-dev libpng-dev zlib1g-dev libsoup2.4-dev && \ rm -rf /var/lib/apt/lists/* # build gst-plugin-good @@ -480,7 +492,7 @@ RUN cd /opt/build/gst-plugins-good-1.19.1 && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates meson tar g++ wget pkg-config libglib2.0-dev flex bison gobject-introspection libgirepository1.0-dev openssl libcurl4-gnutls-dev librtmp-dev mjpegtools libde265-dev && \ + ca-certificates tar g++ wget pkg-config libglib2.0-dev flex bison gobject-introspection libgirepository1.0-dev openssl libcurl4-gnutls-dev librtmp-dev mjpegtools libde265-dev && \ rm -rf /var/lib/apt/lists/* # build gst-plugin-bad @@ -509,7 +521,7 @@ RUN cd /opt/build && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates meson tar g++ wget pkg-config libglib2.0-dev flex bison && \ + ca-certificates tar g++ wget pkg-config libglib2.0-dev flex bison && \ rm -rf /var/lib/apt/lists/* # build gst-plugin-ugly @@ -572,7 +584,7 @@ RUN cd /opt/build/opencv-4.5.2/build && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates tar g++ wget meson && \ + ca-certificates tar g++ wget && \ rm -rf /var/lib/apt/lists/* # build gst-plugin-libav @@ -589,7 +601,7 @@ RUN cd /opt/build/gst-libav-1.19.1 && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates tar g++ wget meson && \ + ca-certificates tar g++ wget && \ rm -rf /var/lib/apt/lists/* RUN cd /opt/build/SVT-HEVC/gstreamer-plugin && \ diff --git a/Xeon/ubuntu-20.04/analytics/dev/Dockerfile.m4 b/Xeon/ubuntu-20.04/analytics/dev/Dockerfile.m4 index 161e8c1a2..91bbade16 100644 --- a/Xeon/ubuntu-20.04/analytics/dev/Dockerfile.m4 +++ b/Xeon/ubuntu-20.04/analytics/dev/Dockerfile.m4 @@ -8,6 +8,7 @@ include(libvpx.m4) include(libaom.m4) include(libx264.m4) include(libx265.m4) +include(meson.m4) include(dav1d.m4) include(libjsonc.m4) include(librdkafka.m4) diff --git a/Xeon/ubuntu-20.04/analytics/gst/Dockerfile b/Xeon/ubuntu-20.04/analytics/gst/Dockerfile index 56b7627e8..e42ff2474 100644 --- a/Xeon/ubuntu-20.04/analytics/gst/Dockerfile +++ b/Xeon/ubuntu-20.04/analytics/gst/Dockerfile @@ -196,7 +196,19 @@ RUN cd /opt/build && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates meson tar g++ wget pkg-config && \ + python3-pip ninja-build python3-setuptools && \ + rm -rf /var/lib/apt/lists/* + +# build meson +ARG MESON_REPO=https://github.com/mesonbuild/meson +RUN git clone ${MESON_REPO}; \ + cd meson; \ + git checkout 0.58.1; \ + python3 setup.py install; + +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + ca-certificates tar g++ wget pkg-config && \ rm -rf /var/lib/apt/lists/* # build dav1d @@ -403,7 +415,7 @@ RUN cd /opt/build && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates meson tar g++ wget pkg-config libglib2.0-dev flex bison gobject-introspection libgirepository1.0-dev && \ + ca-certificates tar g++ wget pkg-config libglib2.0-dev flex bison gobject-introspection libgirepository1.0-dev && \ rm -rf /var/lib/apt/lists/* # build gst-core @@ -425,7 +437,7 @@ RUN cd /opt/build/gstreamer-1.19.1 && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates meson tar g++ gobjc wget pkg-config libglib2.0-dev flex bison gobject-introspection libgirepository1.0-dev libx11-dev libxv-dev libxt-dev libasound2-dev libpango1.0-dev libtheora-dev libvisual-0.4-dev libgl1-mesa-dev libx11-xcb-dev && \ + ca-certificates tar g++ gobjc wget pkg-config libglib2.0-dev flex bison gobject-introspection libgirepository1.0-dev libx11-dev libxv-dev libxt-dev libasound2-dev libpango1.0-dev libtheora-dev libvisual-0.4-dev libgl1-mesa-dev libx11-xcb-dev && \ rm -rf /var/lib/apt/lists/* # build gst-plugin-base @@ -454,7 +466,7 @@ RUN cd /opt/build/gst-plugins-base-1.19.1 && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - git ca-certificates meson tar g++ wget pkg-config libglib2.0-dev flex bison libx11-dev libxv-dev libxt-dev libgdk-pixbuf2.0-dev libjpeg-turbo8-dev libpng-dev zlib1g-dev libsoup2.4-dev && \ + git ca-certificates tar g++ wget pkg-config libglib2.0-dev flex bison libx11-dev libxv-dev libxt-dev libgdk-pixbuf2.0-dev libjpeg-turbo8-dev libpng-dev zlib1g-dev libsoup2.4-dev && \ rm -rf /var/lib/apt/lists/* # build gst-plugin-good @@ -480,7 +492,7 @@ RUN cd /opt/build/gst-plugins-good-1.19.1 && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates meson tar g++ wget pkg-config libglib2.0-dev flex bison gobject-introspection libgirepository1.0-dev openssl libcurl4-gnutls-dev librtmp-dev mjpegtools libde265-dev && \ + ca-certificates tar g++ wget pkg-config libglib2.0-dev flex bison gobject-introspection libgirepository1.0-dev openssl libcurl4-gnutls-dev librtmp-dev mjpegtools libde265-dev && \ rm -rf /var/lib/apt/lists/* # build gst-plugin-bad @@ -509,7 +521,7 @@ RUN cd /opt/build && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates meson tar g++ wget pkg-config libglib2.0-dev flex bison && \ + ca-certificates tar g++ wget pkg-config libglib2.0-dev flex bison && \ rm -rf /var/lib/apt/lists/* # build gst-plugin-ugly @@ -572,7 +584,7 @@ RUN cd /opt/build/opencv-4.5.2/build && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates tar g++ wget meson && \ + ca-certificates tar g++ wget && \ rm -rf /var/lib/apt/lists/* # build gst-plugin-libav @@ -589,7 +601,7 @@ RUN cd /opt/build/gst-libav-1.19.1 && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates tar g++ wget meson && \ + ca-certificates tar g++ wget && \ rm -rf /var/lib/apt/lists/* RUN cd /opt/build/SVT-HEVC/gstreamer-plugin && \ diff --git a/Xeon/ubuntu-20.04/analytics/gst/Dockerfile.m4 b/Xeon/ubuntu-20.04/analytics/gst/Dockerfile.m4 index 63879ac22..89e852e05 100644 --- a/Xeon/ubuntu-20.04/analytics/gst/Dockerfile.m4 +++ b/Xeon/ubuntu-20.04/analytics/gst/Dockerfile.m4 @@ -8,6 +8,7 @@ include(libvpx.m4) include(libaom.m4) include(libx264.m4) include(libx265.m4) +include(meson.m4) include(dav1d.m4) include(svt-hevc.m4) include(svt-av1.m4) diff --git a/Xeon/ubuntu-20.04/media/dev/Dockerfile b/Xeon/ubuntu-20.04/media/dev/Dockerfile index e32b1bfb0..5d8f80b12 100644 --- a/Xeon/ubuntu-20.04/media/dev/Dockerfile +++ b/Xeon/ubuntu-20.04/media/dev/Dockerfile @@ -197,7 +197,19 @@ RUN cd /opt/build && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates meson tar g++ wget pkg-config && \ + python3-pip ninja-build python3-setuptools && \ + rm -rf /var/lib/apt/lists/* + +# build meson +ARG MESON_REPO=https://github.com/mesonbuild/meson +RUN git clone ${MESON_REPO}; \ + cd meson; \ + git checkout 0.58.1; \ + python3 setup.py install; + +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + ca-certificates tar g++ wget pkg-config && \ rm -rf /var/lib/apt/lists/* # build dav1d @@ -212,7 +224,7 @@ RUN cd /opt/build/dav1d-0.9.0 && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates meson tar g++ wget pkg-config ninja-build && \ + ca-certificates tar g++ wget pkg-config ninja-build && \ rm -rf /var/lib/apt/lists/* # build VMAF @@ -276,7 +288,7 @@ RUN cd /opt/build && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates meson tar g++ wget pkg-config libglib2.0-dev flex bison gobject-introspection libgirepository1.0-dev && \ + ca-certificates tar g++ wget pkg-config libglib2.0-dev flex bison gobject-introspection libgirepository1.0-dev && \ rm -rf /var/lib/apt/lists/* # build gst-core @@ -298,7 +310,7 @@ RUN cd /opt/build/gstreamer-1.19.1 && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates meson tar g++ gobjc wget pkg-config libglib2.0-dev flex bison gobject-introspection libgirepository1.0-dev libx11-dev libxv-dev libxt-dev libasound2-dev libpango1.0-dev libtheora-dev libvisual-0.4-dev libgl1-mesa-dev libx11-xcb-dev && \ + ca-certificates tar g++ gobjc wget pkg-config libglib2.0-dev flex bison gobject-introspection libgirepository1.0-dev libx11-dev libxv-dev libxt-dev libasound2-dev libpango1.0-dev libtheora-dev libvisual-0.4-dev libgl1-mesa-dev libx11-xcb-dev && \ rm -rf /var/lib/apt/lists/* # build gst-plugin-base @@ -327,7 +339,7 @@ RUN cd /opt/build/gst-plugins-base-1.19.1 && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - git ca-certificates meson tar g++ wget pkg-config libglib2.0-dev flex bison libx11-dev libxv-dev libxt-dev libgdk-pixbuf2.0-dev libjpeg-turbo8-dev libpng-dev zlib1g-dev libsoup2.4-dev && \ + git ca-certificates tar g++ wget pkg-config libglib2.0-dev flex bison libx11-dev libxv-dev libxt-dev libgdk-pixbuf2.0-dev libjpeg-turbo8-dev libpng-dev zlib1g-dev libsoup2.4-dev && \ rm -rf /var/lib/apt/lists/* # build gst-plugin-good @@ -353,7 +365,7 @@ RUN cd /opt/build/gst-plugins-good-1.19.1 && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates meson tar g++ wget pkg-config libglib2.0-dev flex bison gobject-introspection libgirepository1.0-dev openssl libcurl4-gnutls-dev librtmp-dev mjpegtools libde265-dev && \ + ca-certificates tar g++ wget pkg-config libglib2.0-dev flex bison gobject-introspection libgirepository1.0-dev openssl libcurl4-gnutls-dev librtmp-dev mjpegtools libde265-dev && \ rm -rf /var/lib/apt/lists/* # build gst-plugin-bad @@ -382,7 +394,7 @@ RUN cd /opt/build && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates meson tar g++ wget pkg-config libglib2.0-dev flex bison && \ + ca-certificates tar g++ wget pkg-config libglib2.0-dev flex bison && \ rm -rf /var/lib/apt/lists/* # build gst-plugin-ugly @@ -429,7 +441,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates tar g++ wget meson && \ + ca-certificates tar g++ wget && \ rm -rf /var/lib/apt/lists/* # build gst-plugin-libav @@ -446,7 +458,7 @@ RUN cd /opt/build/gst-libav-1.19.1 && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates tar g++ wget meson && \ + ca-certificates tar g++ wget && \ rm -rf /var/lib/apt/lists/* RUN cd /opt/build/SVT-HEVC/gstreamer-plugin && \ diff --git a/Xeon/ubuntu-20.04/media/dev/Dockerfile.m4 b/Xeon/ubuntu-20.04/media/dev/Dockerfile.m4 index 96bab56eb..be2d9b3a7 100644 --- a/Xeon/ubuntu-20.04/media/dev/Dockerfile.m4 +++ b/Xeon/ubuntu-20.04/media/dev/Dockerfile.m4 @@ -9,6 +9,7 @@ include(libvpx.m4) include(libaom.m4) include(libx264.m4) include(libx265.m4) +include(meson.m4) include(dav1d.m4) include(libvmaf.m4) include(svt-hevc.m4) diff --git a/Xeon/ubuntu-20.04/media/gst/Dockerfile b/Xeon/ubuntu-20.04/media/gst/Dockerfile index 44995db68..d0327e6df 100644 --- a/Xeon/ubuntu-20.04/media/gst/Dockerfile +++ b/Xeon/ubuntu-20.04/media/gst/Dockerfile @@ -197,7 +197,19 @@ RUN cd /opt/build && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates meson tar g++ wget pkg-config && \ + python3-pip ninja-build python3-setuptools && \ + rm -rf /var/lib/apt/lists/* + +# build meson +ARG MESON_REPO=https://github.com/mesonbuild/meson +RUN git clone ${MESON_REPO}; \ + cd meson; \ + git checkout 0.58.1; \ + python3 setup.py install; + +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + ca-certificates tar g++ wget pkg-config && \ rm -rf /var/lib/apt/lists/* # build dav1d @@ -259,7 +271,7 @@ RUN cd /opt/build && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates meson tar g++ wget pkg-config libglib2.0-dev flex bison gobject-introspection libgirepository1.0-dev && \ + ca-certificates tar g++ wget pkg-config libglib2.0-dev flex bison gobject-introspection libgirepository1.0-dev && \ rm -rf /var/lib/apt/lists/* # build gst-core @@ -281,7 +293,7 @@ RUN cd /opt/build/gstreamer-1.19.1 && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates meson tar g++ gobjc wget pkg-config libglib2.0-dev flex bison gobject-introspection libgirepository1.0-dev libx11-dev libxv-dev libxt-dev libasound2-dev libpango1.0-dev libtheora-dev libvisual-0.4-dev libgl1-mesa-dev libx11-xcb-dev && \ + ca-certificates tar g++ gobjc wget pkg-config libglib2.0-dev flex bison gobject-introspection libgirepository1.0-dev libx11-dev libxv-dev libxt-dev libasound2-dev libpango1.0-dev libtheora-dev libvisual-0.4-dev libgl1-mesa-dev libx11-xcb-dev && \ rm -rf /var/lib/apt/lists/* # build gst-plugin-base @@ -310,7 +322,7 @@ RUN cd /opt/build/gst-plugins-base-1.19.1 && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - git ca-certificates meson tar g++ wget pkg-config libglib2.0-dev flex bison libx11-dev libxv-dev libxt-dev libgdk-pixbuf2.0-dev libjpeg-turbo8-dev libpng-dev zlib1g-dev libsoup2.4-dev && \ + git ca-certificates tar g++ wget pkg-config libglib2.0-dev flex bison libx11-dev libxv-dev libxt-dev libgdk-pixbuf2.0-dev libjpeg-turbo8-dev libpng-dev zlib1g-dev libsoup2.4-dev && \ rm -rf /var/lib/apt/lists/* # build gst-plugin-good @@ -336,7 +348,7 @@ RUN cd /opt/build/gst-plugins-good-1.19.1 && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates meson tar g++ wget pkg-config libglib2.0-dev flex bison gobject-introspection libgirepository1.0-dev openssl libcurl4-gnutls-dev librtmp-dev mjpegtools libde265-dev && \ + ca-certificates tar g++ wget pkg-config libglib2.0-dev flex bison gobject-introspection libgirepository1.0-dev openssl libcurl4-gnutls-dev librtmp-dev mjpegtools libde265-dev && \ rm -rf /var/lib/apt/lists/* # build gst-plugin-bad @@ -365,7 +377,7 @@ RUN cd /opt/build && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates meson tar g++ wget pkg-config libglib2.0-dev flex bison && \ + ca-certificates tar g++ wget pkg-config libglib2.0-dev flex bison && \ rm -rf /var/lib/apt/lists/* # build gst-plugin-ugly @@ -412,7 +424,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates tar g++ wget meson && \ + ca-certificates tar g++ wget && \ rm -rf /var/lib/apt/lists/* # build gst-plugin-libav @@ -429,7 +441,7 @@ RUN cd /opt/build/gst-libav-1.19.1 && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates tar g++ wget meson && \ + ca-certificates tar g++ wget && \ rm -rf /var/lib/apt/lists/* RUN cd /opt/build/SVT-HEVC/gstreamer-plugin && \ diff --git a/Xeon/ubuntu-20.04/media/gst/Dockerfile.m4 b/Xeon/ubuntu-20.04/media/gst/Dockerfile.m4 index ca4379824..9bfeeb2be 100644 --- a/Xeon/ubuntu-20.04/media/gst/Dockerfile.m4 +++ b/Xeon/ubuntu-20.04/media/gst/Dockerfile.m4 @@ -9,6 +9,7 @@ include(libvpx.m4) include(libaom.m4) include(libx264.m4) include(libx265.m4) +include(meson.m4) include(dav1d.m4) include(svt-hevc.m4) include(svt-av1.m4) diff --git a/XeonE3/ubuntu-20.04/analytics/dev/Dockerfile b/XeonE3/ubuntu-20.04/analytics/dev/Dockerfile index 1f465a5ae..46d6a7e85 100644 --- a/XeonE3/ubuntu-20.04/analytics/dev/Dockerfile +++ b/XeonE3/ubuntu-20.04/analytics/dev/Dockerfile @@ -196,7 +196,19 @@ RUN cd /opt/build && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates meson tar g++ wget pkg-config && \ + python3-pip ninja-build python3-setuptools && \ + rm -rf /var/lib/apt/lists/* + +# build meson +ARG MESON_REPO=https://github.com/mesonbuild/meson +RUN git clone ${MESON_REPO}; \ + cd meson; \ + git checkout 0.58.1; \ + python3 setup.py install; + +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + ca-certificates tar g++ wget pkg-config && \ rm -rf /var/lib/apt/lists/* # build dav1d @@ -486,7 +498,7 @@ RUN cd /opt/build && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates meson tar g++ wget pkg-config libglib2.0-dev flex bison gobject-introspection libgirepository1.0-dev && \ + ca-certificates tar g++ wget pkg-config libglib2.0-dev flex bison gobject-introspection libgirepository1.0-dev && \ rm -rf /var/lib/apt/lists/* # build gst-core @@ -508,7 +520,7 @@ RUN cd /opt/build/gstreamer-1.19.1 && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates meson tar g++ gobjc wget pkg-config libglib2.0-dev flex bison gobject-introspection libgirepository1.0-dev libx11-dev libxv-dev libxt-dev libasound2-dev libpango1.0-dev libtheora-dev libvisual-0.4-dev libgl1-mesa-dev libx11-xcb-dev && \ + ca-certificates tar g++ gobjc wget pkg-config libglib2.0-dev flex bison gobject-introspection libgirepository1.0-dev libx11-dev libxv-dev libxt-dev libasound2-dev libpango1.0-dev libtheora-dev libvisual-0.4-dev libgl1-mesa-dev libx11-xcb-dev && \ rm -rf /var/lib/apt/lists/* # build gst-plugin-base @@ -537,7 +549,7 @@ RUN cd /opt/build/gst-plugins-base-1.19.1 && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - git ca-certificates meson tar g++ wget pkg-config libglib2.0-dev flex bison libx11-dev libxv-dev libxt-dev libgdk-pixbuf2.0-dev libjpeg-turbo8-dev libpng-dev zlib1g-dev libsoup2.4-dev && \ + git ca-certificates tar g++ wget pkg-config libglib2.0-dev flex bison libx11-dev libxv-dev libxt-dev libgdk-pixbuf2.0-dev libjpeg-turbo8-dev libpng-dev zlib1g-dev libsoup2.4-dev && \ rm -rf /var/lib/apt/lists/* # build gst-plugin-good @@ -563,7 +575,7 @@ RUN cd /opt/build/gst-plugins-good-1.19.1 && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates meson tar g++ wget pkg-config libglib2.0-dev flex bison gobject-introspection libgirepository1.0-dev openssl libcurl4-gnutls-dev librtmp-dev mjpegtools libde265-dev && \ + ca-certificates tar g++ wget pkg-config libglib2.0-dev flex bison gobject-introspection libgirepository1.0-dev openssl libcurl4-gnutls-dev librtmp-dev mjpegtools libde265-dev && \ rm -rf /var/lib/apt/lists/* # build gst-plugin-bad @@ -592,7 +604,7 @@ RUN cd /opt/build && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates meson tar g++ wget pkg-config libglib2.0-dev flex bison && \ + ca-certificates tar g++ wget pkg-config libglib2.0-dev flex bison && \ rm -rf /var/lib/apt/lists/* # build gst-plugin-ugly @@ -660,7 +672,7 @@ RUN cd /opt/build/opencv-4.5.2/build && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates tar g++ wget meson && \ + ca-certificates tar g++ wget && \ rm -rf /var/lib/apt/lists/* # build gst-plugin-libav @@ -677,7 +689,7 @@ RUN cd /opt/build/gst-libav-1.19.1 && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates meson tar g++ wget pkg-config libdrm-dev libglib2.0-dev libudev-dev flex bison && \ + ca-certificates tar g++ wget pkg-config libdrm-dev libglib2.0-dev libudev-dev flex bison && \ rm -rf /var/lib/apt/lists/* # patch gst-vaapi with gst-video-analytics patch @@ -711,7 +723,7 @@ RUN cd /opt/build/gstreamer-vaapi-1.19.1 && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates tar g++ wget meson && \ + ca-certificates tar g++ wget && \ rm -rf /var/lib/apt/lists/* RUN cd /opt/build/SVT-HEVC/gstreamer-plugin && \ diff --git a/XeonE3/ubuntu-20.04/analytics/dev/Dockerfile.m4 b/XeonE3/ubuntu-20.04/analytics/dev/Dockerfile.m4 index 733ae3959..43fb6e6c2 100644 --- a/XeonE3/ubuntu-20.04/analytics/dev/Dockerfile.m4 +++ b/XeonE3/ubuntu-20.04/analytics/dev/Dockerfile.m4 @@ -8,6 +8,7 @@ include(libvpx.m4) include(libaom.m4) include(libx264.m4) include(libx265.m4) +include(meson.m4) include(dav1d.m4) include(svt-hevc.m4) include(svt-av1.m4) diff --git a/XeonE3/ubuntu-20.04/analytics/gst/Dockerfile b/XeonE3/ubuntu-20.04/analytics/gst/Dockerfile index 52ea55987..a7946e7bc 100644 --- a/XeonE3/ubuntu-20.04/analytics/gst/Dockerfile +++ b/XeonE3/ubuntu-20.04/analytics/gst/Dockerfile @@ -196,7 +196,19 @@ RUN cd /opt/build && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates meson tar g++ wget pkg-config && \ + python3-pip ninja-build python3-setuptools && \ + rm -rf /var/lib/apt/lists/* + +# build meson +ARG MESON_REPO=https://github.com/mesonbuild/meson +RUN git clone ${MESON_REPO}; \ + cd meson; \ + git checkout 0.58.1; \ + python3 setup.py install; + +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + ca-certificates tar g++ wget pkg-config && \ rm -rf /var/lib/apt/lists/* # build dav1d @@ -465,7 +477,7 @@ RUN cd /opt/build && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates meson tar g++ wget pkg-config libglib2.0-dev flex bison gobject-introspection libgirepository1.0-dev && \ + ca-certificates tar g++ wget pkg-config libglib2.0-dev flex bison gobject-introspection libgirepository1.0-dev && \ rm -rf /var/lib/apt/lists/* # build gst-core @@ -487,7 +499,7 @@ RUN cd /opt/build/gstreamer-1.19.1 && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates meson tar g++ gobjc wget pkg-config libglib2.0-dev flex bison gobject-introspection libgirepository1.0-dev libx11-dev libxv-dev libxt-dev libasound2-dev libpango1.0-dev libtheora-dev libvisual-0.4-dev libgl1-mesa-dev libx11-xcb-dev && \ + ca-certificates tar g++ gobjc wget pkg-config libglib2.0-dev flex bison gobject-introspection libgirepository1.0-dev libx11-dev libxv-dev libxt-dev libasound2-dev libpango1.0-dev libtheora-dev libvisual-0.4-dev libgl1-mesa-dev libx11-xcb-dev && \ rm -rf /var/lib/apt/lists/* # build gst-plugin-base @@ -516,7 +528,7 @@ RUN cd /opt/build/gst-plugins-base-1.19.1 && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - git ca-certificates meson tar g++ wget pkg-config libglib2.0-dev flex bison libx11-dev libxv-dev libxt-dev libgdk-pixbuf2.0-dev libjpeg-turbo8-dev libpng-dev zlib1g-dev libsoup2.4-dev && \ + git ca-certificates tar g++ wget pkg-config libglib2.0-dev flex bison libx11-dev libxv-dev libxt-dev libgdk-pixbuf2.0-dev libjpeg-turbo8-dev libpng-dev zlib1g-dev libsoup2.4-dev && \ rm -rf /var/lib/apt/lists/* # build gst-plugin-good @@ -542,7 +554,7 @@ RUN cd /opt/build/gst-plugins-good-1.19.1 && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates meson tar g++ wget pkg-config libglib2.0-dev flex bison gobject-introspection libgirepository1.0-dev openssl libcurl4-gnutls-dev librtmp-dev mjpegtools libde265-dev && \ + ca-certificates tar g++ wget pkg-config libglib2.0-dev flex bison gobject-introspection libgirepository1.0-dev openssl libcurl4-gnutls-dev librtmp-dev mjpegtools libde265-dev && \ rm -rf /var/lib/apt/lists/* # build gst-plugin-bad @@ -571,7 +583,7 @@ RUN cd /opt/build && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates meson tar g++ wget pkg-config libglib2.0-dev flex bison && \ + ca-certificates tar g++ wget pkg-config libglib2.0-dev flex bison && \ rm -rf /var/lib/apt/lists/* # build gst-plugin-ugly @@ -639,7 +651,7 @@ RUN cd /opt/build/opencv-4.5.2/build && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates tar g++ wget meson && \ + ca-certificates tar g++ wget && \ rm -rf /var/lib/apt/lists/* # build gst-plugin-libav @@ -656,7 +668,7 @@ RUN cd /opt/build/gst-libav-1.19.1 && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates meson tar g++ wget pkg-config libdrm-dev libglib2.0-dev libudev-dev flex bison && \ + ca-certificates tar g++ wget pkg-config libdrm-dev libglib2.0-dev libudev-dev flex bison && \ rm -rf /var/lib/apt/lists/* # patch gst-vaapi with gst-video-analytics patch @@ -690,7 +702,7 @@ RUN cd /opt/build/gstreamer-vaapi-1.19.1 && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates tar g++ wget meson && \ + ca-certificates tar g++ wget && \ rm -rf /var/lib/apt/lists/* RUN cd /opt/build/SVT-HEVC/gstreamer-plugin && \ diff --git a/XeonE3/ubuntu-20.04/analytics/gst/Dockerfile.m4 b/XeonE3/ubuntu-20.04/analytics/gst/Dockerfile.m4 index 930643983..16138b98e 100644 --- a/XeonE3/ubuntu-20.04/analytics/gst/Dockerfile.m4 +++ b/XeonE3/ubuntu-20.04/analytics/gst/Dockerfile.m4 @@ -8,6 +8,7 @@ include(libvpx.m4) include(libaom.m4) include(libx264.m4) include(libx265.m4) +include(meson.m4) include(dav1d.m4) include(svt-hevc.m4) include(svt-av1.m4) diff --git a/XeonE3/ubuntu-20.04/media/dev/Dockerfile b/XeonE3/ubuntu-20.04/media/dev/Dockerfile index a1f2f47f3..148cb2ed7 100644 --- a/XeonE3/ubuntu-20.04/media/dev/Dockerfile +++ b/XeonE3/ubuntu-20.04/media/dev/Dockerfile @@ -197,7 +197,19 @@ RUN cd /opt/build && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates meson tar g++ wget pkg-config && \ + python3-pip ninja-build python3-setuptools && \ + rm -rf /var/lib/apt/lists/* + +# build meson +ARG MESON_REPO=https://github.com/mesonbuild/meson +RUN git clone ${MESON_REPO}; \ + cd meson; \ + git checkout 0.58.1; \ + python3 setup.py install; + +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + ca-certificates tar g++ wget pkg-config && \ rm -rf /var/lib/apt/lists/* # build dav1d @@ -212,7 +224,7 @@ RUN cd /opt/build/dav1d-0.9.0 && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates meson tar g++ wget pkg-config ninja-build && \ + ca-certificates tar g++ wget pkg-config ninja-build && \ rm -rf /var/lib/apt/lists/* # build VMAF @@ -342,7 +354,7 @@ RUN cd /opt/build/MediaSDK-intel-mediasdk-21.1.3 && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates meson tar g++ wget pkg-config libglib2.0-dev flex bison gobject-introspection libgirepository1.0-dev && \ + ca-certificates tar g++ wget pkg-config libglib2.0-dev flex bison gobject-introspection libgirepository1.0-dev && \ rm -rf /var/lib/apt/lists/* # build gst-core @@ -364,7 +376,7 @@ RUN cd /opt/build/gstreamer-1.19.1 && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates meson tar g++ gobjc wget pkg-config libglib2.0-dev flex bison gobject-introspection libgirepository1.0-dev libx11-dev libxv-dev libxt-dev libasound2-dev libpango1.0-dev libtheora-dev libvisual-0.4-dev libgl1-mesa-dev libx11-xcb-dev && \ + ca-certificates tar g++ gobjc wget pkg-config libglib2.0-dev flex bison gobject-introspection libgirepository1.0-dev libx11-dev libxv-dev libxt-dev libasound2-dev libpango1.0-dev libtheora-dev libvisual-0.4-dev libgl1-mesa-dev libx11-xcb-dev && \ rm -rf /var/lib/apt/lists/* # build gst-plugin-base @@ -393,7 +405,7 @@ RUN cd /opt/build/gst-plugins-base-1.19.1 && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - git ca-certificates meson tar g++ wget pkg-config libglib2.0-dev flex bison libx11-dev libxv-dev libxt-dev libgdk-pixbuf2.0-dev libjpeg-turbo8-dev libpng-dev zlib1g-dev libsoup2.4-dev && \ + git ca-certificates tar g++ wget pkg-config libglib2.0-dev flex bison libx11-dev libxv-dev libxt-dev libgdk-pixbuf2.0-dev libjpeg-turbo8-dev libpng-dev zlib1g-dev libsoup2.4-dev && \ rm -rf /var/lib/apt/lists/* # build gst-plugin-good @@ -419,7 +431,7 @@ RUN cd /opt/build/gst-plugins-good-1.19.1 && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates meson tar g++ wget pkg-config libglib2.0-dev flex bison gobject-introspection libgirepository1.0-dev openssl libcurl4-gnutls-dev librtmp-dev mjpegtools libde265-dev && \ + ca-certificates tar g++ wget pkg-config libglib2.0-dev flex bison gobject-introspection libgirepository1.0-dev openssl libcurl4-gnutls-dev librtmp-dev mjpegtools libde265-dev && \ rm -rf /var/lib/apt/lists/* # build gst-plugin-bad @@ -448,7 +460,7 @@ RUN cd /opt/build && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates meson tar g++ wget pkg-config libglib2.0-dev flex bison && \ + ca-certificates tar g++ wget pkg-config libglib2.0-dev flex bison && \ rm -rf /var/lib/apt/lists/* # build gst-plugin-ugly @@ -500,7 +512,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates tar g++ wget meson && \ + ca-certificates tar g++ wget && \ rm -rf /var/lib/apt/lists/* # build gst-plugin-libav @@ -517,7 +529,7 @@ RUN cd /opt/build/gst-libav-1.19.1 && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates tar g++ wget meson && \ + ca-certificates tar g++ wget && \ rm -rf /var/lib/apt/lists/* RUN cd /opt/build/SVT-HEVC/gstreamer-plugin && \ @@ -538,7 +550,7 @@ RUN cd /opt/build/SVT-VP9/gstreamer-plugin && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates meson tar g++ wget pkg-config libdrm-dev libglib2.0-dev libudev-dev flex bison && \ + ca-certificates tar g++ wget pkg-config libdrm-dev libglib2.0-dev libudev-dev flex bison && \ rm -rf /var/lib/apt/lists/* # patch gst-vaapi with gst-video-analytics patch diff --git a/XeonE3/ubuntu-20.04/media/dev/Dockerfile.m4 b/XeonE3/ubuntu-20.04/media/dev/Dockerfile.m4 index 7121b064c..0b2c73b13 100644 --- a/XeonE3/ubuntu-20.04/media/dev/Dockerfile.m4 +++ b/XeonE3/ubuntu-20.04/media/dev/Dockerfile.m4 @@ -9,6 +9,7 @@ include(libvpx.m4) include(libaom.m4) include(libx264.m4) include(libx265.m4) +include(meson.m4) include(dav1d.m4) include(libvmaf.m4) include(svt-hevc.m4) diff --git a/XeonE3/ubuntu-20.04/media/gst/Dockerfile b/XeonE3/ubuntu-20.04/media/gst/Dockerfile index bf3f2a192..eef017cfb 100644 --- a/XeonE3/ubuntu-20.04/media/gst/Dockerfile +++ b/XeonE3/ubuntu-20.04/media/gst/Dockerfile @@ -197,7 +197,19 @@ RUN cd /opt/build && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates meson tar g++ wget pkg-config && \ + python3-pip ninja-build python3-setuptools && \ + rm -rf /var/lib/apt/lists/* + +# build meson +ARG MESON_REPO=https://github.com/mesonbuild/meson +RUN git clone ${MESON_REPO}; \ + cd meson; \ + git checkout 0.58.1; \ + python3 setup.py install; + +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + ca-certificates tar g++ wget pkg-config && \ rm -rf /var/lib/apt/lists/* # build dav1d @@ -304,7 +316,7 @@ RUN cd /opt/build/media-driver-intel-media-21.1.3 && mkdir build && cd build && RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates meson tar g++ wget pkg-config libglib2.0-dev flex bison gobject-introspection libgirepository1.0-dev && \ + ca-certificates tar g++ wget pkg-config libglib2.0-dev flex bison gobject-introspection libgirepository1.0-dev && \ rm -rf /var/lib/apt/lists/* # build gst-core @@ -326,7 +338,7 @@ RUN cd /opt/build/gstreamer-1.19.1 && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates meson tar g++ gobjc wget pkg-config libglib2.0-dev flex bison gobject-introspection libgirepository1.0-dev libx11-dev libxv-dev libxt-dev libasound2-dev libpango1.0-dev libtheora-dev libvisual-0.4-dev libgl1-mesa-dev libx11-xcb-dev && \ + ca-certificates tar g++ gobjc wget pkg-config libglib2.0-dev flex bison gobject-introspection libgirepository1.0-dev libx11-dev libxv-dev libxt-dev libasound2-dev libpango1.0-dev libtheora-dev libvisual-0.4-dev libgl1-mesa-dev libx11-xcb-dev && \ rm -rf /var/lib/apt/lists/* # build gst-plugin-base @@ -355,7 +367,7 @@ RUN cd /opt/build/gst-plugins-base-1.19.1 && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - git ca-certificates meson tar g++ wget pkg-config libglib2.0-dev flex bison libx11-dev libxv-dev libxt-dev libgdk-pixbuf2.0-dev libjpeg-turbo8-dev libpng-dev zlib1g-dev libsoup2.4-dev && \ + git ca-certificates tar g++ wget pkg-config libglib2.0-dev flex bison libx11-dev libxv-dev libxt-dev libgdk-pixbuf2.0-dev libjpeg-turbo8-dev libpng-dev zlib1g-dev libsoup2.4-dev && \ rm -rf /var/lib/apt/lists/* # build gst-plugin-good @@ -381,7 +393,7 @@ RUN cd /opt/build/gst-plugins-good-1.19.1 && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates meson tar g++ wget pkg-config libglib2.0-dev flex bison gobject-introspection libgirepository1.0-dev openssl libcurl4-gnutls-dev librtmp-dev mjpegtools libde265-dev && \ + ca-certificates tar g++ wget pkg-config libglib2.0-dev flex bison gobject-introspection libgirepository1.0-dev openssl libcurl4-gnutls-dev librtmp-dev mjpegtools libde265-dev && \ rm -rf /var/lib/apt/lists/* # build gst-plugin-bad @@ -410,7 +422,7 @@ RUN cd /opt/build && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates meson tar g++ wget pkg-config libglib2.0-dev flex bison && \ + ca-certificates tar g++ wget pkg-config libglib2.0-dev flex bison && \ rm -rf /var/lib/apt/lists/* # build gst-plugin-ugly @@ -462,7 +474,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates tar g++ wget meson && \ + ca-certificates tar g++ wget && \ rm -rf /var/lib/apt/lists/* # build gst-plugin-libav @@ -479,7 +491,7 @@ RUN cd /opt/build/gst-libav-1.19.1 && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates tar g++ wget meson && \ + ca-certificates tar g++ wget && \ rm -rf /var/lib/apt/lists/* RUN cd /opt/build/SVT-HEVC/gstreamer-plugin && \ @@ -500,7 +512,7 @@ RUN cd /opt/build/SVT-VP9/gstreamer-plugin && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates meson tar g++ wget pkg-config libdrm-dev libglib2.0-dev libudev-dev flex bison && \ + ca-certificates tar g++ wget pkg-config libdrm-dev libglib2.0-dev libudev-dev flex bison && \ rm -rf /var/lib/apt/lists/* # patch gst-vaapi with gst-video-analytics patch diff --git a/XeonE3/ubuntu-20.04/media/gst/Dockerfile.m4 b/XeonE3/ubuntu-20.04/media/gst/Dockerfile.m4 index 0f7a9824f..59f4ecdbe 100644 --- a/XeonE3/ubuntu-20.04/media/gst/Dockerfile.m4 +++ b/XeonE3/ubuntu-20.04/media/gst/Dockerfile.m4 @@ -9,6 +9,7 @@ include(libvpx.m4) include(libaom.m4) include(libx264.m4) include(libx265.m4) +include(meson.m4) include(dav1d.m4) include(svt-hevc.m4) include(svt-av1.m4) From 1646c57d46e530c38d4e0e497a0f240228c05739 Mon Sep 17 00:00:00 2001 From: dpatel257 Date: Tue, 22 Jun 2021 17:26:21 -0700 Subject: [PATCH 05/13] [master] Test fixes for Release v21.6 - part 1 (#750) * Update Docker image README (#704) * update README * Update dockerfiles * v216 tests update - part 1 Co-authored-by: jhou5 --- test/dldt_ffmpeg_video_analytics.sh | 24 ------------------ test/dldt_ffmpeg_video_analytics_vcaca.sh | 31 ----------------------- test/ffmpeg_flv_hevc.sh | 4 --- test/ffmpeg_ivf_av1.sh | 2 +- test/ffmpeg_svt_av1.sh | 2 +- test/ffmpeg_svt_vp9.sh | 5 ---- 6 files changed, 2 insertions(+), 66 deletions(-) delete mode 100755 test/dldt_ffmpeg_video_analytics.sh delete mode 100755 test/dldt_ffmpeg_video_analytics_vcaca.sh delete mode 100755 test/ffmpeg_flv_hevc.sh delete mode 100755 test/ffmpeg_svt_vp9.sh diff --git a/test/dldt_ffmpeg_video_analytics.sh b/test/dldt_ffmpeg_video_analytics.sh deleted file mode 100755 index 29c15f3f2..000000000 --- a/test/dldt_ffmpeg_video_analytics.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash -e - -if grep --quiet 'NAME="CentOS Linux"' /etc/os-release; then - yum install -y centos-release-scl wget - yum install -y rh-python36 - source /opt/rh/rh-python36/enable -else - apt-get update - apt-get install -y wget make python3 python3-pip -fi - -pip3 install pyyaml requests - -wget -q -O - https://github.com/opencv/open_model_zoo/archive/2018_R5.tar.gz | tar xz && \ - cd open_model_zoo-2018_R5 && \ - cd model_downloader && \ - ./downloader.py --name vehicle-license-plate-detection-barrier-0106,vehicle-attributes-recognition-barrier-0039 - -dd if=/dev/urandom bs=115200 count=300 of=test.yuv # 10 seconds video -ffmpeg -f rawvideo -vcodec rawvideo -s 320x240 -r 30 -pix_fmt yuv420p -i test.yuv -c:v libx264 -y test.mp4 -ffmpeg -i test.mp4 -vf \ - "detect=model=/home/open_model_zoo-2018_R5/model_downloader/Security/object_detection/barrier/0106/dldt/vehicle-license-plate-detection-barrier-0106.xml:device=CPU, \ - classify=model=/home/open_model_zoo-2018_R5/model_downloader/Security/object_attributes/vehicle/resnet10_update_1/dldt/vehicle-attributes-recognition-barrier-0039.xml:device=CPU" \ - -f null /dev/null diff --git a/test/dldt_ffmpeg_video_analytics_vcaca.sh b/test/dldt_ffmpeg_video_analytics_vcaca.sh deleted file mode 100755 index efca6c531..000000000 --- a/test/dldt_ffmpeg_video_analytics_vcaca.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/bash -e - -if grep --quiet 'NAME="CentOS Linux"' /etc/os-release; then - yum install -y centos-release-scl wget - yum install -y rh-python36 - source /opt/rh/rh-python36/enable -else - apt-get update - apt-get install -y wget make python3 python3-pip - if grep --quiet 'Ubuntu 18' /etc/os-release; then - apt-get install -y libjson-c3 - elif grep --quiet 'Ubuntu 20' /etc/os-release; then - apt-get install -y libjson-c4 - fi -fi - -pip3 install pyyaml requests - -if grep --quiet 'Ubuntu' /etc/os-release; then - wget https://download.01.org/opencv/2021/openvinotoolkit/2021.1/open_model_zoo/models_bin/2/vehicle-license-plate-detection-barrier-0106/FP16/vehicle-license-plate-detection-barrier-0106.xml - wget https://download.01.org/opencv/2021/openvinotoolkit/2021.1/open_model_zoo/models_bin/2/vehicle-license-plate-detection-barrier-0106/FP16/vehicle-license-plate-detection-barrier-0106.bin - wget https://download.01.org/opencv/2021/openvinotoolkit/2021.1/open_model_zoo/models_bin/2/vehicle-attributes-recognition-barrier-0039/FP16/vehicle-attributes-recognition-barrier-0039.bin - wget https://download.01.org/opencv/2021/openvinotoolkit/2021.1/open_model_zoo/models_bin/2/vehicle-attributes-recognition-barrier-0039/FP16/vehicle-attributes-recognition-barrier-0039.xml - - dd if=/dev/urandom bs=115200 count=300 of=test.yuv # 10 seconds video - ffmpeg -f rawvideo -vcodec rawvideo -s 320x240 -r 30 -pix_fmt yuv420p -i test.yuv -c:v libx264 -y test.mp4 - ffmpeg -i test.mp4 -vf \ - "detect=model=vehicle-license-plate-detection-barrier-0106.xml:device=HDDL, \ - classify=model=vehicle-attributes-recognition-barrier-0039.xml:device=HDDL" \ - -f null /dev/null; -fi diff --git a/test/ffmpeg_flv_hevc.sh b/test/ffmpeg_flv_hevc.sh deleted file mode 100755 index 7a4eba5f1..000000000 --- a/test/ffmpeg_flv_hevc.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -e - -dd if=/dev/urandom bs=115200 count=300 of=test.yuv # 10 seconds video -ffmpeg -f rawvideo -vcodec rawvideo -s 320x240 -r 30 -pix_fmt yuv420p -i test.yuv -c:v libsvt_hevc -f flv -y test.flv diff --git a/test/ffmpeg_ivf_av1.sh b/test/ffmpeg_ivf_av1.sh index 1c1e85a6f..6342f029b 100755 --- a/test/ffmpeg_ivf_av1.sh +++ b/test/ffmpeg_ivf_av1.sh @@ -1,4 +1,4 @@ #!/bin/bash -e dd if=/dev/urandom bs=115200 count=30 of=test.yuv # 30 frames -ffmpeg -f rawvideo -vcodec rawvideo -s 320x240 -r 30 -pix_fmt yuv420p -i test.yuv -c:v libsvt_av1 -f ivf -y test.ivf +ffmpeg -f rawvideo -vcodec rawvideo -s 320x240 -r 30 -pix_fmt yuv420p -i test.yuv -c:v libsvtav1 -f ivf -y test.ivf diff --git a/test/ffmpeg_svt_av1.sh b/test/ffmpeg_svt_av1.sh index cd378f0cb..cb8bb6e41 100755 --- a/test/ffmpeg_svt_av1.sh +++ b/test/ffmpeg_svt_av1.sh @@ -1,5 +1,5 @@ #!/bin/bash -e dd if=/dev/urandom bs=115200 count=30 of=test.yuv # 30 frames -ffmpeg -f rawvideo -vcodec rawvideo -s 320x240 -r 30 -pix_fmt yuv420p -i test.yuv -c:v libsvt_av1 -y test.mp4 +ffmpeg -f rawvideo -vcodec rawvideo -s 320x240 -r 30 -pix_fmt yuv420p -i test.yuv -c:v libsvtav1 -y test.mp4 ffprobe -v error -show_streams test.mp4 diff --git a/test/ffmpeg_svt_vp9.sh b/test/ffmpeg_svt_vp9.sh deleted file mode 100755 index bab2dd1c1..000000000 --- a/test/ffmpeg_svt_vp9.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -e - -dd if=/dev/urandom bs=115200 count=30 of=test.yuv # 30 frames -ffmpeg -f rawvideo -vcodec rawvideo -s 320x240 -r 30 -pix_fmt yuv420p -i test.yuv -c:v libsvt_vp9 -y test.mp4 -ffprobe -v error -show_streams test.mp4 From 1ba8f6d2a30141846ff5275ea2dc88049d1ed126 Mon Sep 17 00:00:00 2001 From: dpatel257 Date: Wed, 23 Jun 2021 17:04:42 -0700 Subject: [PATCH 06/13] [master] Test fixes for Release v21.6 - part 2 (#755) * Update Docker image README (#704) * update README * Update dockerfiles * v216 tests update - part 1 * Test fixes for Release v21.6 - part 2 Co-authored-by: jhou5 --- test/{nginx_dash_hevc.sh => ffmpeg_dash.sh} | 7 ++----- test/{nginx_hls_hevc.sh => ffmpeg_hls.sh} | 7 ++----- test/gst_svt.sh | 2 +- test/nginx_rtmp_hevc.sh | 21 --------------------- 4 files changed, 5 insertions(+), 32 deletions(-) rename test/{nginx_dash_hevc.sh => ffmpeg_dash.sh} (69%) rename test/{nginx_hls_hevc.sh => ffmpeg_hls.sh} (69%) delete mode 100755 test/nginx_rtmp_hevc.sh diff --git a/test/nginx_dash_hevc.sh b/test/ffmpeg_dash.sh similarity index 69% rename from test/nginx_dash_hevc.sh rename to test/ffmpeg_dash.sh index 6cd7b0e09..f30b8e882 100755 --- a/test/nginx_dash_hevc.sh +++ b/test/ffmpeg_dash.sh @@ -1,14 +1,11 @@ #!/bin/bash -ve -nginx & - case "$1" in *ubuntu*) apt-get update && apt-get install -y -q --no-install-recommends curl;; *centos*) yum install -y -q curl;; esac - + dd if=/dev/urandom bs=115200 count=300 of=test.yuv # 10 seconds video -ffmpeg -re -f rawvideo -vcodec rawvideo -s 320x240 -r 30 -pix_fmt yuv420p -i test.yuv -c:v libsvt_hevc -f flv rtmp://localhost/dash/test -curl -sSf http://localhost/dash/test/index.mpd +ffmpeg -re -f rawvideo -vcodec rawvideo -s 320x240 -r 30 -pix_fmt yuv420p -i test.yuv -c:v libsvt_hevc -f dash ./test_dash.mpd diff --git a/test/nginx_hls_hevc.sh b/test/ffmpeg_hls.sh similarity index 69% rename from test/nginx_hls_hevc.sh rename to test/ffmpeg_hls.sh index f8355f65f..6f8cd6f51 100755 --- a/test/nginx_hls_hevc.sh +++ b/test/ffmpeg_hls.sh @@ -1,14 +1,11 @@ #!/bin/bash -ve -nginx & - case "$1" in *ubuntu*) apt-get update && apt-get install -y -q --no-install-recommends curl;; *centos*) yum install -y -q curl;; -esac +esac dd if=/dev/urandom bs=115200 count=300 of=test.yuv # 10 seconds video -ffmpeg -re -f rawvideo -vcodec rawvideo -s 320x240 -r 30 -pix_fmt yuv420p -i test.yuv -c:v libsvt_hevc -f flv rtmp://localhost/hls/test -curl -sSf http://localhost/hls/test/index.m3u8 +ffmpeg -re -f rawvideo -vcodec rawvideo -s 320x240 -r 30 -pix_fmt yuv420p -i test.yuv -c:v libsvt_hevc -f hls ./test_hls.m3u8 diff --git a/test/gst_svt.sh b/test/gst_svt.sh index 80db9b24e..627462534 100755 --- a/test/gst_svt.sh +++ b/test/gst_svt.sh @@ -8,5 +8,5 @@ gst-launch-1.0 -v filesrc location=test.yuv ! videoparse format=i420 width=320 h gst-launch-1.0 -v filesrc location=test.mkv ! decodebin ! filesink location=test.xx gst-launch-1.0 -v filesrc location=test.yuv ! videoparse format=i420 width=320 height=240 framerate=30 ! svtav1enc ! webmmux ! filesink location=test.mkv -gst-launch-1.0 -v filesrc location=test.mkv ! decodebin ! filesink location=test.xx +gst-launch-1.0 -v filesrc location=test.mkv ! matroskademux ! av1dec ! y4menc ! filesink location=test1.y4m diff --git a/test/nginx_rtmp_hevc.sh b/test/nginx_rtmp_hevc.sh deleted file mode 100755 index 3c0345430..000000000 --- a/test/nginx_rtmp_hevc.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash -ve - -sed -i 's/worker_processes auto/worker_processes 1/' /etc/nginx/nginx.conf - -nginx & - -case "$1" in - *ubuntu*) - apt-get update && apt-get install -y -q --no-install-recommends curl;; - *centos*) - yum install -y -q curl;; -esac - -curl -sSf http://localhost/stat -dd if=/dev/urandom bs=115200 count=300 of=test.yuv # 10 seconds video -ffmpeg -i rtmp://localhost/stream/test -vcodec copy -acodec copy -f flv test.flv < /dev/null & -ffmpeg -re -f rawvideo -vcodec rawvideo -s 320x240 -r 30 -pix_fmt yuv420p -i test.yuv -c:v libsvt_hevc -f flv rtmp://localhost/stream/test -sleep 1 -if test -f test.flv; then exit 0; else exit -1; fi - -sed -i 's/worker_processes 1/worker_processes auto/' /etc/nginx/nginx.conf From 60da9ef6a6ef750cb876dd77f4533128605da46d Mon Sep 17 00:00:00 2001 From: dpatel257 Date: Mon, 28 Jun 2021 16:09:18 -0700 Subject: [PATCH 07/13] [master] Bug fixes for Release v21.6 (#757) * Update Docker image README (#704) * update README * Update dockerfiles * Bug fixes for v21.6. See details - QAT Engine build param fix - revert scvp change for owt360 - test name change for proper injection of tests - devoolset opencv fix - nginx conf sw_fallback off * revert accidental fdkaac change Co-authored-by: jhou5 --- QAT/centos-7/media/dev/Dockerfile | 2 +- QAT/centos-7/media/dev/nginx.conf | 2 +- QAT/centos-7/media/nginx/nginx.conf | 2 +- QAT/centos-7/media/nginx_sw/Dockerfile | 2 +- QAT/ubuntu-18.04/media/dev/Dockerfile | 2 +- QAT/ubuntu-18.04/media/dev/nginx.conf | 2 +- QAT/ubuntu-18.04/media/nginx/nginx.conf | 2 +- QAT/ubuntu-18.04/media/nginx_sw/Dockerfile | 2 +- QAT/ubuntu-20.04/media/dev/Dockerfile | 2 +- QAT/ubuntu-20.04/media/dev/nginx.conf | 2 +- QAT/ubuntu-20.04/media/nginx/nginx.conf | 2 +- QAT/ubuntu-20.04/media/nginx_sw/Dockerfile | 2 +- SG1/centos-7/media/ffmpeg/Dockerfile | 2 +- Xeon/centos-7/analytics/dev/Dockerfile | 2 +- Xeon/centos-7/analytics/ffmpeg/Dockerfile | 2 +- Xeon/centos-7/analytics/gst/Dockerfile | 2 +- Xeon/centos-7/media/ffmpeg/Dockerfile | 2 +- Xeon/centos-7/service/owt-dev/Dockerfile | 2 +- Xeon/centos-7/service/owt/Dockerfile | 2 +- Xeon/centos-7/service/owt360/Dockerfile | 6 +++--- Xeon/ubuntu-18.04/service/owt360/Dockerfile | 4 ++-- XeonE3/centos-7/analytics/dev/Dockerfile | 2 +- XeonE3/centos-7/analytics/ffmpeg/Dockerfile | 2 +- XeonE3/centos-7/analytics/gst/Dockerfile | 2 +- XeonE3/centos-7/media/ffmpeg/Dockerfile | 2 +- XeonE3/centos-7/service/owt-dev/Dockerfile | 2 +- XeonE3/centos-7/service/owt/Dockerfile | 2 +- XeonE3/centos-7/service/owt360/Dockerfile | 6 +++--- XeonE3/ubuntu-18.04/service/owt360/Dockerfile | 4 ++-- template/components/opencv.m4 | 5 +---- template/components/qat-engine.m4 | 2 +- template/components/scvp.m4 | 2 +- test/{ffmpeg_dash.sh => ffmpeg_svt_dash.sh} | 0 test/{ffmpeg_hls.sh => ffmpeg_svt_hls.sh} | 0 34 files changed, 38 insertions(+), 41 deletions(-) rename test/{ffmpeg_dash.sh => ffmpeg_svt_dash.sh} (100%) rename test/{ffmpeg_hls.sh => ffmpeg_svt_hls.sh} (100%) diff --git a/QAT/centos-7/media/dev/Dockerfile b/QAT/centos-7/media/dev/Dockerfile index d26e31591..b0e24a415 100644 --- a/QAT/centos-7/media/dev/Dockerfile +++ b/QAT/centos-7/media/dev/Dockerfile @@ -131,7 +131,7 @@ RUN cd /opt/build && \ cd QAT_Engine* && \ ./autogen.sh && \ export PERL5LIB="$(ls -1 -d /opt/build/openssl-*)" && \ - ./configure --with-qat_dir=/opt/intel/QAT --with-openssl_dir="$PERL5LIB" --with-openssl_install_dir=/usr/local/ssl --prefix=/opt/intel/QATengine --disable-qat_ecx --with-cc-opt="-DQAT_DISABLE_NONZERO_MEMFREE -IBUILD_HOME/ipp-crypto-ippcp_2021.2/sources/ippcp/crypto_mb/include" --enable-multibuff_offload --enable-multibuff_ecx --enable-qat_sw && \ + ./configure --with-qat_dir=/opt/intel/QAT --with-openssl_dir="$PERL5LIB" --with-openssl_install_dir=/usr/local/ssl --prefix=/opt/intel/QATengine --disable-qat_ecx --with-cc-opt="-DQAT_DISABLE_NONZERO_MEMFREE -I/opt/build/ipp-crypto-ippcp_2021.2/sources/ippcp/crypto_mb/include" --enable-multibuff_offload --enable-multibuff_ecx --enable-qat_sw && \ make -j8 && \ make install && \ tar cf - /usr/local/ssl | (cd /opt/dist && tar xf -) diff --git a/QAT/centos-7/media/dev/nginx.conf b/QAT/centos-7/media/dev/nginx.conf index df58ff2ac..251d05e97 100644 --- a/QAT/centos-7/media/dev/nginx.conf +++ b/QAT/centos-7/media/dev/nginx.conf @@ -18,7 +18,7 @@ ssl_engine { qat_offload_mode async; qat_notify_mode poll; qat_poll_mode heuristic; - qat_sw_fallback on; + #qat_sw_fallback on; } } diff --git a/QAT/centos-7/media/nginx/nginx.conf b/QAT/centos-7/media/nginx/nginx.conf index df58ff2ac..251d05e97 100644 --- a/QAT/centos-7/media/nginx/nginx.conf +++ b/QAT/centos-7/media/nginx/nginx.conf @@ -18,7 +18,7 @@ ssl_engine { qat_offload_mode async; qat_notify_mode poll; qat_poll_mode heuristic; - qat_sw_fallback on; + #qat_sw_fallback on; } } diff --git a/QAT/centos-7/media/nginx_sw/Dockerfile b/QAT/centos-7/media/nginx_sw/Dockerfile index 87ba27806..547704630 100644 --- a/QAT/centos-7/media/nginx_sw/Dockerfile +++ b/QAT/centos-7/media/nginx_sw/Dockerfile @@ -131,7 +131,7 @@ RUN cd /opt/build && \ cd QAT_Engine* && \ ./autogen.sh && \ export PERL5LIB="$(ls -1 -d /opt/build/openssl-*)" && \ - ./configure --with-qat_dir=/opt/intel/QAT --with-openssl_dir="$PERL5LIB" --with-openssl_install_dir=/usr/local/ssl --prefix=/opt/intel/QATengine --disable-qat_ecx --with-cc-opt="-DQAT_DISABLE_NONZERO_MEMFREE -IBUILD_HOME/ipp-crypto-ippcp_2021.2/sources/ippcp/crypto_mb/include" --enable-multibuff_offload --enable-multibuff_ecx --enable-qat_sw && \ + ./configure --with-qat_dir=/opt/intel/QAT --with-openssl_dir="$PERL5LIB" --with-openssl_install_dir=/usr/local/ssl --prefix=/opt/intel/QATengine --disable-qat_ecx --with-cc-opt="-DQAT_DISABLE_NONZERO_MEMFREE -I/opt/build/ipp-crypto-ippcp_2021.2/sources/ippcp/crypto_mb/include" --enable-multibuff_offload --enable-multibuff_ecx --enable-qat_sw && \ make -j8 && \ make install && \ tar cf - /usr/local/ssl | (cd /opt/dist && tar xf -) diff --git a/QAT/ubuntu-18.04/media/dev/Dockerfile b/QAT/ubuntu-18.04/media/dev/Dockerfile index 8d10c8ede..c5e6947a5 100644 --- a/QAT/ubuntu-18.04/media/dev/Dockerfile +++ b/QAT/ubuntu-18.04/media/dev/Dockerfile @@ -141,7 +141,7 @@ RUN cd /opt/build && \ cd QAT_Engine* && \ ./autogen.sh && \ export PERL5LIB="$(ls -1 -d /opt/build/openssl-*)" && \ - ./configure --with-qat_dir=/opt/intel/QAT --with-openssl_dir="$PERL5LIB" --with-openssl_install_dir=/usr/local/ssl --prefix=/opt/intel/QATengine --disable-qat_ecx --with-cc-opt="-DQAT_DISABLE_NONZERO_MEMFREE -IBUILD_HOME/ipp-crypto-ippcp_2021.2/sources/ippcp/crypto_mb/include" --enable-multibuff_offload --enable-multibuff_ecx --enable-qat_sw && \ + ./configure --with-qat_dir=/opt/intel/QAT --with-openssl_dir="$PERL5LIB" --with-openssl_install_dir=/usr/local/ssl --prefix=/opt/intel/QATengine --disable-qat_ecx --with-cc-opt="-DQAT_DISABLE_NONZERO_MEMFREE -I/opt/build/ipp-crypto-ippcp_2021.2/sources/ippcp/crypto_mb/include" --enable-multibuff_offload --enable-multibuff_ecx --enable-qat_sw && \ make -j8 && \ make install && \ tar cf - /usr/local/ssl | (cd /opt/dist && tar xf -) diff --git a/QAT/ubuntu-18.04/media/dev/nginx.conf b/QAT/ubuntu-18.04/media/dev/nginx.conf index df58ff2ac..251d05e97 100644 --- a/QAT/ubuntu-18.04/media/dev/nginx.conf +++ b/QAT/ubuntu-18.04/media/dev/nginx.conf @@ -18,7 +18,7 @@ ssl_engine { qat_offload_mode async; qat_notify_mode poll; qat_poll_mode heuristic; - qat_sw_fallback on; + #qat_sw_fallback on; } } diff --git a/QAT/ubuntu-18.04/media/nginx/nginx.conf b/QAT/ubuntu-18.04/media/nginx/nginx.conf index df58ff2ac..251d05e97 100644 --- a/QAT/ubuntu-18.04/media/nginx/nginx.conf +++ b/QAT/ubuntu-18.04/media/nginx/nginx.conf @@ -18,7 +18,7 @@ ssl_engine { qat_offload_mode async; qat_notify_mode poll; qat_poll_mode heuristic; - qat_sw_fallback on; + #qat_sw_fallback on; } } diff --git a/QAT/ubuntu-18.04/media/nginx_sw/Dockerfile b/QAT/ubuntu-18.04/media/nginx_sw/Dockerfile index b8b281e17..02a3b5a74 100644 --- a/QAT/ubuntu-18.04/media/nginx_sw/Dockerfile +++ b/QAT/ubuntu-18.04/media/nginx_sw/Dockerfile @@ -141,7 +141,7 @@ RUN cd /opt/build && \ cd QAT_Engine* && \ ./autogen.sh && \ export PERL5LIB="$(ls -1 -d /opt/build/openssl-*)" && \ - ./configure --with-qat_dir=/opt/intel/QAT --with-openssl_dir="$PERL5LIB" --with-openssl_install_dir=/usr/local/ssl --prefix=/opt/intel/QATengine --disable-qat_ecx --with-cc-opt="-DQAT_DISABLE_NONZERO_MEMFREE -IBUILD_HOME/ipp-crypto-ippcp_2021.2/sources/ippcp/crypto_mb/include" --enable-multibuff_offload --enable-multibuff_ecx --enable-qat_sw && \ + ./configure --with-qat_dir=/opt/intel/QAT --with-openssl_dir="$PERL5LIB" --with-openssl_install_dir=/usr/local/ssl --prefix=/opt/intel/QATengine --disable-qat_ecx --with-cc-opt="-DQAT_DISABLE_NONZERO_MEMFREE -I/opt/build/ipp-crypto-ippcp_2021.2/sources/ippcp/crypto_mb/include" --enable-multibuff_offload --enable-multibuff_ecx --enable-qat_sw && \ make -j8 && \ make install && \ tar cf - /usr/local/ssl | (cd /opt/dist && tar xf -) diff --git a/QAT/ubuntu-20.04/media/dev/Dockerfile b/QAT/ubuntu-20.04/media/dev/Dockerfile index 785e95025..ba0e8e984 100644 --- a/QAT/ubuntu-20.04/media/dev/Dockerfile +++ b/QAT/ubuntu-20.04/media/dev/Dockerfile @@ -137,7 +137,7 @@ RUN cd /opt/build && \ cd QAT_Engine* && \ ./autogen.sh && \ export PERL5LIB="$(ls -1 -d /opt/build/openssl-*)" && \ - ./configure --with-qat_dir=/opt/intel/QAT --with-openssl_dir="$PERL5LIB" --with-openssl_install_dir=/usr/local/ssl --prefix=/opt/intel/QATengine --disable-qat_ecx --with-cc-opt="-DQAT_DISABLE_NONZERO_MEMFREE -IBUILD_HOME/ipp-crypto-ippcp_2021.2/sources/ippcp/crypto_mb/include" --enable-multibuff_offload --enable-multibuff_ecx --enable-qat_sw && \ + ./configure --with-qat_dir=/opt/intel/QAT --with-openssl_dir="$PERL5LIB" --with-openssl_install_dir=/usr/local/ssl --prefix=/opt/intel/QATengine --disable-qat_ecx --with-cc-opt="-DQAT_DISABLE_NONZERO_MEMFREE -I/opt/build/ipp-crypto-ippcp_2021.2/sources/ippcp/crypto_mb/include" --enable-multibuff_offload --enable-multibuff_ecx --enable-qat_sw && \ make -j8 && \ make install && \ tar cf - /usr/local/ssl | (cd /opt/dist && tar xf -) diff --git a/QAT/ubuntu-20.04/media/dev/nginx.conf b/QAT/ubuntu-20.04/media/dev/nginx.conf index df58ff2ac..251d05e97 100644 --- a/QAT/ubuntu-20.04/media/dev/nginx.conf +++ b/QAT/ubuntu-20.04/media/dev/nginx.conf @@ -18,7 +18,7 @@ ssl_engine { qat_offload_mode async; qat_notify_mode poll; qat_poll_mode heuristic; - qat_sw_fallback on; + #qat_sw_fallback on; } } diff --git a/QAT/ubuntu-20.04/media/nginx/nginx.conf b/QAT/ubuntu-20.04/media/nginx/nginx.conf index df58ff2ac..251d05e97 100644 --- a/QAT/ubuntu-20.04/media/nginx/nginx.conf +++ b/QAT/ubuntu-20.04/media/nginx/nginx.conf @@ -18,7 +18,7 @@ ssl_engine { qat_offload_mode async; qat_notify_mode poll; qat_poll_mode heuristic; - qat_sw_fallback on; + #qat_sw_fallback on; } } diff --git a/QAT/ubuntu-20.04/media/nginx_sw/Dockerfile b/QAT/ubuntu-20.04/media/nginx_sw/Dockerfile index 80258a19e..892fd664a 100644 --- a/QAT/ubuntu-20.04/media/nginx_sw/Dockerfile +++ b/QAT/ubuntu-20.04/media/nginx_sw/Dockerfile @@ -137,7 +137,7 @@ RUN cd /opt/build && \ cd QAT_Engine* && \ ./autogen.sh && \ export PERL5LIB="$(ls -1 -d /opt/build/openssl-*)" && \ - ./configure --with-qat_dir=/opt/intel/QAT --with-openssl_dir="$PERL5LIB" --with-openssl_install_dir=/usr/local/ssl --prefix=/opt/intel/QATengine --disable-qat_ecx --with-cc-opt="-DQAT_DISABLE_NONZERO_MEMFREE -IBUILD_HOME/ipp-crypto-ippcp_2021.2/sources/ippcp/crypto_mb/include" --enable-multibuff_offload --enable-multibuff_ecx --enable-qat_sw && \ + ./configure --with-qat_dir=/opt/intel/QAT --with-openssl_dir="$PERL5LIB" --with-openssl_install_dir=/usr/local/ssl --prefix=/opt/intel/QATengine --disable-qat_ecx --with-cc-opt="-DQAT_DISABLE_NONZERO_MEMFREE -I/opt/build/ipp-crypto-ippcp_2021.2/sources/ippcp/crypto_mb/include" --enable-multibuff_offload --enable-multibuff_ecx --enable-qat_sw && \ make -j8 && \ make install && \ tar cf - /usr/local/ssl | (cd /opt/dist && tar xf -) diff --git a/SG1/centos-7/media/ffmpeg/Dockerfile b/SG1/centos-7/media/ffmpeg/Dockerfile index 99370b139..a5c645314 100644 --- a/SG1/centos-7/media/ffmpeg/Dockerfile +++ b/SG1/centos-7/media/ffmpeg/Dockerfile @@ -285,7 +285,7 @@ RUN cd /opt/build/MediaSDK-intel-media-sg1-pv1.3 && \ make install DESTDIR=/opt/dist && \ make install -RUN yum install -y gcc gcc-c++ make wget python36-numpy ccache eigen3-devel +RUN yum install -y gcc gcc-c++ make wget python36-numpy ccache eigen3-devel devtoolset-9 # build opencv ARG OPENCV_REPO=https://github.com/opencv/opencv/archive/4.5.2.tar.gz diff --git a/Xeon/centos-7/analytics/dev/Dockerfile b/Xeon/centos-7/analytics/dev/Dockerfile index 531d14a4d..d57f90032 100644 --- a/Xeon/centos-7/analytics/dev/Dockerfile +++ b/Xeon/centos-7/analytics/dev/Dockerfile @@ -231,7 +231,7 @@ RUN cd /opt/build && \ make install DESTDIR=/opt/dist && \ make install -RUN yum install -y gcc gcc-c++ make wget python36-numpy ccache eigen3-devel +RUN yum install -y gcc gcc-c++ make wget python36-numpy ccache eigen3-devel devtoolset-9 # build opencv ARG OPENCV_REPO=https://github.com/opencv/opencv/archive/4.5.2.tar.gz diff --git a/Xeon/centos-7/analytics/ffmpeg/Dockerfile b/Xeon/centos-7/analytics/ffmpeg/Dockerfile index 72a4d5644..b8f247588 100644 --- a/Xeon/centos-7/analytics/ffmpeg/Dockerfile +++ b/Xeon/centos-7/analytics/ffmpeg/Dockerfile @@ -216,7 +216,7 @@ RUN cd /opt/build && \ make install DESTDIR=/opt/dist && \ make install -RUN yum install -y gcc gcc-c++ make wget python36-numpy ccache eigen3-devel +RUN yum install -y gcc gcc-c++ make wget python36-numpy ccache eigen3-devel devtoolset-9 # build opencv ARG OPENCV_REPO=https://github.com/opencv/opencv/archive/4.5.2.tar.gz diff --git a/Xeon/centos-7/analytics/gst/Dockerfile b/Xeon/centos-7/analytics/gst/Dockerfile index cef662edb..8c874d27e 100644 --- a/Xeon/centos-7/analytics/gst/Dockerfile +++ b/Xeon/centos-7/analytics/gst/Dockerfile @@ -231,7 +231,7 @@ RUN cd /opt/build && \ make install DESTDIR=/opt/dist && \ make install -RUN yum install -y gcc gcc-c++ make wget python36-numpy ccache eigen3-devel +RUN yum install -y gcc gcc-c++ make wget python36-numpy ccache eigen3-devel devtoolset-9 # build opencv ARG OPENCV_REPO=https://github.com/opencv/opencv/archive/4.5.2.tar.gz diff --git a/Xeon/centos-7/media/ffmpeg/Dockerfile b/Xeon/centos-7/media/ffmpeg/Dockerfile index 9e68c1bff..d62430391 100644 --- a/Xeon/centos-7/media/ffmpeg/Dockerfile +++ b/Xeon/centos-7/media/ffmpeg/Dockerfile @@ -220,7 +220,7 @@ RUN cd /opt/build && \ make install DESTDIR=/opt/dist && \ make install -RUN yum install -y cmake3 gcc gcc-c++ make wget python36-numpy ccache eigen3-devel +RUN yum install -y cmake3 gcc gcc-c++ make wget python36-numpy ccache eigen3-devel devtoolset-9 # build opencv ARG OPENCV_REPO=https://github.com/opencv/opencv/archive/4.5.2.tar.gz diff --git a/Xeon/centos-7/service/owt-dev/Dockerfile b/Xeon/centos-7/service/owt-dev/Dockerfile index 8abe61c03..26d244dd6 100644 --- a/Xeon/centos-7/service/owt-dev/Dockerfile +++ b/Xeon/centos-7/service/owt-dev/Dockerfile @@ -144,7 +144,7 @@ RUN cd /opt/build && \ make install DESTDIR=/opt/dist && \ make install -RUN yum install -y cmake3 gcc gcc-c++ make wget python36-numpy ccache eigen3-devel +RUN yum install -y cmake3 gcc gcc-c++ make wget python36-numpy ccache eigen3-devel devtoolset-9 # build opencv ARG OPENCV_REPO=https://github.com/opencv/opencv/archive/4.5.2.tar.gz diff --git a/Xeon/centos-7/service/owt/Dockerfile b/Xeon/centos-7/service/owt/Dockerfile index c039ede46..5e1aef160 100644 --- a/Xeon/centos-7/service/owt/Dockerfile +++ b/Xeon/centos-7/service/owt/Dockerfile @@ -145,7 +145,7 @@ RUN cd /opt/build && \ make install DESTDIR=/opt/dist && \ make install -RUN yum install -y cmake3 gcc gcc-c++ make wget python36-numpy ccache eigen3-devel +RUN yum install -y cmake3 gcc gcc-c++ make wget python36-numpy ccache eigen3-devel devtoolset-9 # build opencv ARG OPENCV_REPO=https://github.com/opencv/opencv/archive/4.5.2.tar.gz diff --git a/Xeon/centos-7/service/owt360/Dockerfile b/Xeon/centos-7/service/owt360/Dockerfile index 08b6a3e5f..3d09a8958 100644 --- a/Xeon/centos-7/service/owt360/Dockerfile +++ b/Xeon/centos-7/service/owt360/Dockerfile @@ -145,7 +145,7 @@ RUN cd /opt/build && \ make install DESTDIR=/opt/dist && \ make install -RUN yum install -y cmake3 gcc gcc-c++ make wget python36-numpy ccache eigen3-devel +RUN yum install -y cmake3 gcc gcc-c++ make wget python36-numpy ccache eigen3-devel devtoolset-9 # build opencv ARG OPENCV_REPO=https://github.com/opencv/opencv/archive/4.5.2.tar.gz @@ -305,11 +305,11 @@ RUN cd /opt/build/opencv-4.5.2/build && \ # build 360scvp -ARG SCVP_REPO=https://github.com/OpenVisualCloud/Immersive-Video-Sample/archive/v1.4.0.tar.gz +ARG SCVP_REPO=https://github.com/OpenVisualCloud/Immersive-Video-Sample/archive/v1.0.0.tar.gz ENV PYTHONIOENCODING=UTF-8 RUN cd /opt/build && \ wget -O - ${SCVP_REPO} | tar xz && \ - cd Immersive-Video-Sample-1.4.0/src/360SCVP && \ + cd Immersive-Video-Sample-1.0.0/src/360SCVP && \ mkdir build && \ cd build && \ cmake -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_INSTALL_LIBDIR=/usr/local/lib64 ../ && \ diff --git a/Xeon/ubuntu-18.04/service/owt360/Dockerfile b/Xeon/ubuntu-18.04/service/owt360/Dockerfile index f5eb365ff..396c81cf4 100644 --- a/Xeon/ubuntu-18.04/service/owt360/Dockerfile +++ b/Xeon/ubuntu-18.04/service/owt360/Dockerfile @@ -334,11 +334,11 @@ RUN cd /opt/build/opencv-4.5.2/build && \ # build 360scvp -ARG SCVP_REPO=https://github.com/OpenVisualCloud/Immersive-Video-Sample/archive/v1.4.0.tar.gz +ARG SCVP_REPO=https://github.com/OpenVisualCloud/Immersive-Video-Sample/archive/v1.0.0.tar.gz ENV PYTHONIOENCODING=UTF-8 RUN cd /opt/build && \ wget -O - ${SCVP_REPO} | tar xz && \ - cd Immersive-Video-Sample-1.4.0/src/360SCVP && \ + cd Immersive-Video-Sample-1.0.0/src/360SCVP && \ mkdir build && \ cd build && \ cmake -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_INSTALL_LIBDIR=/usr/local/lib ../ && \ diff --git a/XeonE3/centos-7/analytics/dev/Dockerfile b/XeonE3/centos-7/analytics/dev/Dockerfile index 1ea539566..897154507 100644 --- a/XeonE3/centos-7/analytics/dev/Dockerfile +++ b/XeonE3/centos-7/analytics/dev/Dockerfile @@ -292,7 +292,7 @@ RUN cd /opt/build/MediaSDK-intel-mediasdk-21.1.3 && \ make install DESTDIR=/opt/dist && \ make install -RUN yum install -y gcc gcc-c++ make wget python36-numpy ccache eigen3-devel +RUN yum install -y gcc gcc-c++ make wget python36-numpy ccache eigen3-devel devtoolset-9 # build opencv ARG OPENCV_REPO=https://github.com/opencv/opencv/archive/4.5.2.tar.gz diff --git a/XeonE3/centos-7/analytics/ffmpeg/Dockerfile b/XeonE3/centos-7/analytics/ffmpeg/Dockerfile index eca6483c8..0ac062474 100644 --- a/XeonE3/centos-7/analytics/ffmpeg/Dockerfile +++ b/XeonE3/centos-7/analytics/ffmpeg/Dockerfile @@ -277,7 +277,7 @@ RUN cd /opt/build/MediaSDK-intel-mediasdk-21.1.3 && \ make install DESTDIR=/opt/dist && \ make install -RUN yum install -y gcc gcc-c++ make wget python36-numpy ccache eigen3-devel +RUN yum install -y gcc gcc-c++ make wget python36-numpy ccache eigen3-devel devtoolset-9 # build opencv ARG OPENCV_REPO=https://github.com/opencv/opencv/archive/4.5.2.tar.gz diff --git a/XeonE3/centos-7/analytics/gst/Dockerfile b/XeonE3/centos-7/analytics/gst/Dockerfile index 318c3afa0..fafc8d6ba 100644 --- a/XeonE3/centos-7/analytics/gst/Dockerfile +++ b/XeonE3/centos-7/analytics/gst/Dockerfile @@ -274,7 +274,7 @@ RUN cd /opt/build/media-driver-intel-media-21.1.3 && mkdir build && cd build && make install DESTDIR=/opt/dist && \ make install -RUN yum install -y gcc gcc-c++ make wget python36-numpy ccache eigen3-devel +RUN yum install -y gcc gcc-c++ make wget python36-numpy ccache eigen3-devel devtoolset-9 # build opencv ARG OPENCV_REPO=https://github.com/opencv/opencv/archive/4.5.2.tar.gz diff --git a/XeonE3/centos-7/media/ffmpeg/Dockerfile b/XeonE3/centos-7/media/ffmpeg/Dockerfile index b9f247064..296029605 100644 --- a/XeonE3/centos-7/media/ffmpeg/Dockerfile +++ b/XeonE3/centos-7/media/ffmpeg/Dockerfile @@ -285,7 +285,7 @@ RUN cd /opt/build/MediaSDK-intel-mediasdk-21.1.3 && \ make install DESTDIR=/opt/dist && \ make install -RUN yum install -y gcc gcc-c++ make wget python36-numpy ccache eigen3-devel +RUN yum install -y gcc gcc-c++ make wget python36-numpy ccache eigen3-devel devtoolset-9 # build opencv ARG OPENCV_REPO=https://github.com/opencv/opencv/archive/4.5.2.tar.gz diff --git a/XeonE3/centos-7/service/owt-dev/Dockerfile b/XeonE3/centos-7/service/owt-dev/Dockerfile index 77073ab86..6053b6855 100644 --- a/XeonE3/centos-7/service/owt-dev/Dockerfile +++ b/XeonE3/centos-7/service/owt-dev/Dockerfile @@ -209,7 +209,7 @@ RUN cd /opt/build/MediaSDK-intel-mediasdk-21.1.3 && \ make install DESTDIR=/opt/dist && \ make install -RUN yum install -y gcc gcc-c++ make wget python36-numpy ccache eigen3-devel +RUN yum install -y gcc gcc-c++ make wget python36-numpy ccache eigen3-devel devtoolset-9 # build opencv ARG OPENCV_REPO=https://github.com/opencv/opencv/archive/4.5.2.tar.gz diff --git a/XeonE3/centos-7/service/owt/Dockerfile b/XeonE3/centos-7/service/owt/Dockerfile index 9460481ff..3324f0e2f 100644 --- a/XeonE3/centos-7/service/owt/Dockerfile +++ b/XeonE3/centos-7/service/owt/Dockerfile @@ -156,7 +156,7 @@ RUN cd /opt/build && \ make install DESTDIR=/opt/dist && \ make install -RUN yum install -y gcc gcc-c++ make wget python36-numpy ccache eigen3-devel +RUN yum install -y gcc gcc-c++ make wget python36-numpy ccache eigen3-devel devtoolset-9 # build opencv ARG OPENCV_REPO=https://github.com/opencv/opencv/archive/4.5.2.tar.gz diff --git a/XeonE3/centos-7/service/owt360/Dockerfile b/XeonE3/centos-7/service/owt360/Dockerfile index c90f83693..c10eef208 100644 --- a/XeonE3/centos-7/service/owt360/Dockerfile +++ b/XeonE3/centos-7/service/owt360/Dockerfile @@ -210,7 +210,7 @@ RUN cd /opt/build/MediaSDK-intel-mediasdk-21.1.3 && \ make install DESTDIR=/opt/dist && \ make install -RUN yum install -y gcc gcc-c++ make wget python36-numpy ccache eigen3-devel +RUN yum install -y gcc gcc-c++ make wget python36-numpy ccache eigen3-devel devtoolset-9 # build opencv ARG OPENCV_REPO=https://github.com/opencv/opencv/archive/4.5.2.tar.gz @@ -375,11 +375,11 @@ RUN cd /opt/build/opencv-4.5.2/build && \ # build 360scvp -ARG SCVP_REPO=https://github.com/OpenVisualCloud/Immersive-Video-Sample/archive/v1.4.0.tar.gz +ARG SCVP_REPO=https://github.com/OpenVisualCloud/Immersive-Video-Sample/archive/v1.0.0.tar.gz ENV PYTHONIOENCODING=UTF-8 RUN cd /opt/build && \ wget -O - ${SCVP_REPO} | tar xz && \ - cd Immersive-Video-Sample-1.4.0/src/360SCVP && \ + cd Immersive-Video-Sample-1.0.0/src/360SCVP && \ mkdir build && \ cd build && \ cmake -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_INSTALL_LIBDIR=/usr/local/lib64 ../ && \ diff --git a/XeonE3/ubuntu-18.04/service/owt360/Dockerfile b/XeonE3/ubuntu-18.04/service/owt360/Dockerfile index ed454152e..d3bcbe62e 100644 --- a/XeonE3/ubuntu-18.04/service/owt360/Dockerfile +++ b/XeonE3/ubuntu-18.04/service/owt360/Dockerfile @@ -405,11 +405,11 @@ RUN cd /opt/build/opencv-4.5.2/build && \ # build 360scvp -ARG SCVP_REPO=https://github.com/OpenVisualCloud/Immersive-Video-Sample/archive/v1.4.0.tar.gz +ARG SCVP_REPO=https://github.com/OpenVisualCloud/Immersive-Video-Sample/archive/v1.0.0.tar.gz ENV PYTHONIOENCODING=UTF-8 RUN cd /opt/build && \ wget -O - ${SCVP_REPO} | tar xz && \ - cd Immersive-Video-Sample-1.4.0/src/360SCVP && \ + cd Immersive-Video-Sample-1.0.0/src/360SCVP && \ mkdir build && \ cd build && \ cmake -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_INSTALL_LIBDIR=/usr/local/lib ../ && \ diff --git a/template/components/opencv.m4 b/template/components/opencv.m4 index f109131e7..cbfa22377 100644 --- a/template/components/opencv.m4 +++ b/template/components/opencv.m4 @@ -37,12 +37,9 @@ define(`OPENCV_BUILD_DEPS',`ca-certificates ifdef(`BUILD_CMAKE',,cmake) gcc g++ ') ifelse(OS_NAME,centos,` -define(`OPENCV_BUILD_DEPS',`ifdef(`BUILD_CMAKE',,cmake3) gcc gcc-c++ make wget python36-numpy ccache eigen3-devel') +define(`OPENCV_BUILD_DEPS',`ifdef(`BUILD_CMAKE',,cmake3) gcc gcc-c++ make wget python36-numpy ccache eigen3-devel ifelse(OS_VERSION,7,devtoolset-9)') ') - ifelse(OS_NAME:OS_VERSION,centos:7,`(. /opt/rh/devtoolset-9/enable && ')ifdef(`BUILD_CMAKE',cmake,ifelse(OS_NAME,centos,cmake3,cmake)) -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=BUILD_PREFIX -DCMAKE_INSTALL_LIBDIR=BUILD_LIBDIR -DCMAKE_ASM_NASM_COMPILER=yasm ../.. && \ - make -j $(nproc)ifelse(OS_NAME:OS_VERSION,centos:7,` )') && \ - define(`BUILD_OPENCV',` # build opencv ARG OPENCV_REPO=https://github.com/opencv/opencv/archive/OPENCV_VER.tar.gz diff --git a/template/components/qat-engine.m4 b/template/components/qat-engine.m4 index b21a5d50b..0a1619e61 100644 --- a/template/components/qat-engine.m4 +++ b/template/components/qat-engine.m4 @@ -52,7 +52,7 @@ RUN cd BUILD_HOME && \ cd QAT_Engine* && \ ./autogen.sh && \ export PERL5LIB="$(ls -1 -d BUILD_HOME/openssl-*)" && \ - ./configure --with-qat_dir=/opt/intel/QAT --with-openssl_dir="$PERL5LIB" --with-openssl_install_dir=BUILD_PREFIX/ssl --prefix=/opt/intel/QATengine --disable-qat_ecx --with-cc-opt="-DQAT_DISABLE_NONZERO_MEMFREE ifdef(`BUILD_QAT_CRYPTOMB',-IBUILD_HOME/ipp-crypto-QAT_CRYPTOMB_VER/sources/ippcp/crypto_mb/include)" ifdef(`BUILD_QAT_CRYPTOMB',--enable-multibuff_offload --enable-multibuff_ecx --enable-qat_sw, --enable-qat_hw --with-qat_hw_dir=/opt/intel/QAT) && \ + ./configure --with-qat_dir=/opt/intel/QAT --with-openssl_dir="$PERL5LIB" --with-openssl_install_dir=BUILD_PREFIX/ssl --prefix=/opt/intel/QATengine --disable-qat_ecx --with-cc-opt="-DQAT_DISABLE_NONZERO_MEMFREE ifdef(`BUILD_QAT_CRYPTOMB',-I`'BUILD_HOME/ipp-crypto-QAT_CRYPTOMB_VER/sources/ippcp/crypto_mb/include)" ifdef(`BUILD_QAT_CRYPTOMB',--enable-multibuff_offload --enable-multibuff_ecx --enable-qat_sw, --enable-qat_hw --with-qat_hw_dir=/opt/intel/QAT) && \ make -j8 && \ make install && \ tar cf - BUILD_PREFIX/ssl | (cd BUILD_DESTDIR && tar xf -) diff --git a/template/components/scvp.m4 b/template/components/scvp.m4 index 9d032a4c2..e0d8b5f87 100644 --- a/template/components/scvp.m4 +++ b/template/components/scvp.m4 @@ -30,7 +30,7 @@ dnl OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. dnl include(begin.m4) -DECLARE(`SCVP_VER',1.4.0) +DECLARE(`SCVP_VER',1.0.0) define(`BUILD_SCVP',` # build 360scvp diff --git a/test/ffmpeg_dash.sh b/test/ffmpeg_svt_dash.sh similarity index 100% rename from test/ffmpeg_dash.sh rename to test/ffmpeg_svt_dash.sh diff --git a/test/ffmpeg_hls.sh b/test/ffmpeg_svt_hls.sh similarity index 100% rename from test/ffmpeg_hls.sh rename to test/ffmpeg_svt_hls.sh From 9147f64bbe1e0bc6defa4bdeff315f08d6a596cc Mon Sep 17 00:00:00 2001 From: dpatel257 Date: Wed, 30 Jun 2021 15:31:26 -0700 Subject: [PATCH 08/13] [master] Owt boost revert (#759) * Update Docker image README (#704) * update README * Update dockerfiles * revert boost for owt on centos7 Co-authored-by: jhou5 --- Xeon/centos-7/service/owt-dev/Dockerfile | 2 +- Xeon/centos-7/service/owt/Dockerfile | 2 +- XeonE3/centos-7/service/owt-dev/Dockerfile | 2 +- XeonE3/centos-7/service/owt/Dockerfile | 2 +- template/components/boost.m4 | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Xeon/centos-7/service/owt-dev/Dockerfile b/Xeon/centos-7/service/owt-dev/Dockerfile index 26d244dd6..42877f1a7 100644 --- a/Xeon/centos-7/service/owt-dev/Dockerfile +++ b/Xeon/centos-7/service/owt-dev/Dockerfile @@ -509,7 +509,7 @@ RUN cd /opt/build/gst-python-1.19.1 && \ RUN yum install -y python-devel # build boost -ARG BOOST_REPO=http://iweb.dl.sourceforge.net/project/boost/boost/1.76.0/boost_1_76_0.tar.bz2 +ARG BOOST_REPO=http://iweb.dl.sourceforge.net/project/boost/boost/1.65.0/boost_1_65_0.tar.bz2 RUN cd /opt/build && \ wget -O - ${BOOST_REPO} | tar jx RUN cd /opt/build/boost_1_65_0 && \ diff --git a/Xeon/centos-7/service/owt/Dockerfile b/Xeon/centos-7/service/owt/Dockerfile index 5e1aef160..651a982f0 100644 --- a/Xeon/centos-7/service/owt/Dockerfile +++ b/Xeon/centos-7/service/owt/Dockerfile @@ -510,7 +510,7 @@ RUN cd /opt/build/gst-python-1.19.1 && \ RUN yum install -y python-devel # build boost -ARG BOOST_REPO=http://iweb.dl.sourceforge.net/project/boost/boost/1.76.0/boost_1_76_0.tar.bz2 +ARG BOOST_REPO=http://iweb.dl.sourceforge.net/project/boost/boost/1.65.0/boost_1_65_0.tar.bz2 RUN cd /opt/build && \ wget -O - ${BOOST_REPO} | tar jx RUN cd /opt/build/boost_1_65_0 && \ diff --git a/XeonE3/centos-7/service/owt-dev/Dockerfile b/XeonE3/centos-7/service/owt-dev/Dockerfile index 6053b6855..1bf943c65 100644 --- a/XeonE3/centos-7/service/owt-dev/Dockerfile +++ b/XeonE3/centos-7/service/owt-dev/Dockerfile @@ -562,7 +562,7 @@ RUN cd /opt/build/gst-python-1.19.1 && \ RUN yum install -y python-devel # build boost -ARG BOOST_REPO=http://iweb.dl.sourceforge.net/project/boost/boost/1.76.0/boost_1_76_0.tar.bz2 +ARG BOOST_REPO=http://iweb.dl.sourceforge.net/project/boost/boost/1.65.0/boost_1_65_0.tar.bz2 RUN cd /opt/build && \ wget -O - ${BOOST_REPO} | tar jx RUN cd /opt/build/boost_1_65_0 && \ diff --git a/XeonE3/centos-7/service/owt/Dockerfile b/XeonE3/centos-7/service/owt/Dockerfile index 3324f0e2f..05450681a 100644 --- a/XeonE3/centos-7/service/owt/Dockerfile +++ b/XeonE3/centos-7/service/owt/Dockerfile @@ -563,7 +563,7 @@ RUN cd /opt/build/gst-python-1.19.1 && \ RUN yum install -y python-devel # build boost -ARG BOOST_REPO=http://iweb.dl.sourceforge.net/project/boost/boost/1.76.0/boost_1_76_0.tar.bz2 +ARG BOOST_REPO=http://iweb.dl.sourceforge.net/project/boost/boost/1.65.0/boost_1_65_0.tar.bz2 RUN cd /opt/build && \ wget -O - ${BOOST_REPO} | tar jx RUN cd /opt/build/boost_1_65_0 && \ diff --git a/template/components/boost.m4 b/template/components/boost.m4 index 202fea4b4..c169cc972 100644 --- a/template/components/boost.m4 +++ b/template/components/boost.m4 @@ -30,7 +30,7 @@ dnl OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. dnl include(begin.m4) -DECLARE(`BOOST_VER',1.76.0) +DECLARE(`BOOST_VER',1.65.0) ifelse(OS_NAME,centos,` define(`BOOST_BUILD_DEPS',`python-devel') @@ -38,7 +38,7 @@ define(`BOOST_BUILD_DEPS',`python-devel') define(`BUILD_BOOST',` # build boost -ARG BOOST_REPO=http://iweb.dl.sourceforge.net/project/boost/boost/BOOST_VER/boost_1_76_0.tar.bz2 +ARG BOOST_REPO=http://iweb.dl.sourceforge.net/project/boost/boost/BOOST_VER/boost_1_65_0.tar.bz2 RUN cd BUILD_HOME && \ wget -O - ${BOOST_REPO} | tar jx RUN cd BUILD_HOME/boost_1_65_0 && \ From 808f711d99735a1b41472bed58a450a4533096c2 Mon Sep 17 00:00:00 2001 From: dpatel257 Date: Thu, 1 Jul 2021 22:02:30 -0700 Subject: [PATCH 09/13] [master] Fix Ipsec caused u2004 bug (#762) * Update Docker image README (#704) * update README * Update dockerfiles * fix ipsecmb caused system fault in u2004 Co-authored-by: jhou5 --- QAT/centos-7/media/dev/Dockerfile | 2 +- QAT/centos-7/media/nginx_sw/Dockerfile | 2 +- QAT/ubuntu-18.04/media/dev/Dockerfile | 2 +- QAT/ubuntu-18.04/media/nginx_sw/Dockerfile | 2 +- QAT/ubuntu-20.04/media/dev/Dockerfile | 2 +- QAT/ubuntu-20.04/media/nginx_sw/Dockerfile | 2 +- template/components/ipsecmb.m4 | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/QAT/centos-7/media/dev/Dockerfile b/QAT/centos-7/media/dev/Dockerfile index b0e24a415..5d3c01345 100644 --- a/QAT/centos-7/media/dev/Dockerfile +++ b/QAT/centos-7/media/dev/Dockerfile @@ -120,7 +120,7 @@ RUN cd /opt/build && \ cd intel-ipsec-mb && \ (. /opt/rh/devtoolset-9/enable && CFLAGS="-Wl,-rpath=/usr/local/ssl/lib" make -j SAFE_DATA=y SAFE_PARAM=y SAFE_LOOKUP=y ) && \ make install && \ - make install PREFIX=/opt/dist + make install PREFIX=/opt/dist RUN yum install -y wget make gcc gawk autoconf automake libtool pkg-config diff --git a/QAT/centos-7/media/nginx_sw/Dockerfile b/QAT/centos-7/media/nginx_sw/Dockerfile index 547704630..87a167391 100644 --- a/QAT/centos-7/media/nginx_sw/Dockerfile +++ b/QAT/centos-7/media/nginx_sw/Dockerfile @@ -120,7 +120,7 @@ RUN cd /opt/build && \ cd intel-ipsec-mb && \ (. /opt/rh/devtoolset-9/enable && CFLAGS="-Wl,-rpath=/usr/local/ssl/lib" make -j SAFE_DATA=y SAFE_PARAM=y SAFE_LOOKUP=y ) && \ make install && \ - make install PREFIX=/opt/dist + make install PREFIX=/opt/dist RUN yum install -y wget make gcc gawk autoconf automake libtool pkg-config diff --git a/QAT/ubuntu-18.04/media/dev/Dockerfile b/QAT/ubuntu-18.04/media/dev/Dockerfile index c5e6947a5..5522018f8 100644 --- a/QAT/ubuntu-18.04/media/dev/Dockerfile +++ b/QAT/ubuntu-18.04/media/dev/Dockerfile @@ -127,7 +127,7 @@ RUN cd /opt/build && \ cd intel-ipsec-mb && \ CC="gcc-9" CXX="g++-9" CFLAGS="-Wl,-rpath=/usr/local/ssl/lib" make -j SAFE_DATA=y SAFE_PARAM=y SAFE_LOOKUP=y && \ make install && \ - make install PREFIX=/opt/dist + make install PREFIX=/opt/dist\/usr/local RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ diff --git a/QAT/ubuntu-18.04/media/nginx_sw/Dockerfile b/QAT/ubuntu-18.04/media/nginx_sw/Dockerfile index 02a3b5a74..69496c565 100644 --- a/QAT/ubuntu-18.04/media/nginx_sw/Dockerfile +++ b/QAT/ubuntu-18.04/media/nginx_sw/Dockerfile @@ -127,7 +127,7 @@ RUN cd /opt/build && \ cd intel-ipsec-mb && \ CC="gcc-9" CXX="g++-9" CFLAGS="-Wl,-rpath=/usr/local/ssl/lib" make -j SAFE_DATA=y SAFE_PARAM=y SAFE_LOOKUP=y && \ make install && \ - make install PREFIX=/opt/dist + make install PREFIX=/opt/dist\/usr/local RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ diff --git a/QAT/ubuntu-20.04/media/dev/Dockerfile b/QAT/ubuntu-20.04/media/dev/Dockerfile index ba0e8e984..b8f70de0a 100644 --- a/QAT/ubuntu-20.04/media/dev/Dockerfile +++ b/QAT/ubuntu-20.04/media/dev/Dockerfile @@ -123,7 +123,7 @@ RUN cd /opt/build && \ cd intel-ipsec-mb && \ CFLAGS="-Wl,-rpath=/usr/local/ssl/lib" make -j SAFE_DATA=y SAFE_PARAM=y SAFE_LOOKUP=y && \ make install && \ - make install PREFIX=/opt/dist + make install PREFIX=/opt/dist\/usr/local RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ diff --git a/QAT/ubuntu-20.04/media/nginx_sw/Dockerfile b/QAT/ubuntu-20.04/media/nginx_sw/Dockerfile index 892fd664a..5f683a53b 100644 --- a/QAT/ubuntu-20.04/media/nginx_sw/Dockerfile +++ b/QAT/ubuntu-20.04/media/nginx_sw/Dockerfile @@ -123,7 +123,7 @@ RUN cd /opt/build && \ cd intel-ipsec-mb && \ CFLAGS="-Wl,-rpath=/usr/local/ssl/lib" make -j SAFE_DATA=y SAFE_PARAM=y SAFE_LOOKUP=y && \ make install && \ - make install PREFIX=/opt/dist + make install PREFIX=/opt/dist\/usr/local RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ diff --git a/template/components/ipsecmb.m4 b/template/components/ipsecmb.m4 index aca397f12..ce0f11fee 100644 --- a/template/components/ipsecmb.m4 +++ b/template/components/ipsecmb.m4 @@ -51,7 +51,7 @@ RUN cd BUILD_HOME && \ cd intel-ipsec-mb && \ ifelse(OS_NAME:OS_VERSION,centos:7,`(. /opt/rh/devtoolset-9/enable && ')ifelse(OS_NAME:OS_VERSION,ubuntu:18.04,CC="gcc-9" CXX="g++-9" )CFLAGS="-Wl,-rpath=BUILD_PREFIX/ssl/lib" make -j SAFE_DATA=y SAFE_PARAM=y SAFE_LOOKUP=y ifelse(OS_NAME:OS_VERSION,centos:7,`) ') && \ make install && \ - make install PREFIX=BUILD_DESTDIR + make install ifelse(OS_NAME,ubuntu,PREFIX=BUILD_DESTDIR\BUILD_PREFIX,PREFIX=BUILD_DESTDIR) ') REG(IPSECMB) From 64e2546e87936ad0ff89a5bada1dac224e1235d9 Mon Sep 17 00:00:00 2001 From: dpatel257 Date: Tue, 6 Jul 2021 22:25:25 -0700 Subject: [PATCH 10/13] [master] Dldt Video Analytics test fix (#764) * Update Docker image README (#704) * update README * Update dockerfiles * fix dldt gva tests broken by links Co-authored-by: jhou5 --- test/dldt_gst_video_analytics.sh | 33 +++++++++++--------------- test/dldt_gst_video_analytics_vcaca.sh | 32 +++++++++++-------------- 2 files changed, 28 insertions(+), 37 deletions(-) diff --git a/test/dldt_gst_video_analytics.sh b/test/dldt_gst_video_analytics.sh index 7e77341d7..946c8c4f0 100755 --- a/test/dldt_gst_video_analytics.sh +++ b/test/dldt_gst_video_analytics.sh @@ -11,26 +11,21 @@ fi pip3 install pyyaml requests -if grep --quiet 'Ubuntu' /etc/os-release; then - wget https://download.01.org/opencv/2021/openvinotoolkit/2021.1/open_model_zoo/models_bin/2/vehicle-license-plate-detection-barrier-0106/FP32/vehicle-license-plate-detection-barrier-0106.bin - wget https://download.01.org/opencv/2021/openvinotoolkit/2021.1/open_model_zoo/models_bin/2/vehicle-license-plate-detection-barrier-0106/FP32/vehicle-license-plate-detection-barrier-0106.xml - wget https://raw.githubusercontent.com/openvinotoolkit/dlstreamer_gst/master/samples/model_proc/vehicle-license-plate-detection-barrier-0106.json +wget https://storage.openvinotoolkit.org/repositories/open_model_zoo/2021.3/models_bin/2/vehicle-license-plate-detection-barrier-0106/FP32/vehicle-license-plate-detection-barrier-0106.bin +wget https://storage.openvinotoolkit.org/repositories/open_model_zoo/2021.3/models_bin/2/vehicle-license-plate-detection-barrier-0106/FP32/vehicle-license-plate-detection-barrier-0106.xml - wget https://download.01.org/opencv/2021/openvinotoolkit/2021.1/open_model_zoo/models_bin/2/vehicle-attributes-recognition-barrier-0039/FP32/vehicle-attributes-recognition-barrier-0039.bin - wget https://download.01.org/opencv/2021/openvinotoolkit/2021.1/open_model_zoo/models_bin/2/vehicle-attributes-recognition-barrier-0039/FP32/vehicle-attributes-recognition-barrier-0039.xml - wget https://raw.githubusercontent.com/openvinotoolkit/dlstreamer_gst/master/samples/model_proc/vehicle-attributes-recognition-barrier-0039.json +wget https://storage.openvinotoolkit.org/repositories/open_model_zoo/2021.3/models_bin/2/vehicle-attributes-recognition-barrier-0039/FP32/vehicle-attributes-recognition-barrier-0039.bin +wget https://storage.openvinotoolkit.org/repositories/open_model_zoo/2021.3/models_bin/2/vehicle-attributes-recognition-barrier-0039/FP32/vehicle-attributes-recognition-barrier-0039.xml +wget https://storage.openvinotoolkit.org/repositories/open_model_zoo/2021.3/models_bin/2/license-plate-recognition-barrier-0001/FP32/license-plate-recognition-barrier-0001.bin +wget https://storage.openvinotoolkit.org/repositories/open_model_zoo/2021.3/models_bin/2/license-plate-recognition-barrier-0001/FP32/license-plate-recognition-barrier-0001.xml - wget https://download.01.org/opencv/2021/openvinotoolkit/2021.1/open_model_zoo/models_bin/2/license-plate-recognition-barrier-0001/FP32/license-plate-recognition-barrier-0001.bin - wget https://download.01.org/opencv/2021/openvinotoolkit/2021.1/open_model_zoo/models_bin/2/license-plate-recognition-barrier-0001/FP32/license-plate-recognition-barrier-0001.xml - wget https://raw.githubusercontent.com/openvinotoolkit/dlstreamer_gst/master/samples/model_proc/license-plate-recognition-barrier-0001.json - - dd if=/dev/urandom bs=115200 count=300 of=test.yuv # 10 seconds video - gst-launch-1.0 -v filesrc location=test.yuv ! videoparse format=i420 width=320 height=240 framerate=30 ! x264enc ! mpegtsmux ! filesink location=test.ts - gst-launch-1.0 -v filesrc location=test.ts ! decodebin ! video/x-raw ! videoconvert ! \ - gvadetect model=vehicle-license-plate-detection-barrier-0106.xml model-proc=vehicle-license-plate-detection-barrier-0106.json ! queue ! \ - gvaclassify model=vehicle-attributes-recognition-barrier-0039.xml object-class=vehicle model-proc=vehicle-attributes-recognition-barrier-0039.json ! queue ! \ - gvaclassify model=license-plate-recognition-barrier-0001.xml object-class=license-plate model-proc=license-plate-recognition-barrier-0001.json ! queue ! \ - gvawatermark ! videoconvert ! fakesink; -fi +wget -O - https://github.com/openvinotoolkit/dlstreamer_gst/archive/refs/tags/v1.4.1.tar.gz | tar xz +dd if=/dev/urandom bs=115200 count=300 of=test.yuv # 10 seconds video +gst-launch-1.0 -v filesrc location=test.yuv ! videoparse format=i420 width=320 height=240 framerate=30 ! x264enc ! mpegtsmux ! filesink location=test.ts +gst-launch-1.0 -v filesrc location=test.ts ! decodebin ! video/x-raw ! videoconvert ! \ + gvadetect model=vehicle-license-plate-detection-barrier-0106.xml model-proc=dlstreamer_gst-1.4.1/samples/model_proc/vehicle-license-plate-detection-barrier-0106.json ! queue ! \ + gvaclassify model=vehicle-attributes-recognition-barrier-0039.xml object-class=vehicle model-proc=dlstreamer_gst-1.4.1/samples/model_proc/vehicle-attributes-recognition-barrier-0039.json ! queue ! \ + gvaclassify model=license-plate-recognition-barrier-0001.xml object-class=license-plate model-proc=dlstreamer_gst-1.4.1/samples/model_proc/license-plate-recognition-barrier-0001.json ! queue ! \ + gvawatermark ! videoconvert ! fakesink; diff --git a/test/dldt_gst_video_analytics_vcaca.sh b/test/dldt_gst_video_analytics_vcaca.sh index 04aa523e0..6f622874b 100755 --- a/test/dldt_gst_video_analytics_vcaca.sh +++ b/test/dldt_gst_video_analytics_vcaca.sh @@ -11,25 +11,21 @@ fi pip3 install pyyaml requests -if grep --quiet 'Ubuntu' /etc/os-release; then - wget https://download.01.org/opencv/2021/openvinotoolkit/2021.1/open_model_zoo/models_bin/2/vehicle-license-plate-detection-barrier-0106/FP32/vehicle-license-plate-detection-barrier-0106.bin - wget https://download.01.org/opencv/2021/openvinotoolkit/2021.1/open_model_zoo/models_bin/2/vehicle-license-plate-detection-barrier-0106/FP32/vehicle-license-plate-detection-barrier-0106.xml - wget https://raw.githubusercontent.com/openvinotoolkit/dlstreamer_gst/master/samples/model_proc/vehicle-license-plate-detection-barrier-0106.json +wget https://storage.openvinotoolkit.org/repositories/open_model_zoo/2021.3/models_bin/2/vehicle-license-plate-detection-barrier-0106/FP32/vehicle-license-plate-detection-barrier-0106.bin +wget https://storage.openvinotoolkit.org/repositories/open_model_zoo/2021.3/models_bin/2/vehicle-license-plate-detection-barrier-0106/FP32/vehicle-license-plate-detection-barrier-0106.xml - wget https://download.01.org/opencv/2021/openvinotoolkit/2021.1/open_model_zoo/models_bin/2/vehicle-attributes-recognition-barrier-0039/FP32/vehicle-attributes-recognition-barrier-0039.bin - wget https://download.01.org/opencv/2021/openvinotoolkit/2021.1/open_model_zoo/models_bin/2/vehicle-attributes-recognition-barrier-0039/FP32/vehicle-attributes-recognition-barrier-0039.xml - wget https://raw.githubusercontent.com/openvinotoolkit/dlstreamer_gst/master/samples/model_proc/vehicle-attributes-recognition-barrier-0039.json +wget https://storage.openvinotoolkit.org/repositories/open_model_zoo/2021.3/models_bin/2/vehicle-attributes-recognition-barrier-0039/FP32/vehicle-attributes-recognition-barrier-0039.bin +wget https://storage.openvinotoolkit.org/repositories/open_model_zoo/2021.3/models_bin/2/vehicle-attributes-recognition-barrier-0039/FP32/vehicle-attributes-recognition-barrier-0039.xml +wget https://storage.openvinotoolkit.org/repositories/open_model_zoo/2021.3/models_bin/2/license-plate-recognition-barrier-0001/FP32/license-plate-recognition-barrier-0001.bin +wget https://storage.openvinotoolkit.org/repositories/open_model_zoo/2021.3/models_bin/2/license-plate-recognition-barrier-0001/FP32/license-plate-recognition-barrier-0001.xml - wget https://download.01.org/opencv/2021/openvinotoolkit/2021.1/open_model_zoo/models_bin/2/license-plate-recognition-barrier-0001/FP32/license-plate-recognition-barrier-0001.bin - wget https://download.01.org/opencv/2021/openvinotoolkit/2021.1/open_model_zoo/models_bin/2/license-plate-recognition-barrier-0001/FP32/license-plate-recognition-barrier-0001.xml - wget https://raw.githubusercontent.com/openvinotoolkit/dlstreamer_gst/master/samples/model_proc/license-plate-recognition-barrier-0001.json +wget -O - https://github.com/openvinotoolkit/dlstreamer_gst/archive/refs/tags/v1.4.1.tar.gz | tar xz - dd if=/dev/urandom bs=115200 count=300 of=test.yuv # 10 seconds video - gst-launch-1.0 -v filesrc location=test.yuv ! videoparse format=i420 width=320 height=240 framerate=30 ! x264enc ! mpegtsmux ! filesink location=test.ts - gst-launch-1.0 -v filesrc location=test.ts ! decodebin ! video/x-raw ! videoconvert ! \ - gvadetect model=vehicle-license-plate-detection-barrier-0106.xml model-proc=vehicle-license-plate-detection-barrier-0106.json device=HDDL ! queue ! \ - gvaclassify model=vehicle-attributes-recognition-barrier-0039.xml object-class=vehicle model-proc=vehicle-attributes-recognition-barrier-0039.json device=HDDL ! queue ! \ - gvaclassify model=license-plate-recognition-barrier-0001.xml object-class=license-plate model-proc=license-plate-recognition-barrier-0001.json device=HDDL ! queue ! \ - gvawatermark ! videoconvert ! fakesink; -fi +dd if=/dev/urandom bs=115200 count=300 of=test.yuv # 10 seconds video +gst-launch-1.0 -v filesrc location=test.yuv ! videoparse format=i420 width=320 height=240 framerate=30 ! x264enc ! mpegtsmux ! filesink location=test.ts +gst-launch-1.0 -v filesrc location=test.ts ! decodebin ! video/x-raw ! videoconvert ! \ + gvadetect model=vehicle-license-plate-detection-barrier-0106.xml model-proc=dlstreamer_gst-1.4.1/samples/model_proc/vehicle-license-plate-detection-barrier-0106.json device=HDDL ! queue ! \ + gvaclassify model=vehicle-attributes-recognition-barrier-0039.xml object-class=vehicle model-proc=dlstreamer_gst-1.4.1/samples/model_proc/vehicle-attributes-recognition-barrier-0039.json device=HDDL ! queue ! \ + gvaclassify model=license-plate-recognition-barrier-0001.xml object-class=license-plate model-proc=dlstreamer_gst-1.4.1/samples/model_proc/license-plate-recognition-barrier-0001.json device=HDDL ! queue ! \ + gvawatermark ! videoconvert ! fakesink; From 900209cd148eb2a18c3865633d4ba32f8205fbb4 Mon Sep 17 00:00:00 2001 From: dpatel257 Date: Wed, 7 Jul 2021 10:08:22 -0700 Subject: [PATCH 11/13] Ubuntu 20.04 fix for vaapi failures (#766) * Update Docker image README (#704) * update README * Update dockerfiles * fix u2004 images for vaapi due to lib change Co-authored-by: jhou5 --- VCAC-A/ubuntu-20.04/analytics/dev/Dockerfile | 2 +- VCAC-A/ubuntu-20.04/analytics/gst/Dockerfile | 2 +- XeonE3/ubuntu-20.04/analytics/dev/Dockerfile | 2 +- XeonE3/ubuntu-20.04/analytics/gst/Dockerfile | 2 +- XeonE3/ubuntu-20.04/media/dev/Dockerfile | 2 +- XeonE3/ubuntu-20.04/media/gst/Dockerfile | 2 +- template/components/gst-vaapi.m4 | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/VCAC-A/ubuntu-20.04/analytics/dev/Dockerfile b/VCAC-A/ubuntu-20.04/analytics/dev/Dockerfile index bad89f24f..467931dfa 100644 --- a/VCAC-A/ubuntu-20.04/analytics/dev/Dockerfile +++ b/VCAC-A/ubuntu-20.04/analytics/dev/Dockerfile @@ -725,7 +725,7 @@ WORKDIR /home RUN apt-get update && apt-get upgrade -y systemd RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - libnuma1 libdrm2 libx11-6 libxext6 libxfixes3 libwayland-client0 libpciaccess0 libusb-1.0-0-dev libboost-filesystem1.71.0 libboost-system1.71.0 libboost-program-options1.71.0 libjson-c4 libglib2.0-0 libxv1 libxt6 libasound2 libpangocairo-1.0-0 libcairo-gobject2 libtheora0 libvisual-0.4-0 libgl1-mesa-dri libgl1-mesa-glx libegl1-mesa libgdk-pixbuf2.0-0 libjpeg-turbo8 libpng16-16 zlib1g libsoup2.4-1 openssl libcurl3-gnutls librtmp1 mjpegtools libde265-0 libxcb-shape0 libxcb-xfixes0 libv4l-0 libass9 python3-numpy python3-gi python3-gi-cairo python3-dev ocl-icd-opencl-dev libwayland-egl1 libglib2.0-dev && \ + libnuma1 libdrm2 libx11-6 libxext6 libxfixes3 libwayland-client0 libpciaccess0 libusb-1.0-0-dev libboost-filesystem1.71.0 libboost-system1.71.0 libboost-program-options1.71.0 libjson-c4 libglib2.0-0 libxv1 libxt6 libasound2 libpangocairo-1.0-0 libcairo-gobject2 libtheora0 libvisual-0.4-0 libgl1-mesa-dri libgl1-mesa-glx libegl1-mesa libgdk-pixbuf2.0-0 libjpeg-turbo8 libpng16-16 zlib1g libsoup2.4-1 openssl libcurl3-gnutls librtmp1 mjpegtools libde265-0 libxcb-shape0 libxcb-xfixes0 libv4l-0 libass9 libgles2 python3-numpy python3-gi python3-gi-cairo python3-dev ocl-icd-opencl-dev libwayland-egl1 libglib2.0-dev && \ rm -rf /var/lib/apt/lists/* COPY --from=build /opt/dist / diff --git a/VCAC-A/ubuntu-20.04/analytics/gst/Dockerfile b/VCAC-A/ubuntu-20.04/analytics/gst/Dockerfile index 40ad5b847..3de8805e8 100644 --- a/VCAC-A/ubuntu-20.04/analytics/gst/Dockerfile +++ b/VCAC-A/ubuntu-20.04/analytics/gst/Dockerfile @@ -704,7 +704,7 @@ WORKDIR /home RUN apt-get update && apt-get upgrade -y systemd RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - libnuma1 libdrm2 libx11-6 libxext6 libxfixes3 libwayland-client0 libpciaccess0 libusb-1.0-0-dev libboost-filesystem1.71.0 libboost-system1.71.0 libboost-program-options1.71.0 libjson-c4 libglib2.0-0 libxv1 libxt6 libasound2 libpangocairo-1.0-0 libcairo-gobject2 libtheora0 libvisual-0.4-0 libgl1-mesa-dri libgl1-mesa-glx libegl1-mesa libgdk-pixbuf2.0-0 libjpeg-turbo8 libpng16-16 zlib1g libsoup2.4-1 openssl libcurl3-gnutls librtmp1 mjpegtools libde265-0 libxcb-shape0 libxcb-xfixes0 libv4l-0 libass9 python3-numpy python3-gi python3-gi-cairo python3-dev ocl-icd-opencl-dev libwayland-egl1 libglib2.0-dev && \ + libnuma1 libdrm2 libx11-6 libxext6 libxfixes3 libwayland-client0 libpciaccess0 libusb-1.0-0-dev libboost-filesystem1.71.0 libboost-system1.71.0 libboost-program-options1.71.0 libjson-c4 libglib2.0-0 libxv1 libxt6 libasound2 libpangocairo-1.0-0 libcairo-gobject2 libtheora0 libvisual-0.4-0 libgl1-mesa-dri libgl1-mesa-glx libegl1-mesa libgdk-pixbuf2.0-0 libjpeg-turbo8 libpng16-16 zlib1g libsoup2.4-1 openssl libcurl3-gnutls librtmp1 mjpegtools libde265-0 libxcb-shape0 libxcb-xfixes0 libv4l-0 libass9 libgles2 python3-numpy python3-gi python3-gi-cairo python3-dev ocl-icd-opencl-dev libwayland-egl1 libglib2.0-dev && \ rm -rf /var/lib/apt/lists/* COPY --from=build /opt/dist / diff --git a/XeonE3/ubuntu-20.04/analytics/dev/Dockerfile b/XeonE3/ubuntu-20.04/analytics/dev/Dockerfile index 46d6a7e85..ac8db38cd 100644 --- a/XeonE3/ubuntu-20.04/analytics/dev/Dockerfile +++ b/XeonE3/ubuntu-20.04/analytics/dev/Dockerfile @@ -876,7 +876,7 @@ WORKDIR /home RUN apt-get update && apt-get upgrade -y systemd RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - libnuma1 libdrm2 libx11-6 libxext6 libxfixes3 libwayland-client0 libpciaccess0 libgtk-3-0 ocl-icd-libopencl1 libglib2.0-0 libxv1 libxt6 libasound2 libpangocairo-1.0-0 libcairo-gobject2 libtheora0 libvisual-0.4-0 libgl1-mesa-dri libgl1-mesa-glx libegl1-mesa libgdk-pixbuf2.0-0 libjpeg-turbo8 libpng16-16 zlib1g libsoup2.4-1 openssl libcurl3-gnutls librtmp1 mjpegtools libde265-0 libxcb-shape0 libxcb-xfixes0 libv4l-0 libass9 python3-gi python3-gi-cairo python3-dev python3-numpy libglib2.0-dev && \ + libnuma1 libdrm2 libx11-6 libxext6 libxfixes3 libwayland-client0 libpciaccess0 libgtk-3-0 ocl-icd-libopencl1 libglib2.0-0 libxv1 libxt6 libasound2 libpangocairo-1.0-0 libcairo-gobject2 libtheora0 libvisual-0.4-0 libgl1-mesa-dri libgl1-mesa-glx libegl1-mesa libgdk-pixbuf2.0-0 libjpeg-turbo8 libpng16-16 zlib1g libsoup2.4-1 openssl libcurl3-gnutls librtmp1 mjpegtools libde265-0 libxcb-shape0 libxcb-xfixes0 libv4l-0 libass9 libgles2 python3-gi python3-gi-cairo python3-dev python3-numpy libglib2.0-dev && \ rm -rf /var/lib/apt/lists/* COPY --from=build /opt/dist / diff --git a/XeonE3/ubuntu-20.04/analytics/gst/Dockerfile b/XeonE3/ubuntu-20.04/analytics/gst/Dockerfile index a7946e7bc..24c717bc7 100644 --- a/XeonE3/ubuntu-20.04/analytics/gst/Dockerfile +++ b/XeonE3/ubuntu-20.04/analytics/gst/Dockerfile @@ -855,7 +855,7 @@ WORKDIR /home RUN apt-get update && apt-get upgrade -y systemd RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - libnuma1 libdrm2 libx11-6 libxext6 libxfixes3 libwayland-client0 libpciaccess0 libgtk-3-0 ocl-icd-libopencl1 libglib2.0-0 libxv1 libxt6 libasound2 libpangocairo-1.0-0 libcairo-gobject2 libtheora0 libvisual-0.4-0 libgl1-mesa-dri libgl1-mesa-glx libegl1-mesa libgdk-pixbuf2.0-0 libjpeg-turbo8 libpng16-16 zlib1g libsoup2.4-1 openssl libcurl3-gnutls librtmp1 mjpegtools libde265-0 libxcb-shape0 libxcb-xfixes0 libv4l-0 libass9 python3-gi python3-gi-cairo python3-dev python3-numpy libglib2.0-dev && \ + libnuma1 libdrm2 libx11-6 libxext6 libxfixes3 libwayland-client0 libpciaccess0 libgtk-3-0 ocl-icd-libopencl1 libglib2.0-0 libxv1 libxt6 libasound2 libpangocairo-1.0-0 libcairo-gobject2 libtheora0 libvisual-0.4-0 libgl1-mesa-dri libgl1-mesa-glx libegl1-mesa libgdk-pixbuf2.0-0 libjpeg-turbo8 libpng16-16 zlib1g libsoup2.4-1 openssl libcurl3-gnutls librtmp1 mjpegtools libde265-0 libxcb-shape0 libxcb-xfixes0 libv4l-0 libass9 libgles2 python3-gi python3-gi-cairo python3-dev python3-numpy libglib2.0-dev && \ rm -rf /var/lib/apt/lists/* COPY --from=build /opt/dist / diff --git a/XeonE3/ubuntu-20.04/media/dev/Dockerfile b/XeonE3/ubuntu-20.04/media/dev/Dockerfile index 148cb2ed7..d4c627d3c 100644 --- a/XeonE3/ubuntu-20.04/media/dev/Dockerfile +++ b/XeonE3/ubuntu-20.04/media/dev/Dockerfile @@ -598,7 +598,7 @@ WORKDIR /home RUN apt-get update && apt-get upgrade -y systemd RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - libnuma1 libdrm2 libx11-6 libxext6 libxfixes3 libwayland-client0 libpciaccess0 libglib2.0-0 libxv1 libxt6 libasound2 libpangocairo-1.0-0 libcairo-gobject2 libtheora0 libvisual-0.4-0 libgl1-mesa-dri libgl1-mesa-glx libegl1-mesa libgdk-pixbuf2.0-0 libjpeg-turbo8 libpng16-16 zlib1g libsoup2.4-1 openssl libcurl3-gnutls librtmp1 mjpegtools libde265-0 libxcb-shape0 libxcb-xfixes0 libv4l-0 libass9 && \ + libnuma1 libdrm2 libx11-6 libxext6 libxfixes3 libwayland-client0 libpciaccess0 libglib2.0-0 libxv1 libxt6 libasound2 libpangocairo-1.0-0 libcairo-gobject2 libtheora0 libvisual-0.4-0 libgl1-mesa-dri libgl1-mesa-glx libegl1-mesa libgdk-pixbuf2.0-0 libjpeg-turbo8 libpng16-16 zlib1g libsoup2.4-1 openssl libcurl3-gnutls librtmp1 mjpegtools libde265-0 libxcb-shape0 libxcb-xfixes0 libv4l-0 libass9 libgles2 && \ rm -rf /var/lib/apt/lists/* COPY --from=build /opt/dist / diff --git a/XeonE3/ubuntu-20.04/media/gst/Dockerfile b/XeonE3/ubuntu-20.04/media/gst/Dockerfile index eef017cfb..093e6b8b7 100644 --- a/XeonE3/ubuntu-20.04/media/gst/Dockerfile +++ b/XeonE3/ubuntu-20.04/media/gst/Dockerfile @@ -560,7 +560,7 @@ WORKDIR /home RUN apt-get update && apt-get upgrade -y systemd RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - libnuma1 libdrm2 libx11-6 libxext6 libxfixes3 libwayland-client0 libpciaccess0 libglib2.0-0 libxv1 libxt6 libasound2 libpangocairo-1.0-0 libcairo-gobject2 libtheora0 libvisual-0.4-0 libgl1-mesa-dri libgl1-mesa-glx libegl1-mesa libgdk-pixbuf2.0-0 libjpeg-turbo8 libpng16-16 zlib1g libsoup2.4-1 openssl libcurl3-gnutls librtmp1 mjpegtools libde265-0 libxcb-shape0 libxcb-xfixes0 libv4l-0 libass9 && \ + libnuma1 libdrm2 libx11-6 libxext6 libxfixes3 libwayland-client0 libpciaccess0 libglib2.0-0 libxv1 libxt6 libasound2 libpangocairo-1.0-0 libcairo-gobject2 libtheora0 libvisual-0.4-0 libgl1-mesa-dri libgl1-mesa-glx libegl1-mesa libgdk-pixbuf2.0-0 libjpeg-turbo8 libpng16-16 zlib1g libsoup2.4-1 openssl libcurl3-gnutls librtmp1 mjpegtools libde265-0 libxcb-shape0 libxcb-xfixes0 libv4l-0 libass9 libgles2 && \ rm -rf /var/lib/apt/lists/* COPY --from=build /opt/dist / diff --git a/template/components/gst-vaapi.m4 b/template/components/gst-vaapi.m4 index 5e91fee39..5593fe5d6 100644 --- a/template/components/gst-vaapi.m4 +++ b/template/components/gst-vaapi.m4 @@ -35,7 +35,7 @@ include(gst-plugins-bad.m4) ifelse(OS_NAME,ubuntu,` define(`GSTVAAPI_BUILD_DEPS',`ca-certificates ifdef(`BUILD_MESON',,meson) tar g++ wget pkg-config libdrm-dev libglib2.0-dev libudev-dev flex bison ifdef(`ENABLE_INTEL_GFX_REPO',libva-dev)') -define(`GSTVAAPI_INSTALL_DEPS',`libdrm2 libglib2.0-0 libpciaccess0 libgl1-mesa-glx ifdef(`ENABLE_INTEL_GFX_REPO',libva2 libva-drm2 libva-x11-2 libva-wayland2)') +define(`GSTVAAPI_INSTALL_DEPS',`libdrm2 libglib2.0-0 libpciaccess0 libgl1-mesa-glx ifdef(`ENABLE_INTEL_GFX_REPO',libva2 libva-drm2 libva-x11-2 libva-wayland2)' ifelse(OS_NAME:OS_VERSION,ubuntu:20.04,libgles2)) ') ifelse(OS_NAME,centos,` From e9f8f97424098082382318997d9c7a97e7841bdb Mon Sep 17 00:00:00 2001 From: dpatel257 Date: Fri, 9 Jul 2021 01:03:47 -0700 Subject: [PATCH 12/13] [master] License Triggered changes from PDT feedback (#768) * Update Docker image README (#704) * update README * Update dockerfiles * ffmpeg/openssl/libvmaf license related changes * ffmpeg-nonfree change * restructure gpl flag * gpl changes for 264/265 properly * re-add the components needed for 264/265 building & test changes Co-authored-by: jhou5 --- SG1/centos-7/media/dev/Dockerfile | 80 ++-- SG1/centos-7/media/dev/Dockerfile.m4 | 4 +- SG1/centos-7/media/ffmpeg/Dockerfile | 16 +- SG1/centos-7/media/ffmpeg/Dockerfile.m4 | 1 - SG1/ubuntu-18.04/media/dev/Dockerfile | 94 ++-- SG1/ubuntu-18.04/media/dev/Dockerfile.m4 | 4 +- .../media/ffmpeg-vmaf/.dockerignore | 4 + .../media/ffmpeg-vmaf/CMakeLists.txt | 3 + SG1/ubuntu-18.04/media/ffmpeg-vmaf/Dockerfile | 440 ++++++++++++++++++ .../media/ffmpeg-vmaf/Dockerfile.m4 | 39 ++ SG1/ubuntu-18.04/media/ffmpeg-vmaf/README.md | 47 ++ SG1/ubuntu-18.04/media/ffmpeg-vmaf/build.sh | 6 + SG1/ubuntu-18.04/media/ffmpeg-vmaf/shell.sh | 6 + SG1/ubuntu-18.04/media/ffmpeg/Dockerfile | 19 +- SG1/ubuntu-18.04/media/ffmpeg/Dockerfile.m4 | 1 - SG1/ubuntu-20.04/media/dev/Dockerfile | 92 ++-- SG1/ubuntu-20.04/media/dev/Dockerfile.m4 | 4 +- SG1/ubuntu-20.04/media/ffmpeg/Dockerfile | 19 +- SG1/ubuntu-20.04/media/ffmpeg/Dockerfile.m4 | 1 - VCAC-A/ubuntu-18.04/analytics/dev/Dockerfile | 77 ++- .../ubuntu-18.04/analytics/dev/Dockerfile.m4 | 3 +- .../ubuntu-18.04/analytics/ffmpeg/Dockerfile | 2 +- VCAC-A/ubuntu-18.04/analytics/gst/Dockerfile | 2 +- VCAC-A/ubuntu-20.04/analytics/dev/Dockerfile | 77 ++- .../ubuntu-20.04/analytics/dev/Dockerfile.m4 | 3 +- .../ubuntu-20.04/analytics/ffmpeg/Dockerfile | 2 +- VCAC-A/ubuntu-20.04/analytics/gst/Dockerfile | 2 +- Xeon/centos-7/analytics/dev/Dockerfile | 69 ++- Xeon/centos-7/analytics/dev/Dockerfile.m4 | 3 +- Xeon/centos-7/analytics/ffmpeg/Dockerfile | 2 +- Xeon/centos-7/analytics/gst/Dockerfile | 2 +- Xeon/centos-7/media/dev/Dockerfile | 83 ++-- Xeon/centos-7/media/dev/Dockerfile.m4 | 4 +- Xeon/centos-7/media/ffmpeg/Dockerfile | 16 +- Xeon/centos-7/media/ffmpeg/Dockerfile.m4 | 1 - Xeon/centos-7/media/gst/Dockerfile | 2 +- Xeon/centos-7/service/owt-dev/Dockerfile | 2 +- Xeon/centos-7/service/owt-dev/Dockerfile.m4 | 1 + Xeon/centos-7/service/owt/Dockerfile | 2 +- Xeon/centos-7/service/owt/Dockerfile.m4 | 1 + Xeon/centos-7/service/owt360/Dockerfile | 2 +- Xeon/centos-7/service/owt360/Dockerfile.m4 | 1 + Xeon/ubuntu-18.04/analytics/dev/Dockerfile | 92 ++-- Xeon/ubuntu-18.04/analytics/dev/Dockerfile.m4 | 3 +- Xeon/ubuntu-18.04/analytics/ffmpeg/Dockerfile | 2 +- Xeon/ubuntu-18.04/analytics/gst/Dockerfile | 2 +- Xeon/ubuntu-18.04/media/dev/Dockerfile | 97 ++-- Xeon/ubuntu-18.04/media/dev/Dockerfile.m4 | 4 +- .../media/ffmpeg-vmaf/.dockerignore | 4 + .../media/ffmpeg-vmaf/CMakeLists.txt | 3 + .../ubuntu-18.04/media/ffmpeg-vmaf/Dockerfile | 365 +++++++++++++++ .../media/ffmpeg-vmaf/Dockerfile.m4 | 34 ++ Xeon/ubuntu-18.04/media/ffmpeg-vmaf/README.md | 43 ++ Xeon/ubuntu-18.04/media/ffmpeg-vmaf/build.sh | 6 + Xeon/ubuntu-18.04/media/ffmpeg-vmaf/shell.sh | 6 + Xeon/ubuntu-18.04/media/ffmpeg/Dockerfile | 19 +- Xeon/ubuntu-18.04/media/ffmpeg/Dockerfile.m4 | 1 - Xeon/ubuntu-18.04/media/gst/Dockerfile | 2 +- Xeon/ubuntu-18.04/service/owt-dev/Dockerfile | 2 +- .../service/owt-dev/Dockerfile.m4 | 1 + Xeon/ubuntu-18.04/service/owt/Dockerfile | 2 +- Xeon/ubuntu-18.04/service/owt/Dockerfile.m4 | 1 + Xeon/ubuntu-18.04/service/owt360/Dockerfile | 2 +- .../ubuntu-18.04/service/owt360/Dockerfile.m4 | 1 + Xeon/ubuntu-20.04/analytics/dev/Dockerfile | 92 ++-- Xeon/ubuntu-20.04/analytics/dev/Dockerfile.m4 | 3 +- Xeon/ubuntu-20.04/analytics/ffmpeg/Dockerfile | 2 +- Xeon/ubuntu-20.04/analytics/gst/Dockerfile | 2 +- Xeon/ubuntu-20.04/media/dev/Dockerfile | 97 ++-- Xeon/ubuntu-20.04/media/dev/Dockerfile.m4 | 4 +- Xeon/ubuntu-20.04/media/ffmpeg/Dockerfile | 19 +- Xeon/ubuntu-20.04/media/ffmpeg/Dockerfile.m4 | 1 - Xeon/ubuntu-20.04/media/gst/Dockerfile | 2 +- XeonE3/centos-7/analytics/dev/Dockerfile | 70 ++- XeonE3/centos-7/analytics/dev/Dockerfile.m4 | 3 +- XeonE3/centos-7/analytics/ffmpeg/Dockerfile | 2 +- XeonE3/centos-7/analytics/gst/Dockerfile | 2 +- XeonE3/centos-7/media/dev/Dockerfile | 84 ++-- XeonE3/centos-7/media/dev/Dockerfile.m4 | 4 +- XeonE3/centos-7/media/ffmpeg/Dockerfile | 16 +- XeonE3/centos-7/media/ffmpeg/Dockerfile.m4 | 1 - XeonE3/centos-7/media/gst/Dockerfile | 2 +- XeonE3/centos-7/service/owt-dev/Dockerfile | 2 +- XeonE3/centos-7/service/owt-dev/Dockerfile.m4 | 1 + XeonE3/centos-7/service/owt/Dockerfile | 2 +- XeonE3/centos-7/service/owt/Dockerfile.m4 | 1 + XeonE3/centos-7/service/owt360/Dockerfile | 2 +- XeonE3/centos-7/service/owt360/Dockerfile.m4 | 1 + XeonE3/ubuntu-18.04/analytics/dev/Dockerfile | 93 ++-- .../ubuntu-18.04/analytics/dev/Dockerfile.m4 | 3 +- .../ubuntu-18.04/analytics/ffmpeg/Dockerfile | 2 +- XeonE3/ubuntu-18.04/analytics/gst/Dockerfile | 2 +- XeonE3/ubuntu-18.04/media/dev/Dockerfile | 98 ++-- XeonE3/ubuntu-18.04/media/dev/Dockerfile.m4 | 4 +- .../media/ffmpeg-vmaf/.dockerignore | 4 + .../media/ffmpeg-vmaf/CMakeLists.txt | 3 + .../ubuntu-18.04/media/ffmpeg-vmaf/Dockerfile | 440 ++++++++++++++++++ .../media/ffmpeg-vmaf/Dockerfile.m4 | 39 ++ .../ubuntu-18.04/media/ffmpeg-vmaf/README.md | 47 ++ .../ubuntu-18.04/media/ffmpeg-vmaf/build.sh | 6 + .../ubuntu-18.04/media/ffmpeg-vmaf/shell.sh | 6 + XeonE3/ubuntu-18.04/media/ffmpeg/Dockerfile | 19 +- .../ubuntu-18.04/media/ffmpeg/Dockerfile.m4 | 1 - XeonE3/ubuntu-18.04/media/gst/Dockerfile | 2 +- .../ubuntu-18.04/service/owt-dev/Dockerfile | 2 +- .../service/owt-dev/Dockerfile.m4 | 1 + XeonE3/ubuntu-18.04/service/owt/Dockerfile | 2 +- XeonE3/ubuntu-18.04/service/owt/Dockerfile.m4 | 1 + XeonE3/ubuntu-18.04/service/owt360/Dockerfile | 2 +- .../ubuntu-18.04/service/owt360/Dockerfile.m4 | 1 + XeonE3/ubuntu-20.04/analytics/dev/Dockerfile | 93 ++-- .../ubuntu-20.04/analytics/dev/Dockerfile.m4 | 3 +- .../ubuntu-20.04/analytics/ffmpeg/Dockerfile | 2 +- XeonE3/ubuntu-20.04/analytics/gst/Dockerfile | 2 +- XeonE3/ubuntu-20.04/media/dev/Dockerfile | 93 ++-- XeonE3/ubuntu-20.04/media/dev/Dockerfile.m4 | 3 +- XeonE3/ubuntu-20.04/media/ffmpeg/Dockerfile | 19 +- .../ubuntu-20.04/media/ffmpeg/Dockerfile.m4 | 1 - XeonE3/ubuntu-20.04/media/gst/Dockerfile | 2 +- script/dldt-gst-tests.cmake | 1 + script/ffmpeg-tests.cmake | 2 + script/gst-tests.cmake | 2 + template/components/ffmpeg.m4 | 20 +- template/components/gst-plugins-bad.m4 | 11 +- template/components/gst-plugins-ugly.m4 | 10 +- 125 files changed, 2235 insertions(+), 1153 deletions(-) create mode 100644 SG1/ubuntu-18.04/media/ffmpeg-vmaf/.dockerignore create mode 100644 SG1/ubuntu-18.04/media/ffmpeg-vmaf/CMakeLists.txt create mode 100644 SG1/ubuntu-18.04/media/ffmpeg-vmaf/Dockerfile create mode 100644 SG1/ubuntu-18.04/media/ffmpeg-vmaf/Dockerfile.m4 create mode 100644 SG1/ubuntu-18.04/media/ffmpeg-vmaf/README.md create mode 100755 SG1/ubuntu-18.04/media/ffmpeg-vmaf/build.sh create mode 100755 SG1/ubuntu-18.04/media/ffmpeg-vmaf/shell.sh create mode 100644 Xeon/ubuntu-18.04/media/ffmpeg-vmaf/.dockerignore create mode 100644 Xeon/ubuntu-18.04/media/ffmpeg-vmaf/CMakeLists.txt create mode 100644 Xeon/ubuntu-18.04/media/ffmpeg-vmaf/Dockerfile create mode 100644 Xeon/ubuntu-18.04/media/ffmpeg-vmaf/Dockerfile.m4 create mode 100644 Xeon/ubuntu-18.04/media/ffmpeg-vmaf/README.md create mode 100755 Xeon/ubuntu-18.04/media/ffmpeg-vmaf/build.sh create mode 100755 Xeon/ubuntu-18.04/media/ffmpeg-vmaf/shell.sh create mode 100644 XeonE3/ubuntu-18.04/media/ffmpeg-vmaf/.dockerignore create mode 100644 XeonE3/ubuntu-18.04/media/ffmpeg-vmaf/CMakeLists.txt create mode 100644 XeonE3/ubuntu-18.04/media/ffmpeg-vmaf/Dockerfile create mode 100644 XeonE3/ubuntu-18.04/media/ffmpeg-vmaf/Dockerfile.m4 create mode 100644 XeonE3/ubuntu-18.04/media/ffmpeg-vmaf/README.md create mode 100755 XeonE3/ubuntu-18.04/media/ffmpeg-vmaf/build.sh create mode 100755 XeonE3/ubuntu-18.04/media/ffmpeg-vmaf/shell.sh diff --git a/SG1/centos-7/media/dev/Dockerfile b/SG1/centos-7/media/dev/Dockerfile index 566309fcf..9ac5860c4 100644 --- a/SG1/centos-7/media/dev/Dockerfile +++ b/SG1/centos-7/media/dev/Dockerfile @@ -80,6 +80,21 @@ RUN cd /opt/build && \ make install DESTDIR=/opt/dist && \ make install +RUN yum install -y wget tar gcc-c++ make libtool autoconf + +# build openssl +ARG OPENSSL_REPO=https://github.com/openssl/openssl/archive/OpenSSL_1_1_1k.tar.gz +RUN cd /opt/build && \ + wget -O - ${OPENSSL_REPO} | tar xz && \ + cd openssl-OpenSSL_1_1_1k && \ + ./config no-ssl3 shared --prefix=/usr/local/ssl --openssldir=/usr/local/ssl -fPIC -Wl,-rpath=/usr/local/ssl/lib && \ + make depend && \ + make -s V=0 && \ + make install DESTDIR=/opt/dist && \ + (cd /opt/dist && mkdir -p ./usr/local/lib64/pkgconfig && mv ./usr/local/ssl/lib/pkgconfig/*.pc ./usr/local/lib64/pkgconfig/) && \ + make install && \ + (mkdir -p /usr/local/lib64/pkgconfig && mv /usr/local/ssl/lib/pkgconfig/*.pc /usr/local/lib64/pkgconfig/) + RUN yum install -y wget gcc-c++ autoconf libtool make automake # build libfdkaac @@ -141,18 +156,17 @@ RUN cd /opt/build && \ make install DESTDIR=/opt/dist && \ make install -RUN yum install -y git make autoconf diffutils +RUN yum install -y meson wget tar gcc-c++ -# build libx264 -ARG LIBX264_REPO=https://github.com/mirror/x264 +# build dav1d +ARG DAV1D_REPO=https://code.videolan.org/videolan/dav1d/-/archive/0.9.0/dav1d-0.9.0.tar.gz RUN cd /opt/build && \ - git clone ${LIBX264_REPO} -b stable --depth 1 && \ - cd x264 && \ - ./configure --prefix=/usr/local --libdir=/usr/local/lib64 \ - --enable-shared && \ - make -j$(nproc) && \ - make install DESTDIR=/opt/dist && \ - make install + wget -O - ${DAV1D_REPO} | tar xz +RUN cd /opt/build/dav1d-0.9.0 && \ + meson build --prefix=/usr/local --libdir /usr/local/lib64 --buildtype=plain && \ + cd build && \ + ninja install && \ + DESTDIR=/opt/dist ninja install RUN yum install -y wget tar gcc-c++ make @@ -167,44 +181,6 @@ RUN cd /opt/build/yasm-1.3.0 && \ make -j $(nproc) && \ make install -RUN yum install -y make numactl-devel libpciaccess-devel - -# build libx265 -ARG LIBX265_REPO=https://github.com/videolan/x265/archive/3.4.tar.gz -RUN cd /opt/build && \ - wget -O - ${LIBX265_REPO} | tar xz && \ - cd x265-3.4/build/linux && \ - cmake -DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX=/usr/local -DLIB_INSTALL_DIR=/usr/local/lib64 ../../source && \ - make -j$(nproc) && \ - make install DESTDIR=/opt/dist && \ - make install - -RUN yum install -y meson wget tar gcc-c++ - -# build dav1d -ARG DAV1D_REPO=https://code.videolan.org/videolan/dav1d/-/archive/0.9.0/dav1d-0.9.0.tar.gz -RUN cd /opt/build && \ - wget -O - ${DAV1D_REPO} | tar xz -RUN cd /opt/build/dav1d-0.9.0 && \ - meson build --prefix=/usr/local --libdir /usr/local/lib64 --buildtype=plain && \ - cd build && \ - ninja install && \ - DESTDIR=/opt/dist ninja install - -RUN yum install -y meson wget tar gcc-c++ ninja-build devtoolset-9 - -# build VMAF -ARG VMAF_VER=2.1.1 -ARG LIBVMAF_REPO=https://github.com/Netflix/vmaf/archive/refs/tags/v${VMAF_VER}.tar.gz -RUN cd /opt/build && \ - wget -O - ${LIBVMAF_REPO} | tar xz && ls -RUN cd /opt/build/vmaf-2.1.1/libvmaf && \ - ls && \ - (. /opt/rh/devtoolset-9/enable && meson build --prefix=/usr/local --libdir /usr/local/lib64 --buildtype=plain && \ - cd build && \ - ninja install && \ - DESTDIR=/opt/dist ninja install ) - RUN yum install -y wget tar gcc-c++ make git # build svt-hevc @@ -323,7 +299,8 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib64 --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-gpl --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libx264 --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libvmaf --enable-version3 --enable-libdav1d && make -j$(nproc) && \ + --extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-openssl --extra-ldflags=-Wldnl + --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libdav1d && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install @@ -333,6 +310,9 @@ RUN rm -rf /opt/dist/usr/local/include && \ find /opt/dist -name "*.a" -exec rm -f {} \; || echo "" RUN rm -rf /opt/dist/usr/local/share/doc /opt/dist/usr/local/share/gtk-doc RUN rm -rf /opt/dist/usr/local/share/man +RUN rm -rf /opt/dist/usr/local/ssl/include +RUN rm -rf /opt/dist/usr/local/ssl/share/man +RUN rm -rf /opt/dist/usr/local/ssl/share/doc FROM centos:7 LABEL Description="This is the image for FFMPEG and Gstreamer application for media development on centos 7" @@ -343,7 +323,7 @@ RUN yum install -y -q epel-release && rm -rf /var/yum/cache/* # Install -RUN yum install -y bash numactl-libs libpciaccess libdrm libX11 libXfixes libXext libwayland-client libv4l libass +RUN yum install -y bash libdrm libX11 libXfixes libXext libwayland-client libv4l libass COPY --from=build /opt/dist / RUN echo "/usr/local/lib64" >> /etc/ld.so.conf.d/all-libs.conf && ldconfig diff --git a/SG1/centos-7/media/dev/Dockerfile.m4 b/SG1/centos-7/media/dev/Dockerfile.m4 index 2d3326506..a555c3899 100644 --- a/SG1/centos-7/media/dev/Dockerfile.m4 +++ b/SG1/centos-7/media/dev/Dockerfile.m4 @@ -4,14 +4,12 @@ include(centos-repo.m4) include(cmake.m4) include(libogg.m4) include(libvorbis.m4) +include(openssl.m4) ifelse(defn(`BUILD_FDKAAC'),`ON',`include(libfdk-aac.m4)') include(libopus.m4) include(libvpx.m4) include(libaom.m4) -include(libx264.m4) -include(libx265.m4) include(dav1d.m4) -include(libvmaf.m4) include(svt-hevc.m4) include(svt-av1.m4) include(svt-vp9.m4) diff --git a/SG1/centos-7/media/ffmpeg/Dockerfile b/SG1/centos-7/media/ffmpeg/Dockerfile index a5c645314..bd20f9c40 100644 --- a/SG1/centos-7/media/ffmpeg/Dockerfile +++ b/SG1/centos-7/media/ffmpeg/Dockerfile @@ -179,20 +179,6 @@ RUN cd /opt/build/dav1d-0.9.0 && \ ninja install && \ DESTDIR=/opt/dist ninja install -RUN yum install -y meson wget tar gcc-c++ ninja-build devtoolset-9 - -# build VMAF -ARG VMAF_VER=2.1.1 -ARG LIBVMAF_REPO=https://github.com/Netflix/vmaf/archive/refs/tags/v${VMAF_VER}.tar.gz -RUN cd /opt/build && \ - wget -O - ${LIBVMAF_REPO} | tar xz && ls -RUN cd /opt/build/vmaf-2.1.1/libvmaf && \ - ls && \ - (. /opt/rh/devtoolset-9/enable && meson build --prefix=/usr/local --libdir /usr/local/lib64 --buildtype=plain && \ - cd build && \ - ninja install && \ - DESTDIR=/opt/dist ninja install ) - RUN yum install -y wget tar gcc-c++ make git # build svt-hevc @@ -333,7 +319,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib64 --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-gpl --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libx264 --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libvmaf --enable-version3 --enable-libdav1d && make -j$(nproc) && \ + --extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 -rpath=/usr/local/ssl/lib --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libdav1d && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install diff --git a/SG1/centos-7/media/ffmpeg/Dockerfile.m4 b/SG1/centos-7/media/ffmpeg/Dockerfile.m4 index f09eaffbc..677726fc8 100644 --- a/SG1/centos-7/media/ffmpeg/Dockerfile.m4 +++ b/SG1/centos-7/media/ffmpeg/Dockerfile.m4 @@ -10,7 +10,6 @@ include(libvpx.m4) include(libx264.m4) include(libx265.m4) include(dav1d.m4) -include(libvmaf.m4) include(svt-hevc.m4) include(svt-av1.m4) include(svt-vp9.m4) diff --git a/SG1/ubuntu-18.04/media/dev/Dockerfile b/SG1/ubuntu-18.04/media/dev/Dockerfile index 88d16f632..abfa58e46 100644 --- a/SG1/ubuntu-18.04/media/dev/Dockerfile +++ b/SG1/ubuntu-18.04/media/dev/Dockerfile @@ -72,6 +72,24 @@ RUN cd /opt/build && \ make install DESTDIR=/opt/dist && \ make install +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + ca-certificates wget tar g++ make libtool autoconf && \ + rm -rf /var/lib/apt/lists/* + +# build openssl +ARG OPENSSL_REPO=https://github.com/openssl/openssl/archive/OpenSSL_1_1_1k.tar.gz +RUN cd /opt/build && \ + wget -O - ${OPENSSL_REPO} | tar xz && \ + cd openssl-OpenSSL_1_1_1k && \ + ./config no-ssl3 shared --prefix=/usr/local/ssl --openssldir=/usr/local/ssl -fPIC -Wl,-rpath=/usr/local/ssl/lib && \ + make depend && \ + make -s V=0 && \ + make install DESTDIR=/opt/dist && \ + (cd /opt/dist && mkdir -p ./usr/local/lib/pkgconfig && mv ./usr/local/ssl/lib/pkgconfig/*.pc ./usr/local/lib/pkgconfig/) && \ + make install && \ + (mkdir -p /usr/local/lib/pkgconfig && mv /usr/local/ssl/lib/pkgconfig/*.pc /usr/local/lib/pkgconfig/) + RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ ca-certificates wget g++ autoconf libtool autotools-dev automake make && \ @@ -148,53 +166,6 @@ RUN cd /opt/build && \ make install DESTDIR=/opt/dist && \ make install -RUN apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - git cmake make autoconf && \ - rm -rf /var/lib/apt/lists/* - -# build libx264 -ARG LIBX264_REPO=https://github.com/mirror/x264 -RUN cd /opt/build && \ - git clone ${LIBX264_REPO} -b stable --depth 1 && \ - cd x264 && \ - ./configure --prefix=/usr/local --libdir=/usr/local/lib \ - --enable-shared && \ - make -j$(nproc) && \ - make install DESTDIR=/opt/dist && \ - make install - -RUN apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates wget tar g++ make && \ - rm -rf /var/lib/apt/lists/* - -# build yasm -ARG YASM_REPO=https://www.tortall.net/projects/yasm/releases/yasm-1.3.0.tar.gz -RUN cd /opt/build && \ - wget -O - ${YASM_REPO} | tar xz -RUN cd /opt/build/yasm-1.3.0 && \ - # TODO remove the line below whether no other component inside this project requires it. - # `sed -i "s/) ytasm.*/)/" Makefile.in' && \ - ./configure --prefix=/usr/local --libdir=/usr/local/lib && \ - make -j $(nproc) && \ - make install - -RUN apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - libnuma-dev cmake make && \ - rm -rf /var/lib/apt/lists/* - -# build libx265 -ARG LIBX265_REPO=https://github.com/videolan/x265/archive/3.4.tar.gz -RUN cd /opt/build && \ - wget -O - ${LIBX265_REPO} | tar xz && \ - cd x265-3.4/build/linux && \ - cmake -DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX=/usr/local -DLIB_INSTALL_DIR=/usr/local/lib ../../source && \ - make -j$(nproc) && \ - make install DESTDIR=/opt/dist && \ - make install - RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ python3-pip ninja-build python3-setuptools && \ @@ -224,20 +195,19 @@ RUN cd /opt/build/dav1d-0.9.0 && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates tar g++ wget pkg-config ninja-build && \ + ca-certificates wget tar g++ make && \ rm -rf /var/lib/apt/lists/* -# build VMAF -ARG VMAF_VER=2.1.1 -ARG LIBVMAF_REPO=https://github.com/Netflix/vmaf/archive/refs/tags/v${VMAF_VER}.tar.gz +# build yasm +ARG YASM_REPO=https://www.tortall.net/projects/yasm/releases/yasm-1.3.0.tar.gz RUN cd /opt/build && \ - wget -O - ${LIBVMAF_REPO} | tar xz && ls -RUN cd /opt/build/vmaf-2.1.1/libvmaf && \ - ls && \ - meson build --prefix=/usr/local --libdir /usr/local/lib --buildtype=plain && \ - cd build && \ - ninja install && \ - DESTDIR=/opt/dist ninja install + wget -O - ${YASM_REPO} | tar xz +RUN cd /opt/build/yasm-1.3.0 && \ + # TODO remove the line below whether no other component inside this project requires it. + # `sed -i "s/) ytasm.*/)/" Makefile.in' && \ + ./configure --prefix=/usr/local --libdir=/usr/local/lib && \ + make -j $(nproc) && \ + make install RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ @@ -381,7 +351,8 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-gpl --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libx264 --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libvmaf --enable-version3 --enable-libdav1d && make -j$(nproc) && \ + --extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-openssl --extra-ldflags=-Wldnl + --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libdav1d && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install @@ -391,6 +362,9 @@ RUN rm -rf /opt/dist/usr/local/include && \ find /opt/dist -name "*.a" -exec rm -f {} \; || echo "" RUN rm -rf /opt/dist/usr/local/share/doc /opt/dist/usr/local/share/gtk-doc RUN rm -rf /opt/dist/usr/local/share/man +RUN rm -rf /opt/dist/usr/local/ssl/include +RUN rm -rf /opt/dist/usr/local/ssl/share/man +RUN rm -rf /opt/dist/usr/local/ssl/share/doc FROM ubuntu:18.04 LABEL Description="This is the base image for Gstreamer ubuntu 18.04" @@ -401,7 +375,7 @@ WORKDIR /home RUN apt-get update && apt-get upgrade -y systemd RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - libnuma1 libdrm2 libx11-6 libxext6 libxfixes3 libwayland-client0 libpciaccess0 libxcb-shape0 libxcb-xfixes0 libv4l-0 libass9 && \ + libdrm2 libx11-6 libxext6 libxfixes3 libwayland-client0 libpciaccess0 libxcb-shape0 libxcb-xfixes0 libv4l-0 libass9 && \ rm -rf /var/lib/apt/lists/* COPY --from=build /opt/dist / diff --git a/SG1/ubuntu-18.04/media/dev/Dockerfile.m4 b/SG1/ubuntu-18.04/media/dev/Dockerfile.m4 index b7043c1f4..adb6c5101 100644 --- a/SG1/ubuntu-18.04/media/dev/Dockerfile.m4 +++ b/SG1/ubuntu-18.04/media/dev/Dockerfile.m4 @@ -3,15 +3,13 @@ include(begin.m4) include(ubuntu.m4) include(libogg.m4) include(libvorbis.m4) +include(openssl.m4) ifelse(defn(`BUILD_FDKAAC'),`ON',`include(libfdk-aac.m4)') include(libopus.m4) include(libvpx.m4) include(libaom.m4) -include(libx264.m4) -include(libx265.m4) include(meson.m4) include(dav1d.m4) -include(libvmaf.m4) include(svt-hevc.m4) include(svt-av1.m4) include(svt-vp9.m4) diff --git a/SG1/ubuntu-18.04/media/ffmpeg-vmaf/.dockerignore b/SG1/ubuntu-18.04/media/ffmpeg-vmaf/.dockerignore new file mode 100644 index 000000000..1cb8a04d9 --- /dev/null +++ b/SG1/ubuntu-18.04/media/ffmpeg-vmaf/.dockerignore @@ -0,0 +1,4 @@ +CMakeLists.txt +*.sh +*.m4 +test/* diff --git a/SG1/ubuntu-18.04/media/ffmpeg-vmaf/CMakeLists.txt b/SG1/ubuntu-18.04/media/ffmpeg-vmaf/CMakeLists.txt new file mode 100644 index 000000000..2814d364b --- /dev/null +++ b/SG1/ubuntu-18.04/media/ffmpeg-vmaf/CMakeLists.txt @@ -0,0 +1,3 @@ +set(image "sg1_ffmpeg_vmaf_ubuntu1804") +include(image) +include(ffmpeg-tests) diff --git a/SG1/ubuntu-18.04/media/ffmpeg-vmaf/Dockerfile b/SG1/ubuntu-18.04/media/ffmpeg-vmaf/Dockerfile new file mode 100644 index 000000000..304979f2f --- /dev/null +++ b/SG1/ubuntu-18.04/media/ffmpeg-vmaf/Dockerfile @@ -0,0 +1,440 @@ + + +# BSD 3-Clause License +# +# Copyright (c) 2021, Intel Corporation +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are met: +# +# * Redistributions of source code must retain the above copyright notice, this +# list of conditions and the following disclaimer. +# +# * Redistributions in binary form must reproduce the above copyright notice, +# this list of conditions and the following disclaimer in the documentation +# and/or other materials provided with the distribution. +# +# * Neither the name of the copyright holder nor the names of its +# contributors may be used to endorse or promote products derived from +# this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +# This file is automatically generated from .m4 template. +# To update, modify the template and regenerate. +FROM ubuntu:18.04 AS build + + +RUN mkdir -p /opt/build && mkdir -p /opt/dist + +ENV PKG_CONFIG_PATH=/usr/local/lib/pkgconfig + +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + ca-certificates wget make autoconf automake g++ && \ + rm -rf /var/lib/apt/lists/* + +# build libogg +ARG OGG_VER=1.3.5 +ARG LIBOGG_REPO=https://github.com/xiph/ogg/releases/download/v${OGG_VER}/libogg-1.3.5.tar.gz + +RUN cd /opt/build && \ + wget -O - ${LIBOGG_REPO} | tar xz && \ + cd libogg-1.3.5 && \ + ./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared && \ + make -j$(nproc) && \ + make install DESTDIR=/opt/dist && \ + make install + +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + ca-certificates wget make autoconf automake && \ + rm -rf /var/lib/apt/lists/* + +# build libvorbis +ARG VORBIS_VER=1.3.7 +ARG LIBVORBIS_REPO=https://github.com/xiph/vorbis/releases/download/v${VORBIS_VER}/libvorbis-1.3.7.tar.gz +RUN cd /opt/build && \ + wget -O - ${LIBVORBIS_REPO} | tar xz && \ + cd libvorbis-1.3.7 && \ + ./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared && \ + make -j$(nproc) && \ + make install DESTDIR=/opt/dist && \ + make install + +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + ca-certificates wget g++ autoconf libtool autotools-dev automake make && \ + rm -rf /var/lib/apt/lists/* + +# build libfdkaac +ARG LIBFDKAAC_REPO=https://github.com/mstorsjo/fdk-aac/archive/v2.0.2.tar.gz +RUN cd /opt/build && \ + wget -O - ${LIBFDKAAC_REPO} | tar xz && \ + cd fdk-aac-2.0.2 && \ + ./autogen.sh && \ + ./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared && \ + make -j$(nproc) && \ + make install DESTDIR=/opt/dist && \ + make install + +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + ca-certificates wget autoconf libtool make && \ + rm -rf /var/lib/apt/lists/* + +# build libopus +ARG LIBOPUS_REPO=https://archive.mozilla.org/pub/opus/opus-1.3.1.tar.gz +RUN cd /opt/build && \ + wget -O - ${LIBOPUS_REPO} | tar xz && \ + cd opus-1.3.1 && \ + ./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared && \ + make -j$(nproc) && \ + make install DESTDIR=/opt/dist && \ + make install + +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + ca-certificates wget tar g++ make bzip2 && \ + rm -rf /var/lib/apt/lists/* + +# build nasm +ARG NASM_REPO=https://www.nasm.us/pub/nasm/releasebuilds/2.15.05/nasm-2.15.05.tar.bz2 +RUN cd /opt/build && \ + wget -O - ${NASM_REPO} | tar xj && \ + cd nasm-2.15.05 && \ + ./autogen.sh && \ + ./configure --prefix=/usr/local --libdir=/usr/local/lib && \ + make -j$(nproc) && \ + make install + +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + git cmake make autoconf && \ + rm -rf /var/lib/apt/lists/* + +# build libvpx +ARG LIBVPX_REPO=https://chromium.googlesource.com/webm/libvpx.git +RUN cd /opt/build && \ + git clone ${LIBVPX_REPO} -b v1.10.0 --depth 1 && \ + cd libvpx && \ + ./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-examples --disable-unit-tests --enable-vp9-highbitdepth --as=nasm && \ + make -j$(nproc) && \ + make install DESTDIR=/opt/dist && \ + make install + +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + git cmake make autoconf && \ + rm -rf /var/lib/apt/lists/* + +# build libx264 +ARG LIBX264_REPO=https://github.com/mirror/x264 +RUN cd /opt/build && \ + git clone ${LIBX264_REPO} -b stable --depth 1 && \ + cd x264 && \ + ./configure --prefix=/usr/local --libdir=/usr/local/lib \ + --enable-shared && \ + make -j$(nproc) && \ + make install DESTDIR=/opt/dist && \ + make install + +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + ca-certificates wget tar g++ make && \ + rm -rf /var/lib/apt/lists/* + +# build yasm +ARG YASM_REPO=https://www.tortall.net/projects/yasm/releases/yasm-1.3.0.tar.gz +RUN cd /opt/build && \ + wget -O - ${YASM_REPO} | tar xz +RUN cd /opt/build/yasm-1.3.0 && \ + # TODO remove the line below whether no other component inside this project requires it. + # `sed -i "s/) ytasm.*/)/" Makefile.in' && \ + ./configure --prefix=/usr/local --libdir=/usr/local/lib && \ + make -j $(nproc) && \ + make install + +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + libnuma-dev cmake make && \ + rm -rf /var/lib/apt/lists/* + +# build libx265 +ARG LIBX265_REPO=https://github.com/videolan/x265/archive/3.4.tar.gz +RUN cd /opt/build && \ + wget -O - ${LIBX265_REPO} | tar xz && \ + cd x265-3.4/build/linux && \ + cmake -DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX=/usr/local -DLIB_INSTALL_DIR=/usr/local/lib ../../source && \ + make -j$(nproc) && \ + make install DESTDIR=/opt/dist && \ + make install + +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + python3-pip ninja-build python3-setuptools && \ + rm -rf /var/lib/apt/lists/* + +# build meson +ARG MESON_REPO=https://github.com/mesonbuild/meson +RUN git clone ${MESON_REPO}; \ + cd meson; \ + git checkout 0.58.1; \ + python3 setup.py install; + +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + ca-certificates tar g++ wget pkg-config && \ + rm -rf /var/lib/apt/lists/* + +# build dav1d +ARG DAV1D_REPO=https://code.videolan.org/videolan/dav1d/-/archive/0.9.0/dav1d-0.9.0.tar.gz +RUN cd /opt/build && \ + wget -O - ${DAV1D_REPO} | tar xz +RUN cd /opt/build/dav1d-0.9.0 && \ + meson build --prefix=/usr/local --libdir /usr/local/lib --buildtype=plain && \ + cd build && \ + ninja install && \ + DESTDIR=/opt/dist ninja install + +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + ca-certificates tar g++ wget pkg-config ninja-build && \ + rm -rf /var/lib/apt/lists/* + +# build VMAF +ARG VMAF_VER=2.1.1 +ARG LIBVMAF_REPO=https://github.com/Netflix/vmaf/archive/refs/tags/v${VMAF_VER}.tar.gz +RUN cd /opt/build && \ + wget -O - ${LIBVMAF_REPO} | tar xz && ls +RUN cd /opt/build/vmaf-2.1.1/libvmaf && \ + ls && \ + meson build --prefix=/usr/local --libdir /usr/local/lib --buildtype=plain && \ + cd build && \ + ninja install && \ + DESTDIR=/opt/dist ninja install + +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + ca-certificates wget tar g++ make cmake git && \ + rm -rf /var/lib/apt/lists/* + +# build svt-hevc +ARG SVT_HEVC_REPO=https://github.com/OpenVisualCloud/SVT-HEVC +RUN cd /opt/build && \ + git clone -b v1.5.1 --depth 1 ${SVT_HEVC_REPO} +RUN cd /opt/build/SVT-HEVC/Build/linux && \ + cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_INSTALL_LIBDIR=/usr/local/lib -DCMAKE_ASM_NASM_COMPILER=yasm ../.. && \ + make -j $(nproc) && \ + make install DESTDIR=/opt/dist && \ + make install + +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + ca-certificates wget tar g++ make cmake git && \ + rm -rf /var/lib/apt/lists/* + +# build svt av1 +ARG SVT_AV1_REPO=https://gitlab.com/AOMediaCodec/SVT-AV1/-/archive/v0.8.7/SVT-AV1-v0.8.7.tar.gz +RUN cd /opt/build && \ + wget -O - ${SVT_AV1_REPO} | tar zx && \ + mv SVT-AV1-v0.8.7 SVT-AV1 && \ + cd SVT-AV1/Build/linux && \ + cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_INSTALL_LIBDIR=/usr/local/lib -DCMAKE_ASM_NASM_COMPILER=yasm ../.. && \ + make -j $(nproc) && \ + sed -i "s/SvtAv1dec/SvtAv1Dec/" SvtAv1Dec.pc && \ + make install DESTDIR=/opt/dist && \ + make install + +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + ca-certificates wget tar g++ make cmake git && \ + rm -rf /var/lib/apt/lists/* + +# build svt vp9 +ARG SVT_VP9_REPO=https://github.com/OpenVisualCloud/SVT-VP9 +RUN cd /opt/build && \ + git clone ${SVT_VP9_REPO} -b v0.2.2 --depth 1 && \ + cd SVT-VP9/Build/linux && \ + cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_INSTALL_LIBDIR=/usr/local/lib -DCMAKE_ASM_NASM_COMPILER=yasm ../.. && \ + make -j $(nproc) && \ + make install DESTDIR=/opt/dist && \ + make install + +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + ca-certificates cmake g++ make wget && \ + rm -rf /var/lib/apt/lists/* + +# build gmmlib +ARG GMMLIB_REPO=https://github.com/VCDP/gmmlib/archive/intel-media-sg1-pv1.3.tar.gz +RUN cd /opt/build && \ + wget -O - ${GMMLIB_REPO} | tar xz +RUN cd /opt/build/gmmlib-intel-media-sg1-pv1.3 && mkdir build && cd build && \ + cmake -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_INSTALL_LIBDIR=/usr/local/lib .. && \ + make -j$(nproc) && \ + make install DESTDIR=/opt/dist && \ + make install + +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + automake ca-certificates gcc libdrm-dev libtool make pkg-config wget libx11-dev libxext-dev libxfixes-dev libwayland-dev && \ + rm -rf /var/lib/apt/lists/* + +# build libva2 +ARG LIBVA2_REPO=https://github.com/VCDP/libva/archive/intel-media-sg1-pv1.3.tar.gz +RUN cd /opt/build && \ + wget -O - ${LIBVA2_REPO} | tar xz +RUN cd /opt/build/libva-intel-media-sg1-pv1.3 && \ + ./autogen.sh --prefix=/usr/local --libdir=/usr/local/lib && \ + make -j$(nproc) && \ + make install DESTDIR=/opt/dist && \ + make install + +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + ca-certificates cmake g++ libpciaccess-dev make pkg-config wget && \ + rm -rf /var/lib/apt/lists/* + +# build media driver +ARG MEDIA_DRIVER_REPO=https://github.com/VCDP/media-driver/archive/intel-media-sg1-pv1.3.tar.gz +RUN cd /opt/build && \ + wget -O - ${MEDIA_DRIVER_REPO} | tar xz +RUN cd /opt/build/media-driver-intel-media-sg1-pv1.3 && mkdir build && cd build && \ + cmake -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_INSTALL_LIBDIR=/usr/local/lib -DENABLE_PRODUCTION_KMD=ON .. && \ + make -j$(nproc) && \ + make install DESTDIR=/opt/dist && \ + make install + +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + ca-certificates gcc g++ make cmake pkg-config wget && \ + rm -rf /var/lib/apt/lists/* + +# build media sdk +ARG MSDK_REPO=https://github.com/VCDP/MediaSDK/archive/intel-media-sg1-pv1.3.tar.gz +RUN cd /opt/build && \ + wget -O - ${MSDK_REPO} | tar xz +RUN cd /opt/build/MediaSDK-intel-media-sg1-pv1.3 && \ + mkdir -p build && cd build && \ + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr/local \ + -DCMAKE_INSTALL_LIBDIR=/usr/local/lib \ + -DBUILD_SAMPLES=no \ + -DBUILD_TUTORIALS=OFF \ + .. && \ + make -j$(nproc) && \ + make install DESTDIR=/opt/dist && \ + make install + +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + ca-certificates cmake gcc g++ make wget python3-numpy ccache libeigen3-dev && \ + rm -rf /var/lib/apt/lists/* + +# build opencv +ARG OPENCV_REPO=https://github.com/opencv/opencv/archive/4.5.2.tar.gz +RUN cd /opt/build && \ + wget -O - ${OPENCV_REPO} | tar xz +# TODO: file a bug against opencv since they do not accept full libdir +RUN cd /opt/build/opencv-4.5.2 && mkdir build && cd build && \ + cmake \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr/local \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DOPENCV_GENERATE_PKGCONFIG=ON \ + -DBUILD_DOCS=OFF \ + -DBUILD_EXAMPLES=OFF \ + -DBUILD_PERF_TESTS=OFF \ + -DBUILD_TESTS=OFF \ + .. && \ + make -j $(nproc) && \ + make install DESTDIR=/opt/dist && \ + make install + +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + build-essential ca-certificates wget patch libv4l-dev libass-dev && \ + rm -rf /var/lib/apt/lists/* + +# build ffmpeg +ARG FFMPEG_REPO=https://github.com/FFmpeg/FFmpeg/archive/n4.4.tar.gz +RUN cd /opt/build && \ + wget -O - ${FFMPEG_REPO} | tar xz + +RUN cd /opt/build/FFmpeg-n4.4 && \ + patch -p1 < /opt/build/SVT-HEVC/ffmpeg_plugin/n4.4-0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch || true +#ifdef(`BUILD_SVT_VP9',`FFMPEG_PATCH_SVT_VP9(BUILD_HOME/FFmpeg-FFMPEG_VER)')dnl +#ifdef(`BUILD_DLDT',`FFMPEG_PATCH_ANALYTICS(BUILD_HOME/FFmpeg-FFMPEG_VER)')dnl +#ifdef(`BUILD_OPENVINO',`FFMPEG_PATCH_ANALYTICS(BUILD_HOME/FFmpeg-FFMPEG_VER)')dnl +ARG FFMPEG_PATCH_VAAPI_REPO=https://github.com/OpenVisualCloud/Dockerfiles-Resources/raw/master/ffmpeg-patch-0041-lavc-vaapi_encode_h265-fix-max_transform_hierarchy_d.tar.gz +RUN cd /opt/build && \ + wget -O - ${FFMPEG_PATCH_VAAPI_REPO} | tar xz && \ + cd /opt/build/FFmpeg-n4.4 && \ + patch -p1 < ../0041-lavc-vaapi_encode_h265-fix-max_transform_hierarchy_d.patch || true + + +ARG FFMPEG_1TN_PATCH_REPO=https://raw.githubusercontent.com/OpenVisualCloud/Dockerfiles-Resources/master/n4.4-enhance_1tn_performance.patch +RUN cd /opt/build/FFmpeg-n4.4 && \ + wget -O - ${FFMPEG_1TN_PATCH_REPO} | patch -p1; + +RUN cd /opt/build/FFmpeg-n4.4 && \ + ./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-static --disable-doc --disable-htmlpages \ + --disable-manpages --disable-podpages --disable-txtpages \ + --extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 -rpath=/usr/local/ssl/lib --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libvmaf --enable-version3 --enable-libdav1d && make -j$(nproc) && \ + make install DESTDIR=/opt/dist && \ + make install + +RUN cd /opt/build/opencv-4.5.2/build && \ + rm -rf ./* && \ + cmake \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr/local \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DOPENCV_GENERATE_PKGCONFIG=ON \ + -DBUILD_DOCS=OFF \ + -DBUILD_EXAMPLES=OFF \ + -DBUILD_PERF_TESTS=OFF \ + -DBUILD_TESTS=OFF \ + .. && \ + cd modules/videoio && \ + make -j $(nproc) && \ + cp -f ../../lib/libopencv_videoio.so.4.5.2 /opt/dist/usr/local/lib + +# cleanup +RUN rm -rf /opt/dist/usr/local/include && \ + rm -rf /opt/dist/usr/local/lib/pkgconfig && \ + find /opt/dist -name "*.a" -exec rm -f {} \; || echo "" +RUN rm -rf /opt/dist/usr/local/share/doc /opt/dist/usr/local/share/gtk-doc +RUN rm -rf /opt/dist/usr/local/share/man + +FROM ubuntu:18.04 +LABEL Description="This is the base image for FFMPEG ubuntu 18.04" +LABEL Vendor="Intel Corporation" +WORKDIR /home + +# Install +RUN apt-get update && apt-get upgrade -y systemd +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + libnuma1 libdrm2 libx11-6 libxext6 libxfixes3 libwayland-client0 libpciaccess0 libxcb-shape0 libxcb-xfixes0 libv4l-0 libass9 && \ + rm -rf /var/lib/apt/lists/* + +COPY --from=build /opt/dist / +RUN echo "/usr/local/lib" >> /etc/ld.so.conf.d/all-libs.conf && ldconfig + +ENV LIBVA_DRIVERS_PATH=/usr/local/lib/dri +ENV LIBVA_DRIVER_NAME=iHD +ENV DISPLAY=:0.0 + + diff --git a/SG1/ubuntu-18.04/media/ffmpeg-vmaf/Dockerfile.m4 b/SG1/ubuntu-18.04/media/ffmpeg-vmaf/Dockerfile.m4 new file mode 100644 index 000000000..73bcfa164 --- /dev/null +++ b/SG1/ubuntu-18.04/media/ffmpeg-vmaf/Dockerfile.m4 @@ -0,0 +1,39 @@ + +include(begin.m4) +include(ubuntu.m4) +include(libogg.m4) +include(libvorbis.m4) +ifelse(defn(`BUILD_FDKAAC'),`ON',`include(libfdk-aac.m4)') +include(libopus.m4) +include(libvpx.m4) +include(libx264.m4) +include(libx265.m4) +include(meson.m4) +include(dav1d.m4) +include(libvmaf.m4) +include(svt-hevc.m4) +include(svt-av1.m4) +include(svt-vp9.m4) +include(gmmlib.sg1.m4) +include(libva2.sg1.m4) +include(media-driver.sg1.m4) +include(msdk.sg1.m4) +include(opencv.m4) +include(ffmpeg.m4) +include(end.m4)dnl + +PREAMBLE +FROM OS_NAME:OS_VERSION AS build + +BUILD_ALL()dnl +CLEANUP()dnl + +FROM OS_NAME:OS_VERSION +LABEL Description="This is the base image for FFMPEG OS_NAME OS_VERSION" +LABEL Vendor="Intel Corporation" +WORKDIR /home + +# Install +UPGRADE_UBUNTU_COMPONENTS() +INSTALL_ALL(runtime,build) + diff --git a/SG1/ubuntu-18.04/media/ffmpeg-vmaf/README.md b/SG1/ubuntu-18.04/media/ffmpeg-vmaf/README.md new file mode 100644 index 000000000..dcece1967 --- /dev/null +++ b/SG1/ubuntu-18.04/media/ffmpeg-vmaf/README.md @@ -0,0 +1,47 @@ +This docker image is part of Open Visual Cloud software stacks. Optimized for the media creation and delivery use case. Included FFmpeg and codecs such as opus, ogg, vorbis, x264, x265, vp8/9, av1 and SVT-HEVC. Also included Intel hardware accelaration software stack such as media SDK, media driver, gmmlib and libva. The docker image can be used in the FROM field of a downstream Dockerfile. + +## Supported tags and respective Dockerfile links + - [sg1-ubuntu-1804-media-ffmpeg](https://github.com/OpenVisualCloud/Dockerfiles/blob/v21.3/SG1/ubuntu-18.04/media/ffmpeg/Dockerfile) + +## Quick reference +- #### Supported platform and OS + Intel® SG1 platform, Ubuntu 18.04 + +- #### Usage instructions: + [FFmpeg](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/doc/ffmpeg.md) + + +- #### Getting started with Dockerfiles: + [OpenVisualCloud Dockerfiles Wiki](https://github.com/OpenVisualCloud/Dockerfiles/wiki) + +- #### File issues: + [OpenVisualCloud Dockerfiles Issues](https://github.com/OpenVisualCloud/Dockerfiles/issues) + + +## License +This docker installs third party components licensed under various open source licenses. The terms under which those components may be used and distributed can be found with the license document that is provided with those components. Please familiarize yourself with those terms to ensure your distribution of those components complies with the terms of those licenses. + + +| Components | License | +| ----- | ----- | +|Ubuntu| [Various](https://hub.docker.com/_/ubuntu) | +|libogg|BSD 3-clause "New" or "Revised" License| +|libvorbis|BSD 3-clause "New" or "Revised" License| +|Opus Interactive Audio Codec|BSD 3-clause "New" or "Revised" License| +|libvpx|BSD 3-clause "New" or "Revised" License| +|x264|GNU General Public License v2.0 or later| +|x265|GNU General Public License v2.0 or later| +|dav1d|BSD 2-clause "Simplified" License| +|Intel SVT-HEVC|BSD-2-Clause Plus Patent License| +|Intel SVT-AV1|BSD-2-Clause Plus Patent License| +|Intel SVT-VP9|BSD-2-Clause Plus Patent License| +|Intel Graphics Memory Management Library| MIT License| +|Intel libva| MIT License +|Intel media driver | MIT License| +|Intel media SDK|MIT License| +|OpenCV|BSD 3-clause "New" or "Revised" License| +|FFmpeg|GNU Lesser General Public License v2.1 or later| + + +More license information can be found in [components source package](https://github.com/OpenVisualCloud/Dockerfiles-Resources). +As for any pre-built image usage, it is the image user's responsibility to ensure that any use of this image complies with any relevant licenses and potential fees for all software contained within. We will have no indemnity or warranty coverage from suppliers. diff --git a/SG1/ubuntu-18.04/media/ffmpeg-vmaf/build.sh b/SG1/ubuntu-18.04/media/ffmpeg-vmaf/build.sh new file mode 100755 index 000000000..00e25f35f --- /dev/null +++ b/SG1/ubuntu-18.04/media/ffmpeg-vmaf/build.sh @@ -0,0 +1,6 @@ +#!/bin/bash -e + +IMAGE="sg1-ubuntu1804-media-ffmpeg-vmaf" +DIR=$(dirname $(readlink -f "$0")) + +. "${DIR}/../../../../script/build.sh" diff --git a/SG1/ubuntu-18.04/media/ffmpeg-vmaf/shell.sh b/SG1/ubuntu-18.04/media/ffmpeg-vmaf/shell.sh new file mode 100755 index 000000000..b0554ef38 --- /dev/null +++ b/SG1/ubuntu-18.04/media/ffmpeg-vmaf/shell.sh @@ -0,0 +1,6 @@ +#!/bin/bash -e + +IMAGE="sg1-ubuntu1804-media-ffmpeg-vmaf" +DIR=$(dirname $(readlink -f "$0")) + +. "${DIR}/../../../../script/shell.sh" diff --git a/SG1/ubuntu-18.04/media/ffmpeg/Dockerfile b/SG1/ubuntu-18.04/media/ffmpeg/Dockerfile index 14d1a6abc..c6b95360d 100644 --- a/SG1/ubuntu-18.04/media/ffmpeg/Dockerfile +++ b/SG1/ubuntu-18.04/media/ffmpeg/Dockerfile @@ -207,23 +207,6 @@ RUN cd /opt/build/dav1d-0.9.0 && \ ninja install && \ DESTDIR=/opt/dist ninja install -RUN apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates tar g++ wget pkg-config ninja-build && \ - rm -rf /var/lib/apt/lists/* - -# build VMAF -ARG VMAF_VER=2.1.1 -ARG LIBVMAF_REPO=https://github.com/Netflix/vmaf/archive/refs/tags/v${VMAF_VER}.tar.gz -RUN cd /opt/build && \ - wget -O - ${LIBVMAF_REPO} | tar xz && ls -RUN cd /opt/build/vmaf-2.1.1/libvmaf && \ - ls && \ - meson build --prefix=/usr/local --libdir /usr/local/lib --buildtype=plain && \ - cd build && \ - ninja install && \ - DESTDIR=/opt/dist ninja install - RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ ca-certificates wget tar g++ make cmake git && \ @@ -391,7 +374,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-gpl --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libx264 --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libvmaf --enable-version3 --enable-libdav1d && make -j$(nproc) && \ + --extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 -rpath=/usr/local/ssl/lib --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libdav1d && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install diff --git a/SG1/ubuntu-18.04/media/ffmpeg/Dockerfile.m4 b/SG1/ubuntu-18.04/media/ffmpeg/Dockerfile.m4 index 73bcfa164..7fee61abc 100644 --- a/SG1/ubuntu-18.04/media/ffmpeg/Dockerfile.m4 +++ b/SG1/ubuntu-18.04/media/ffmpeg/Dockerfile.m4 @@ -10,7 +10,6 @@ include(libx264.m4) include(libx265.m4) include(meson.m4) include(dav1d.m4) -include(libvmaf.m4) include(svt-hevc.m4) include(svt-av1.m4) include(svt-vp9.m4) diff --git a/SG1/ubuntu-20.04/media/dev/Dockerfile b/SG1/ubuntu-20.04/media/dev/Dockerfile index ca2f23e1a..bef27d8da 100644 --- a/SG1/ubuntu-20.04/media/dev/Dockerfile +++ b/SG1/ubuntu-20.04/media/dev/Dockerfile @@ -72,6 +72,24 @@ RUN cd /opt/build && \ make install DESTDIR=/opt/dist && \ make install +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + ca-certificates wget tar g++ make libtool autoconf && \ + rm -rf /var/lib/apt/lists/* + +# build openssl +ARG OPENSSL_REPO=https://github.com/openssl/openssl/archive/OpenSSL_1_1_1k.tar.gz +RUN cd /opt/build && \ + wget -O - ${OPENSSL_REPO} | tar xz && \ + cd openssl-OpenSSL_1_1_1k && \ + ./config no-ssl3 shared --prefix=/usr/local/ssl --openssldir=/usr/local/ssl -fPIC -Wl,-rpath=/usr/local/ssl/lib && \ + make depend && \ + make -s V=0 && \ + make install DESTDIR=/opt/dist && \ + (cd /opt/dist && mkdir -p ./usr/local/lib/pkgconfig && mv ./usr/local/ssl/lib/pkgconfig/*.pc ./usr/local/lib/pkgconfig/) && \ + make install && \ + (mkdir -p /usr/local/lib/pkgconfig && mv /usr/local/ssl/lib/pkgconfig/*.pc /usr/local/lib/pkgconfig/) + RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ ca-certificates wget g++ autoconf libtool autotools-dev automake make && \ @@ -150,19 +168,18 @@ RUN cd /opt/build && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - git cmake make autoconf && \ + ca-certificates meson tar g++ wget pkg-config && \ rm -rf /var/lib/apt/lists/* -# build libx264 -ARG LIBX264_REPO=https://github.com/mirror/x264 +# build dav1d +ARG DAV1D_REPO=https://code.videolan.org/videolan/dav1d/-/archive/0.9.0/dav1d-0.9.0.tar.gz RUN cd /opt/build && \ - git clone ${LIBX264_REPO} -b stable --depth 1 && \ - cd x264 && \ - ./configure --prefix=/usr/local --libdir=/usr/local/lib \ - --enable-shared && \ - make -j$(nproc) && \ - make install DESTDIR=/opt/dist && \ - make install + wget -O - ${DAV1D_REPO} | tar xz +RUN cd /opt/build/dav1d-0.9.0 && \ + meson build --prefix=/usr/local --libdir /usr/local/lib --buildtype=plain && \ + cd build && \ + ninja install && \ + DESTDIR=/opt/dist ninja install RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ @@ -180,53 +197,6 @@ RUN cd /opt/build/yasm-1.3.0 && \ make -j $(nproc) && \ make install -RUN apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - libnuma-dev cmake make && \ - rm -rf /var/lib/apt/lists/* - -# build libx265 -ARG LIBX265_REPO=https://github.com/videolan/x265/archive/3.4.tar.gz -RUN cd /opt/build && \ - wget -O - ${LIBX265_REPO} | tar xz && \ - cd x265-3.4/build/linux && \ - cmake -DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX=/usr/local -DLIB_INSTALL_DIR=/usr/local/lib ../../source && \ - make -j$(nproc) && \ - make install DESTDIR=/opt/dist && \ - make install - -RUN apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates meson tar g++ wget pkg-config && \ - rm -rf /var/lib/apt/lists/* - -# build dav1d -ARG DAV1D_REPO=https://code.videolan.org/videolan/dav1d/-/archive/0.9.0/dav1d-0.9.0.tar.gz -RUN cd /opt/build && \ - wget -O - ${DAV1D_REPO} | tar xz -RUN cd /opt/build/dav1d-0.9.0 && \ - meson build --prefix=/usr/local --libdir /usr/local/lib --buildtype=plain && \ - cd build && \ - ninja install && \ - DESTDIR=/opt/dist ninja install - -RUN apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates meson tar g++ wget pkg-config ninja-build && \ - rm -rf /var/lib/apt/lists/* - -# build VMAF -ARG VMAF_VER=2.1.1 -ARG LIBVMAF_REPO=https://github.com/Netflix/vmaf/archive/refs/tags/v${VMAF_VER}.tar.gz -RUN cd /opt/build && \ - wget -O - ${LIBVMAF_REPO} | tar xz && ls -RUN cd /opt/build/vmaf-2.1.1/libvmaf && \ - ls && \ - meson build --prefix=/usr/local --libdir /usr/local/lib --buildtype=plain && \ - cd build && \ - ninja install && \ - DESTDIR=/opt/dist ninja install - RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ ca-certificates wget tar g++ make cmake git && \ @@ -369,7 +339,8 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-gpl --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libx264 --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libvmaf --enable-version3 --enable-libdav1d && make -j$(nproc) && \ + --extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-openssl --extra-ldflags=-Wldnl + --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libdav1d && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install @@ -379,6 +350,9 @@ RUN rm -rf /opt/dist/usr/local/include && \ find /opt/dist -name "*.a" -exec rm -f {} \; || echo "" RUN rm -rf /opt/dist/usr/local/share/doc /opt/dist/usr/local/share/gtk-doc RUN rm -rf /opt/dist/usr/local/share/man +RUN rm -rf /opt/dist/usr/local/ssl/include +RUN rm -rf /opt/dist/usr/local/ssl/share/man +RUN rm -rf /opt/dist/usr/local/ssl/share/doc FROM ubuntu:20.04 LABEL Description="This is the base image for Gstreamer ubuntu 20.04" @@ -389,7 +363,7 @@ WORKDIR /home RUN apt-get update && apt-get upgrade -y systemd RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - libnuma1 libdrm2 libx11-6 libxext6 libxfixes3 libwayland-client0 libpciaccess0 libxcb-shape0 libxcb-xfixes0 libv4l-0 libass9 && \ + libdrm2 libx11-6 libxext6 libxfixes3 libwayland-client0 libpciaccess0 libxcb-shape0 libxcb-xfixes0 libv4l-0 libass9 && \ rm -rf /var/lib/apt/lists/* COPY --from=build /opt/dist / diff --git a/SG1/ubuntu-20.04/media/dev/Dockerfile.m4 b/SG1/ubuntu-20.04/media/dev/Dockerfile.m4 index a004bb73c..70903c1d0 100644 --- a/SG1/ubuntu-20.04/media/dev/Dockerfile.m4 +++ b/SG1/ubuntu-20.04/media/dev/Dockerfile.m4 @@ -3,14 +3,12 @@ include(begin.m4) include(ubuntu.m4) include(libogg.m4) include(libvorbis.m4) +include(openssl.m4) ifelse(defn(`BUILD_FDKAAC'),`ON',`include(libfdk-aac.m4)') include(libopus.m4) include(libvpx.m4) include(libaom.m4) -include(libx264.m4) -include(libx265.m4) include(dav1d.m4) -include(libvmaf.m4) include(svt-hevc.m4) include(svt-av1.m4) include(svt-vp9.m4) diff --git a/SG1/ubuntu-20.04/media/ffmpeg/Dockerfile b/SG1/ubuntu-20.04/media/ffmpeg/Dockerfile index 23cb7f4a8..68077832b 100644 --- a/SG1/ubuntu-20.04/media/ffmpeg/Dockerfile +++ b/SG1/ubuntu-20.04/media/ffmpeg/Dockerfile @@ -195,23 +195,6 @@ RUN cd /opt/build/dav1d-0.9.0 && \ ninja install && \ DESTDIR=/opt/dist ninja install -RUN apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates meson tar g++ wget pkg-config ninja-build && \ - rm -rf /var/lib/apt/lists/* - -# build VMAF -ARG VMAF_VER=2.1.1 -ARG LIBVMAF_REPO=https://github.com/Netflix/vmaf/archive/refs/tags/v${VMAF_VER}.tar.gz -RUN cd /opt/build && \ - wget -O - ${LIBVMAF_REPO} | tar xz && ls -RUN cd /opt/build/vmaf-2.1.1/libvmaf && \ - ls && \ - meson build --prefix=/usr/local --libdir /usr/local/lib --buildtype=plain && \ - cd build && \ - ninja install && \ - DESTDIR=/opt/dist ninja install - RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ ca-certificates wget tar g++ make cmake git && \ @@ -379,7 +362,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-gpl --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libx264 --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libvmaf --enable-version3 --enable-libdav1d && make -j$(nproc) && \ + --extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 -rpath=/usr/local/ssl/lib --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libdav1d && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install diff --git a/SG1/ubuntu-20.04/media/ffmpeg/Dockerfile.m4 b/SG1/ubuntu-20.04/media/ffmpeg/Dockerfile.m4 index 800cc7e6b..3e326e04f 100644 --- a/SG1/ubuntu-20.04/media/ffmpeg/Dockerfile.m4 +++ b/SG1/ubuntu-20.04/media/ffmpeg/Dockerfile.m4 @@ -9,7 +9,6 @@ include(libvpx.m4) include(libx264.m4) include(libx265.m4) include(dav1d.m4) -include(libvmaf.m4) include(svt-hevc.m4) include(svt-av1.m4) include(svt-vp9.m4) diff --git a/VCAC-A/ubuntu-18.04/analytics/dev/Dockerfile b/VCAC-A/ubuntu-18.04/analytics/dev/Dockerfile index ecd3520df..842dae558 100644 --- a/VCAC-A/ubuntu-18.04/analytics/dev/Dockerfile +++ b/VCAC-A/ubuntu-18.04/analytics/dev/Dockerfile @@ -85,6 +85,24 @@ RUN cd /opt/build && \ make install DESTDIR=/opt/dist && \ make install +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + ca-certificates wget tar g++ make libtool autoconf && \ + rm -rf /var/lib/apt/lists/* + +# build openssl +ARG OPENSSL_REPO=https://github.com/openssl/openssl/archive/OpenSSL_1_1_1k.tar.gz +RUN cd /opt/build && \ + wget -O - ${OPENSSL_REPO} | tar xz && \ + cd openssl-OpenSSL_1_1_1k && \ + ./config no-ssl3 shared --prefix=/usr/local/ssl --openssldir=/usr/local/ssl -fPIC -Wl,-rpath=/usr/local/ssl/lib && \ + make depend && \ + make -s V=0 && \ + make install DESTDIR=/opt/dist && \ + (cd /opt/dist && mkdir -p ./usr/local/lib/pkgconfig && mv ./usr/local/ssl/lib/pkgconfig/*.pc ./usr/local/lib/pkgconfig/) && \ + make install && \ + (mkdir -p /usr/local/lib/pkgconfig && mv /usr/local/ssl/lib/pkgconfig/*.pc /usr/local/lib/pkgconfig/) + RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ ca-certificates wget g++ autoconf libtool autotools-dev automake make && \ @@ -161,53 +179,6 @@ RUN cd /opt/build && \ make install DESTDIR=/opt/dist && \ make install -RUN apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - git make autoconf && \ - rm -rf /var/lib/apt/lists/* - -# build libx264 -ARG LIBX264_REPO=https://github.com/mirror/x264 -RUN cd /opt/build && \ - git clone ${LIBX264_REPO} -b stable --depth 1 && \ - cd x264 && \ - ./configure --prefix=/usr/local --libdir=/usr/local/lib \ - --enable-shared && \ - make -j$(nproc) && \ - make install DESTDIR=/opt/dist && \ - make install - -RUN apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates wget tar g++ make && \ - rm -rf /var/lib/apt/lists/* - -# build yasm -ARG YASM_REPO=https://www.tortall.net/projects/yasm/releases/yasm-1.3.0.tar.gz -RUN cd /opt/build && \ - wget -O - ${YASM_REPO} | tar xz -RUN cd /opt/build/yasm-1.3.0 && \ - # TODO remove the line below whether no other component inside this project requires it. - # `sed -i "s/) ytasm.*/)/" Makefile.in' && \ - ./configure --prefix=/usr/local --libdir=/usr/local/lib && \ - make -j $(nproc) && \ - make install - -RUN apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - libnuma-dev make && \ - rm -rf /var/lib/apt/lists/* - -# build libx265 -ARG LIBX265_REPO=https://github.com/videolan/x265/archive/3.4.tar.gz -RUN cd /opt/build && \ - wget -O - ${LIBX265_REPO} | tar xz && \ - cd x265-3.4/build/linux && \ - cmake -DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX=/usr/local -DLIB_INSTALL_DIR=/usr/local/lib ../../source && \ - make -j$(nproc) && \ - make install DESTDIR=/opt/dist && \ - make install - RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ python3-pip ninja-build python3-setuptools && \ @@ -505,7 +476,7 @@ RUN cd /opt/build/gst-plugins-good-1.19.1 && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates tar g++ wget pkg-config libglib2.0-dev flex bison gobject-introspection libgirepository1.0-dev openssl libcurl4-gnutls-dev librtmp-dev mjpegtools libde265-dev && \ + ca-certificates tar g++ wget pkg-config libglib2.0-dev flex bison gobject-introspection libgirepository1.0-dev libcurl4-gnutls-dev librtmp-dev mjpegtools libx265-dev libde265-dev && \ rm -rf /var/lib/apt/lists/* # build gst-plugin-bad @@ -534,7 +505,7 @@ RUN cd /opt/build && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates tar g++ wget pkg-config libglib2.0-dev flex bison && \ + ca-certificates tar g++ wget pkg-config libglib2.0-dev flex bison libx264-dev && \ rm -rf /var/lib/apt/lists/* # build gst-plugin-ugly @@ -578,7 +549,8 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-gpl --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libx264 --enable-libx265 --enable-libaom --enable-libdav1d && make -j$(nproc) && \ + --extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-openssl --extra-ldflags=-Wldnl + --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libaom --enable-libdav1d && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install @@ -729,6 +701,9 @@ RUN rm -rf /opt/dist/usr/local/include && \ find /opt/dist -name "*.a" -exec rm -f {} \; || echo "" RUN rm -rf /opt/dist/usr/local/share/doc /opt/dist/usr/local/share/gtk-doc RUN rm -rf /opt/dist/usr/local/share/man +RUN rm -rf /opt/dist/usr/local/ssl/include +RUN rm -rf /opt/dist/usr/local/ssl/share/man +RUN rm -rf /opt/dist/usr/local/ssl/share/doc FROM ubuntu:18.04 LABEL Description="This is the development image for ubuntu 18.04" @@ -739,7 +714,7 @@ WORKDIR /home RUN apt-get update && apt-get upgrade -y systemd RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - libnuma1 libdrm2 libx11-6 libxext6 libxfixes3 libwayland-client0 libpciaccess0 libusb-1.0-0-dev libboost-filesystem1.65.1 libboost-system1.65.1 libboost-program-options1.65.1 libjson-c3 libglib2.0-0 libxv1 libxt6 libasound2 libpangocairo-1.0-0 libcairo-gobject2 libtheora0 libvisual-0.4-0 libgl1-mesa-dri libgl1-mesa-glx libegl1-mesa libgdk-pixbuf2.0-0 libjpeg-turbo8 libpng16-16 zlib1g libsoup2.4-1 openssl libcurl3-gnutls librtmp1 mjpegtools libde265-0 libxcb-shape0 libxcb-xfixes0 libv4l-0 libass9 python3-numpy python3-gi python3-gi-cairo python3-dev ocl-icd-opencl-dev libglib2.0-dev && \ + libdrm2 libx11-6 libxext6 libxfixes3 libwayland-client0 libpciaccess0 libusb-1.0-0-dev libboost-filesystem1.65.1 libboost-system1.65.1 libboost-program-options1.65.1 libjson-c3 libglib2.0-0 libxv1 libxt6 libasound2 libpangocairo-1.0-0 libcairo-gobject2 libtheora0 libvisual-0.4-0 libgl1-mesa-dri libgl1-mesa-glx libegl1-mesa libgdk-pixbuf2.0-0 libjpeg-turbo8 libpng16-16 zlib1g libsoup2.4-1 libcurl3-gnutls librtmp1 mjpegtools libx265-142 libde265-0 libx264-155 libxcb-shape0 libxcb-xfixes0 libv4l-0 libass9 python3-numpy python3-gi python3-gi-cairo python3-dev ocl-icd-opencl-dev libglib2.0-dev && \ rm -rf /var/lib/apt/lists/* COPY --from=build /opt/dist / diff --git a/VCAC-A/ubuntu-18.04/analytics/dev/Dockerfile.m4 b/VCAC-A/ubuntu-18.04/analytics/dev/Dockerfile.m4 index cd9ceae85..3a368dfd5 100644 --- a/VCAC-A/ubuntu-18.04/analytics/dev/Dockerfile.m4 +++ b/VCAC-A/ubuntu-18.04/analytics/dev/Dockerfile.m4 @@ -3,12 +3,11 @@ include(ubuntu.m4) include(cmake.m4) include(libogg.m4) include(libvorbis.m4) +include(openssl.m4) ifelse(defn(`BUILD_FDKAAC'),`ON',`include(libfdk-aac.m4)') include(libopus.m4) include(libvpx.m4) include(libaom.m4) -include(libx264.m4) -include(libx265.m4) include(meson.m4) include(dav1d.m4) include(gmmlib.m4) diff --git a/VCAC-A/ubuntu-18.04/analytics/ffmpeg/Dockerfile b/VCAC-A/ubuntu-18.04/analytics/ffmpeg/Dockerfile index a79e518fb..a0e47d231 100644 --- a/VCAC-A/ubuntu-18.04/analytics/ffmpeg/Dockerfile +++ b/VCAC-A/ubuntu-18.04/analytics/ffmpeg/Dockerfile @@ -438,7 +438,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-gpl --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libx264 --enable-libx265 --enable-libdav1d && make -j$(nproc) && \ + --extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 -rpath=/usr/local/ssl/lib --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libdav1d && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install diff --git a/VCAC-A/ubuntu-18.04/analytics/gst/Dockerfile b/VCAC-A/ubuntu-18.04/analytics/gst/Dockerfile index 810f51732..ae1bcecb9 100644 --- a/VCAC-A/ubuntu-18.04/analytics/gst/Dockerfile +++ b/VCAC-A/ubuntu-18.04/analytics/gst/Dockerfile @@ -557,7 +557,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-gpl --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libx264 --enable-libx265 --enable-libaom --enable-libdav1d && make -j$(nproc) && \ + --extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 -rpath=/usr/local/ssl/lib --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libaom --enable-libdav1d && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install diff --git a/VCAC-A/ubuntu-20.04/analytics/dev/Dockerfile b/VCAC-A/ubuntu-20.04/analytics/dev/Dockerfile index 467931dfa..5ae577564 100644 --- a/VCAC-A/ubuntu-20.04/analytics/dev/Dockerfile +++ b/VCAC-A/ubuntu-20.04/analytics/dev/Dockerfile @@ -71,6 +71,24 @@ RUN cd /opt/build && \ make install DESTDIR=/opt/dist && \ make install +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + ca-certificates wget tar g++ make libtool autoconf && \ + rm -rf /var/lib/apt/lists/* + +# build openssl +ARG OPENSSL_REPO=https://github.com/openssl/openssl/archive/OpenSSL_1_1_1k.tar.gz +RUN cd /opt/build && \ + wget -O - ${OPENSSL_REPO} | tar xz && \ + cd openssl-OpenSSL_1_1_1k && \ + ./config no-ssl3 shared --prefix=/usr/local/ssl --openssldir=/usr/local/ssl -fPIC -Wl,-rpath=/usr/local/ssl/lib && \ + make depend && \ + make -s V=0 && \ + make install DESTDIR=/opt/dist && \ + (cd /opt/dist && mkdir -p ./usr/local/lib/pkgconfig && mv ./usr/local/ssl/lib/pkgconfig/*.pc ./usr/local/lib/pkgconfig/) && \ + make install && \ + (mkdir -p /usr/local/lib/pkgconfig && mv /usr/local/ssl/lib/pkgconfig/*.pc /usr/local/lib/pkgconfig/) + RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ ca-certificates wget g++ autoconf libtool autotools-dev automake make && \ @@ -147,53 +165,6 @@ RUN cd /opt/build && \ make install DESTDIR=/opt/dist && \ make install -RUN apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - git cmake make autoconf && \ - rm -rf /var/lib/apt/lists/* - -# build libx264 -ARG LIBX264_REPO=https://github.com/mirror/x264 -RUN cd /opt/build && \ - git clone ${LIBX264_REPO} -b stable --depth 1 && \ - cd x264 && \ - ./configure --prefix=/usr/local --libdir=/usr/local/lib \ - --enable-shared && \ - make -j$(nproc) && \ - make install DESTDIR=/opt/dist && \ - make install - -RUN apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates wget tar g++ make && \ - rm -rf /var/lib/apt/lists/* - -# build yasm -ARG YASM_REPO=https://www.tortall.net/projects/yasm/releases/yasm-1.3.0.tar.gz -RUN cd /opt/build && \ - wget -O - ${YASM_REPO} | tar xz -RUN cd /opt/build/yasm-1.3.0 && \ - # TODO remove the line below whether no other component inside this project requires it. - # `sed -i "s/) ytasm.*/)/" Makefile.in' && \ - ./configure --prefix=/usr/local --libdir=/usr/local/lib && \ - make -j $(nproc) && \ - make install - -RUN apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - libnuma-dev cmake make && \ - rm -rf /var/lib/apt/lists/* - -# build libx265 -ARG LIBX265_REPO=https://github.com/videolan/x265/archive/3.4.tar.gz -RUN cd /opt/build && \ - wget -O - ${LIBX265_REPO} | tar xz && \ - cd x265-3.4/build/linux && \ - cmake -DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX=/usr/local -DLIB_INSTALL_DIR=/usr/local/lib ../../source && \ - make -j$(nproc) && \ - make install DESTDIR=/opt/dist && \ - make install - RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ python3-pip ninja-build python3-setuptools && \ @@ -491,7 +462,7 @@ RUN cd /opt/build/gst-plugins-good-1.19.1 && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates tar g++ wget pkg-config libglib2.0-dev flex bison gobject-introspection libgirepository1.0-dev openssl libcurl4-gnutls-dev librtmp-dev mjpegtools libde265-dev && \ + ca-certificates tar g++ wget pkg-config libglib2.0-dev flex bison gobject-introspection libgirepository1.0-dev libcurl4-gnutls-dev librtmp-dev mjpegtools libx265-dev libde265-dev && \ rm -rf /var/lib/apt/lists/* # build gst-plugin-bad @@ -520,7 +491,7 @@ RUN cd /opt/build && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates tar g++ wget pkg-config libglib2.0-dev flex bison && \ + ca-certificates tar g++ wget pkg-config libglib2.0-dev flex bison libx264-dev && \ rm -rf /var/lib/apt/lists/* # build gst-plugin-ugly @@ -564,7 +535,8 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-gpl --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libx264 --enable-libx265 --enable-libaom --enable-libdav1d && make -j$(nproc) && \ + --extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-openssl --extra-ldflags=-Wldnl + --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libaom --enable-libdav1d && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install @@ -715,6 +687,9 @@ RUN rm -rf /opt/dist/usr/local/include && \ find /opt/dist -name "*.a" -exec rm -f {} \; || echo "" RUN rm -rf /opt/dist/usr/local/share/doc /opt/dist/usr/local/share/gtk-doc RUN rm -rf /opt/dist/usr/local/share/man +RUN rm -rf /opt/dist/usr/local/ssl/include +RUN rm -rf /opt/dist/usr/local/ssl/share/man +RUN rm -rf /opt/dist/usr/local/ssl/share/doc FROM ubuntu:20.04 LABEL Description="This is the development image for ubuntu 20.04" @@ -725,7 +700,7 @@ WORKDIR /home RUN apt-get update && apt-get upgrade -y systemd RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - libnuma1 libdrm2 libx11-6 libxext6 libxfixes3 libwayland-client0 libpciaccess0 libusb-1.0-0-dev libboost-filesystem1.71.0 libboost-system1.71.0 libboost-program-options1.71.0 libjson-c4 libglib2.0-0 libxv1 libxt6 libasound2 libpangocairo-1.0-0 libcairo-gobject2 libtheora0 libvisual-0.4-0 libgl1-mesa-dri libgl1-mesa-glx libegl1-mesa libgdk-pixbuf2.0-0 libjpeg-turbo8 libpng16-16 zlib1g libsoup2.4-1 openssl libcurl3-gnutls librtmp1 mjpegtools libde265-0 libxcb-shape0 libxcb-xfixes0 libv4l-0 libass9 libgles2 python3-numpy python3-gi python3-gi-cairo python3-dev ocl-icd-opencl-dev libwayland-egl1 libglib2.0-dev && \ + libdrm2 libx11-6 libxext6 libxfixes3 libwayland-client0 libpciaccess0 libusb-1.0-0-dev libboost-filesystem1.71.0 libboost-system1.71.0 libboost-program-options1.71.0 libjson-c4 libglib2.0-0 libxv1 libxt6 libasound2 libpangocairo-1.0-0 libcairo-gobject2 libtheora0 libvisual-0.4-0 libgl1-mesa-dri libgl1-mesa-glx libegl1-mesa libgdk-pixbuf2.0-0 libjpeg-turbo8 libpng16-16 zlib1g libsoup2.4-1 libcurl3-gnutls librtmp1 mjpegtools libx265-179 libde265-0 libx264-155 libxcb-shape0 libxcb-xfixes0 libv4l-0 libass9 libgles2 python3-numpy python3-gi python3-gi-cairo python3-dev ocl-icd-opencl-dev libwayland-egl1 libglib2.0-dev && \ rm -rf /var/lib/apt/lists/* COPY --from=build /opt/dist / diff --git a/VCAC-A/ubuntu-20.04/analytics/dev/Dockerfile.m4 b/VCAC-A/ubuntu-20.04/analytics/dev/Dockerfile.m4 index f63c5d8e3..0c0ba34f7 100644 --- a/VCAC-A/ubuntu-20.04/analytics/dev/Dockerfile.m4 +++ b/VCAC-A/ubuntu-20.04/analytics/dev/Dockerfile.m4 @@ -2,12 +2,11 @@ include(begin.m4) include(ubuntu.m4) include(libogg.m4) include(libvorbis.m4) +include(openssl.m4) ifelse(defn(`BUILD_FDKAAC'),`ON',`include(libfdk-aac.m4)') include(libopus.m4) include(libvpx.m4) include(libaom.m4) -include(libx264.m4) -include(libx265.m4) include(meson.m4) include(dav1d.m4) include(gmmlib.m4) diff --git a/VCAC-A/ubuntu-20.04/analytics/ffmpeg/Dockerfile b/VCAC-A/ubuntu-20.04/analytics/ffmpeg/Dockerfile index f08140b33..bf11bbb99 100644 --- a/VCAC-A/ubuntu-20.04/analytics/ffmpeg/Dockerfile +++ b/VCAC-A/ubuntu-20.04/analytics/ffmpeg/Dockerfile @@ -412,7 +412,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-gpl --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libx264 --enable-libx265 --enable-libdav1d && make -j$(nproc) && \ + --extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 -rpath=/usr/local/ssl/lib --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libdav1d && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install diff --git a/VCAC-A/ubuntu-20.04/analytics/gst/Dockerfile b/VCAC-A/ubuntu-20.04/analytics/gst/Dockerfile index 3de8805e8..b1a9c9d11 100644 --- a/VCAC-A/ubuntu-20.04/analytics/gst/Dockerfile +++ b/VCAC-A/ubuntu-20.04/analytics/gst/Dockerfile @@ -543,7 +543,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-gpl --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libx264 --enable-libx265 --enable-libaom --enable-libdav1d && make -j$(nproc) && \ + --extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 -rpath=/usr/local/ssl/lib --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libaom --enable-libdav1d && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install diff --git a/Xeon/centos-7/analytics/dev/Dockerfile b/Xeon/centos-7/analytics/dev/Dockerfile index d57f90032..3a2c5aa03 100644 --- a/Xeon/centos-7/analytics/dev/Dockerfile +++ b/Xeon/centos-7/analytics/dev/Dockerfile @@ -82,6 +82,21 @@ RUN cd /opt/build && \ make install DESTDIR=/opt/dist && \ make install +RUN yum install -y wget tar gcc-c++ make libtool autoconf + +# build openssl +ARG OPENSSL_REPO=https://github.com/openssl/openssl/archive/OpenSSL_1_1_1k.tar.gz +RUN cd /opt/build && \ + wget -O - ${OPENSSL_REPO} | tar xz && \ + cd openssl-OpenSSL_1_1_1k && \ + ./config no-ssl3 shared --prefix=/usr/local/ssl --openssldir=/usr/local/ssl -fPIC -Wl,-rpath=/usr/local/ssl/lib && \ + make depend && \ + make -s V=0 && \ + make install DESTDIR=/opt/dist && \ + (cd /opt/dist && mkdir -p ./usr/local/lib64/pkgconfig && mv ./usr/local/ssl/lib/pkgconfig/*.pc ./usr/local/lib64/pkgconfig/) && \ + make install && \ + (mkdir -p /usr/local/lib64/pkgconfig && mv /usr/local/ssl/lib/pkgconfig/*.pc /usr/local/lib64/pkgconfig/) + RUN yum install -y wget gcc-c++ autoconf libtool make automake # build libfdkaac @@ -143,18 +158,17 @@ RUN cd /opt/build && \ make install DESTDIR=/opt/dist && \ make install -RUN yum install -y git make autoconf diffutils +RUN yum install -y meson wget tar gcc-c++ -# build libx264 -ARG LIBX264_REPO=https://github.com/mirror/x264 +# build dav1d +ARG DAV1D_REPO=https://code.videolan.org/videolan/dav1d/-/archive/0.9.0/dav1d-0.9.0.tar.gz RUN cd /opt/build && \ - git clone ${LIBX264_REPO} -b stable --depth 1 && \ - cd x264 && \ - ./configure --prefix=/usr/local --libdir=/usr/local/lib64 \ - --enable-shared && \ - make -j$(nproc) && \ - make install DESTDIR=/opt/dist && \ - make install + wget -O - ${DAV1D_REPO} | tar xz +RUN cd /opt/build/dav1d-0.9.0 && \ + meson build --prefix=/usr/local --libdir /usr/local/lib64 --buildtype=plain && \ + cd build && \ + ninja install && \ + DESTDIR=/opt/dist ninja install RUN yum install -y wget tar gcc-c++ make @@ -169,30 +183,6 @@ RUN cd /opt/build/yasm-1.3.0 && \ make -j $(nproc) && \ make install -RUN yum install -y make numactl-devel libpciaccess-devel - -# build libx265 -ARG LIBX265_REPO=https://github.com/videolan/x265/archive/3.4.tar.gz -RUN cd /opt/build && \ - wget -O - ${LIBX265_REPO} | tar xz && \ - cd x265-3.4/build/linux && \ - cmake -DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX=/usr/local -DLIB_INSTALL_DIR=/usr/local/lib64 ../../source && \ - make -j$(nproc) && \ - make install DESTDIR=/opt/dist && \ - make install - -RUN yum install -y meson wget tar gcc-c++ - -# build dav1d -ARG DAV1D_REPO=https://code.videolan.org/videolan/dav1d/-/archive/0.9.0/dav1d-0.9.0.tar.gz -RUN cd /opt/build && \ - wget -O - ${DAV1D_REPO} | tar xz -RUN cd /opt/build/dav1d-0.9.0 && \ - meson build --prefix=/usr/local --libdir /usr/local/lib64 --buildtype=plain && \ - cd build && \ - ninja install && \ - DESTDIR=/opt/dist ninja install - RUN yum install -y wget tar gcc-c++ make git # build svt-hevc @@ -438,7 +428,7 @@ RUN cd /opt/build/gst-plugins-good-1.19.1 && \ ninja install && \ DESTDIR=/opt/dist ninja install -RUN yum install -y meson wget tar glib2-devel bison flex gobject-introspection-devel openssl libcurl-devel librtmp-devel mjpegtools libde265-devel devtoolset-9 +RUN yum install -y meson wget tar glib2-devel bison flex gobject-introspection-devel libcurl-devel librtmp-devel mjpegtools x265-devel libde265-devel devtoolset-9 # build gst-plugin-bad ARG GSTBAD_REPO=https://github.com/GStreamer/gst-plugins-bad/archive/1.19.1.tar.gz @@ -464,7 +454,7 @@ RUN cd /opt/build && \ ninja install && \ DESTDIR=/opt/dist ninja install ) -RUN yum install -y meson wget tar gcc-c++ glib2-devel bison flex +RUN yum install -y meson wget tar gcc-c++ glib2-devel bison flex libx264-devel # build gst-plugin-ugly ARG GSTUGLY_REPO=https://github.com/GStreamer/gst-plugins-ugly/archive/1.19.1.tar.gz @@ -501,7 +491,8 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib64 --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-gpl --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --disable-hwaccels --disable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libx264 --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libdav1d && make -j$(nproc) && \ + --extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --disable-hwaccels --disable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-openssl --extra-ldflags=-Wldnl + --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libdav1d && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install @@ -661,6 +652,8 @@ RUN cd /opt/build/gst-python-1.19.1 && \ # cleanup RUN rm -rf /opt/dist/usr/local/share/doc /opt/dist/usr/local/share/gtk-doc RUN rm -rf /opt/dist/usr/local/share/man +RUN rm -rf /opt/dist/usr/local/ssl/share/man +RUN rm -rf /opt/dist/usr/local/ssl/share/doc RUN rm -rf /opt/dist/usr/local/openvino/inference-engine/external/tbb/doc FROM centos:7 @@ -675,7 +668,7 @@ RUN dnf install -y https://download1.rpmfusion.org/free/el/rpmfusion-free-releas dnf install -y https://download1.rpmfusion.org/nonfree/el/rpmfusion-nonfree-release-7.noarch.rpm # Install -RUN yum install -y bash numactl-libs libpciaccess gtk3 numactl ocl-icd glib2 gobject-introspection mesa-libEGL libX11 libXv libXt alsa-lib pango libtheora libvisual mesa-libGL mesa-dri-drivers gdk-pixbuf2 libjpeg-turbo libpng zlib libsoup openssl librtmp mjpegtools libde265 libv4l libass python3-devel boost-regex python36-gobject python36-gobject-devel python36-gobject-base +RUN yum install -y bash gtk3 numactl ocl-icd glib2 gobject-introspection mesa-libEGL libX11 libXv libXt alsa-lib pango libtheora libvisual mesa-libGL mesa-dri-drivers gdk-pixbuf2 libjpeg-turbo libpng zlib libsoup librtmp mjpegtools x265 libde265 libx264-static libv4l libass python3-devel boost-regex python36-gobject python36-gobject-devel python36-gobject-base ENV PKG_CONFIG_PATH=/usr/local/lib64/pkgconfig COPY --from=build /opt/dist / diff --git a/Xeon/centos-7/analytics/dev/Dockerfile.m4 b/Xeon/centos-7/analytics/dev/Dockerfile.m4 index 0b0a9f2e6..f72ca42bf 100644 --- a/Xeon/centos-7/analytics/dev/Dockerfile.m4 +++ b/Xeon/centos-7/analytics/dev/Dockerfile.m4 @@ -3,12 +3,11 @@ include(centos-repo.m4) include(cmake.m4) include(libogg.m4) include(libvorbis.m4) +include(openssl.m4) ifelse(defn(`BUILD_FDKAAC'),`ON',`include(libfdk-aac.m4)') include(libopus.m4) include(libvpx.m4) include(libaom.m4) -include(libx264.m4) -include(libx265.m4) include(dav1d.m4) include(svt-hevc.m4) include(svt-av1.m4) diff --git a/Xeon/centos-7/analytics/ffmpeg/Dockerfile b/Xeon/centos-7/analytics/ffmpeg/Dockerfile index b8f247588..6659793e1 100644 --- a/Xeon/centos-7/analytics/ffmpeg/Dockerfile +++ b/Xeon/centos-7/analytics/ffmpeg/Dockerfile @@ -376,7 +376,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib64 --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-gpl --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --disable-hwaccels --disable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libx264 --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libdav1d && make -j$(nproc) && \ + --extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --disable-hwaccels --disable-vaapi --enable-libv4l2 --enable-indev=v4l2 -rpath=/usr/local/ssl/lib --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libdav1d && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install diff --git a/Xeon/centos-7/analytics/gst/Dockerfile b/Xeon/centos-7/analytics/gst/Dockerfile index 8c874d27e..ff759c917 100644 --- a/Xeon/centos-7/analytics/gst/Dockerfile +++ b/Xeon/centos-7/analytics/gst/Dockerfile @@ -501,7 +501,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib64 --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-gpl --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --disable-hwaccels --disable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libx264 --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libdav1d && make -j$(nproc) && \ + --extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --disable-hwaccels --disable-vaapi --enable-libv4l2 --enable-indev=v4l2 -rpath=/usr/local/ssl/lib --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libdav1d && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install diff --git a/Xeon/centos-7/media/dev/Dockerfile b/Xeon/centos-7/media/dev/Dockerfile index 1da33486a..41d06e5e6 100644 --- a/Xeon/centos-7/media/dev/Dockerfile +++ b/Xeon/centos-7/media/dev/Dockerfile @@ -83,6 +83,21 @@ RUN cd /opt/build && \ make install DESTDIR=/opt/dist && \ make install +RUN yum install -y wget tar gcc-c++ make libtool autoconf + +# build openssl +ARG OPENSSL_REPO=https://github.com/openssl/openssl/archive/OpenSSL_1_1_1k.tar.gz +RUN cd /opt/build && \ + wget -O - ${OPENSSL_REPO} | tar xz && \ + cd openssl-OpenSSL_1_1_1k && \ + ./config no-ssl3 shared --prefix=/usr/local/ssl --openssldir=/usr/local/ssl -fPIC -Wl,-rpath=/usr/local/ssl/lib && \ + make depend && \ + make -s V=0 && \ + make install DESTDIR=/opt/dist && \ + (cd /opt/dist && mkdir -p ./usr/local/lib64/pkgconfig && mv ./usr/local/ssl/lib/pkgconfig/*.pc ./usr/local/lib64/pkgconfig/) && \ + make install && \ + (mkdir -p /usr/local/lib64/pkgconfig && mv /usr/local/ssl/lib/pkgconfig/*.pc /usr/local/lib64/pkgconfig/) + RUN yum install -y wget gcc-c++ autoconf libtool make automake # build libfdkaac @@ -144,18 +159,17 @@ RUN cd /opt/build && \ make install DESTDIR=/opt/dist && \ make install -RUN yum install -y git make autoconf diffutils +RUN yum install -y meson wget tar gcc-c++ -# build libx264 -ARG LIBX264_REPO=https://github.com/mirror/x264 +# build dav1d +ARG DAV1D_REPO=https://code.videolan.org/videolan/dav1d/-/archive/0.9.0/dav1d-0.9.0.tar.gz RUN cd /opt/build && \ - git clone ${LIBX264_REPO} -b stable --depth 1 && \ - cd x264 && \ - ./configure --prefix=/usr/local --libdir=/usr/local/lib64 \ - --enable-shared && \ - make -j$(nproc) && \ - make install DESTDIR=/opt/dist && \ - make install + wget -O - ${DAV1D_REPO} | tar xz +RUN cd /opt/build/dav1d-0.9.0 && \ + meson build --prefix=/usr/local --libdir /usr/local/lib64 --buildtype=plain && \ + cd build && \ + ninja install && \ + DESTDIR=/opt/dist ninja install RUN yum install -y wget tar gcc-c++ make @@ -170,44 +184,6 @@ RUN cd /opt/build/yasm-1.3.0 && \ make -j $(nproc) && \ make install -RUN yum install -y make numactl-devel libpciaccess-devel - -# build libx265 -ARG LIBX265_REPO=https://github.com/videolan/x265/archive/3.4.tar.gz -RUN cd /opt/build && \ - wget -O - ${LIBX265_REPO} | tar xz && \ - cd x265-3.4/build/linux && \ - cmake -DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX=/usr/local -DLIB_INSTALL_DIR=/usr/local/lib64 ../../source && \ - make -j$(nproc) && \ - make install DESTDIR=/opt/dist && \ - make install - -RUN yum install -y meson wget tar gcc-c++ - -# build dav1d -ARG DAV1D_REPO=https://code.videolan.org/videolan/dav1d/-/archive/0.9.0/dav1d-0.9.0.tar.gz -RUN cd /opt/build && \ - wget -O - ${DAV1D_REPO} | tar xz -RUN cd /opt/build/dav1d-0.9.0 && \ - meson build --prefix=/usr/local --libdir /usr/local/lib64 --buildtype=plain && \ - cd build && \ - ninja install && \ - DESTDIR=/opt/dist ninja install - -RUN yum install -y meson wget tar gcc-c++ ninja-build devtoolset-9 - -# build VMAF -ARG VMAF_VER=2.1.1 -ARG LIBVMAF_REPO=https://github.com/Netflix/vmaf/archive/refs/tags/v${VMAF_VER}.tar.gz -RUN cd /opt/build && \ - wget -O - ${LIBVMAF_REPO} | tar xz && ls -RUN cd /opt/build/vmaf-2.1.1/libvmaf && \ - ls && \ - (. /opt/rh/devtoolset-9/enable && meson build --prefix=/usr/local --libdir /usr/local/lib64 --buildtype=plain && \ - cd build && \ - ninja install && \ - DESTDIR=/opt/dist ninja install ) - RUN yum install -y wget tar gcc-c++ make git # build svt-hevc @@ -314,7 +290,7 @@ RUN cd /opt/build/gst-plugins-good-1.19.1 && \ ninja install && \ DESTDIR=/opt/dist ninja install -RUN yum install -y meson wget tar glib2-devel bison flex gobject-introspection-devel openssl libcurl-devel librtmp-devel mjpegtools libde265-devel devtoolset-9 +RUN yum install -y meson wget tar glib2-devel bison flex gobject-introspection-devel libcurl-devel librtmp-devel mjpegtools x265-devel libde265-devel devtoolset-9 # build gst-plugin-bad ARG GSTBAD_REPO=https://github.com/GStreamer/gst-plugins-bad/archive/1.19.1.tar.gz @@ -340,7 +316,7 @@ RUN cd /opt/build && \ ninja install && \ DESTDIR=/opt/dist ninja install ) -RUN yum install -y meson wget tar gcc-c++ glib2-devel bison flex +RUN yum install -y meson wget tar gcc-c++ glib2-devel bison flex libx264-devel # build gst-plugin-ugly ARG GSTUGLY_REPO=https://github.com/GStreamer/gst-plugins-ugly/archive/1.19.1.tar.gz @@ -377,7 +353,8 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib64 --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-gpl --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --disable-hwaccels --disable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libx264 --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libvmaf --enable-version3 --enable-libdav1d && make -j$(nproc) && \ + --extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --disable-hwaccels --disable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-openssl --extra-ldflags=-Wldnl + --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libdav1d && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install @@ -416,6 +393,8 @@ RUN cd /opt/build/SVT-VP9/gstreamer-plugin && \ # cleanup RUN rm -rf /opt/dist/usr/local/share/doc /opt/dist/usr/local/share/gtk-doc RUN rm -rf /opt/dist/usr/local/share/man +RUN rm -rf /opt/dist/usr/local/ssl/share/man +RUN rm -rf /opt/dist/usr/local/ssl/share/doc FROM centos:7 LABEL Description="This is the image for FFMPEG and Gstreamer application for media development on centos 7" @@ -429,7 +408,7 @@ RUN dnf install -y https://download1.rpmfusion.org/free/el/rpmfusion-free-releas dnf install -y https://download1.rpmfusion.org/nonfree/el/rpmfusion-nonfree-release-7.noarch.rpm # Install -RUN yum install -y bash numactl-libs libpciaccess glib2 gobject-introspection mesa-libEGL libX11 libXv libXt alsa-lib pango libtheora libvisual mesa-libGL mesa-dri-drivers gdk-pixbuf2 libjpeg-turbo libpng zlib libsoup openssl librtmp mjpegtools libde265 libv4l libass +RUN yum install -y bash glib2 gobject-introspection mesa-libEGL libX11 libXv libXt alsa-lib pango libtheora libvisual mesa-libGL mesa-dri-drivers gdk-pixbuf2 libjpeg-turbo libpng zlib libsoup librtmp mjpegtools x265 libde265 libx264-static libv4l libass ENV PKG_CONFIG_PATH=/usr/local/lib64/pkgconfig COPY --from=build /opt/dist / diff --git a/Xeon/centos-7/media/dev/Dockerfile.m4 b/Xeon/centos-7/media/dev/Dockerfile.m4 index 244769787..0c2710d9a 100644 --- a/Xeon/centos-7/media/dev/Dockerfile.m4 +++ b/Xeon/centos-7/media/dev/Dockerfile.m4 @@ -4,14 +4,12 @@ include(centos-repo.m4) include(cmake.m4) include(libogg.m4) include(libvorbis.m4) +include(openssl.m4) ifelse(defn(`BUILD_FDKAAC'),`ON',`include(libfdk-aac.m4)') include(libopus.m4) include(libvpx.m4) include(libaom.m4) -include(libx264.m4) -include(libx265.m4) include(dav1d.m4) -include(libvmaf.m4) include(svt-hevc.m4) include(svt-av1.m4) include(svt-vp9.m4) diff --git a/Xeon/centos-7/media/ffmpeg/Dockerfile b/Xeon/centos-7/media/ffmpeg/Dockerfile index d62430391..482fad78d 100644 --- a/Xeon/centos-7/media/ffmpeg/Dockerfile +++ b/Xeon/centos-7/media/ffmpeg/Dockerfile @@ -168,20 +168,6 @@ RUN cd /opt/build/dav1d-0.9.0 && \ ninja install && \ DESTDIR=/opt/dist ninja install -RUN yum install -y meson wget tar gcc-c++ ninja-build devtoolset-9 - -# build VMAF -ARG VMAF_VER=2.1.1 -ARG LIBVMAF_REPO=https://github.com/Netflix/vmaf/archive/refs/tags/v${VMAF_VER}.tar.gz -RUN cd /opt/build && \ - wget -O - ${LIBVMAF_REPO} | tar xz && ls -RUN cd /opt/build/vmaf-2.1.1/libvmaf && \ - ls && \ - (. /opt/rh/devtoolset-9/enable && meson build --prefix=/usr/local --libdir /usr/local/lib64 --buildtype=plain && \ - cd build && \ - ninja install && \ - DESTDIR=/opt/dist ninja install ) - RUN yum install -y wget tar gcc-c++ make git cmake3 # build svt-hevc @@ -263,7 +249,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib64 --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-gpl --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --disable-hwaccels --disable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libx264 --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libvmaf --enable-version3 --enable-libdav1d && make -j$(nproc) && \ + --extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --disable-hwaccels --disable-vaapi --enable-libv4l2 --enable-indev=v4l2 -rpath=/usr/local/ssl/lib --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libdav1d && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install diff --git a/Xeon/centos-7/media/ffmpeg/Dockerfile.m4 b/Xeon/centos-7/media/ffmpeg/Dockerfile.m4 index 48f728fcc..a137d0275 100644 --- a/Xeon/centos-7/media/ffmpeg/Dockerfile.m4 +++ b/Xeon/centos-7/media/ffmpeg/Dockerfile.m4 @@ -9,7 +9,6 @@ include(libvpx.m4) include(libx264.m4) include(libx265.m4) include(dav1d.m4) -include(libvmaf.m4) include(svt-hevc.m4) include(svt-av1.m4) include(svt-vp9.m4) diff --git a/Xeon/centos-7/media/gst/Dockerfile b/Xeon/centos-7/media/gst/Dockerfile index 59e8cd693..b97f68d69 100644 --- a/Xeon/centos-7/media/gst/Dockerfile +++ b/Xeon/centos-7/media/gst/Dockerfile @@ -363,7 +363,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib64 --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-gpl --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --disable-hwaccels --disable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libx264 --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libdav1d && make -j$(nproc) && \ + --extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --disable-hwaccels --disable-vaapi --enable-libv4l2 --enable-indev=v4l2 -rpath=/usr/local/ssl/lib --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libdav1d && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install diff --git a/Xeon/centos-7/service/owt-dev/Dockerfile b/Xeon/centos-7/service/owt-dev/Dockerfile index 42877f1a7..b83e54336 100644 --- a/Xeon/centos-7/service/owt-dev/Dockerfile +++ b/Xeon/centos-7/service/owt-dev/Dockerfile @@ -298,7 +298,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib64 --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-gpl --enable-nonfree --enable-libass --disable-xlib --disable-sdl2 --enable-vaapi --enable-openssl --extra-ldflags=-Wl,-rpath=/usr/local/ssl/lib --enable-libfdk-aac --enable-libvpx --enable-libx264 --enable-libsvthevc && make -j$(nproc) && \ + --extra-cflags=-w --enable-libass --disable-xlib --disable-sdl2 --enable-vaapi --enable-libfdk-aac --enable-libvpx --enable-gpl --enable-libx264 --enable-libsvthevc && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install diff --git a/Xeon/centos-7/service/owt-dev/Dockerfile.m4 b/Xeon/centos-7/service/owt-dev/Dockerfile.m4 index b6e309223..310ed5135 100644 --- a/Xeon/centos-7/service/owt-dev/Dockerfile.m4 +++ b/Xeon/centos-7/service/owt-dev/Dockerfile.m4 @@ -8,6 +8,7 @@ include(libx264.m4) include(opencv.m4) include(libva2.m4) include(dldt-ie.m4) +DECLARE(`FFMPEG_OPENSSL_NOBIND',true) include(ffmpeg.m4) include(gst-core.m4) include(owt-gst-base.m4) diff --git a/Xeon/centos-7/service/owt/Dockerfile b/Xeon/centos-7/service/owt/Dockerfile index 651a982f0..da72d40c1 100644 --- a/Xeon/centos-7/service/owt/Dockerfile +++ b/Xeon/centos-7/service/owt/Dockerfile @@ -299,7 +299,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib64 --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-gpl --enable-nonfree --enable-libass --disable-xlib --disable-sdl2 --enable-vaapi --enable-openssl --extra-ldflags=-Wl,-rpath=/usr/local/ssl/lib --enable-libfdk-aac --enable-libvpx --enable-libx264 --enable-libsvthevc && make -j$(nproc) && \ + --extra-cflags=-w --enable-libass --disable-xlib --disable-sdl2 --enable-vaapi --enable-libfdk-aac --enable-libvpx --enable-gpl --enable-libx264 --enable-libsvthevc && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install diff --git a/Xeon/centos-7/service/owt/Dockerfile.m4 b/Xeon/centos-7/service/owt/Dockerfile.m4 index 71fade9e0..a364af4e8 100644 --- a/Xeon/centos-7/service/owt/Dockerfile.m4 +++ b/Xeon/centos-7/service/owt/Dockerfile.m4 @@ -9,6 +9,7 @@ include(libx264.m4) include(opencv.m4) include(libva2.m4) include(dldt-ie.m4) +DECLARE(`FFMPEG_OPENSSL_NOBIND',true) include(ffmpeg.m4) include(gst-core.m4) include(owt-gst-base.m4) diff --git a/Xeon/centos-7/service/owt360/Dockerfile b/Xeon/centos-7/service/owt360/Dockerfile index 3d09a8958..5f2fed453 100644 --- a/Xeon/centos-7/service/owt360/Dockerfile +++ b/Xeon/centos-7/service/owt360/Dockerfile @@ -282,7 +282,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib64 --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-gpl --enable-nonfree --enable-libass --disable-xlib --disable-sdl2 --disable-hwaccels --disable-vaapi --enable-openssl --extra-ldflags=-Wl,-rpath=/usr/local/ssl/lib --enable-libfdk-aac --enable-libvpx --enable-libx264 --enable-libsvthevc && make -j$(nproc) && \ + --extra-cflags=-w --enable-libass --disable-xlib --disable-sdl2 --disable-hwaccels --disable-vaapi --enable-libfdk-aac --enable-libvpx --enable-gpl --enable-libx264 --enable-libsvthevc && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install diff --git a/Xeon/centos-7/service/owt360/Dockerfile.m4 b/Xeon/centos-7/service/owt360/Dockerfile.m4 index f989e5fe4..f1bdbfa34 100644 --- a/Xeon/centos-7/service/owt360/Dockerfile.m4 +++ b/Xeon/centos-7/service/owt360/Dockerfile.m4 @@ -8,6 +8,7 @@ include(libvpx.m4) include(libx264.m4) include(opencv.m4) include(dldt-ie.m4) +DECLARE(`FFMPEG_OPENSSL_NOBIND',true) include(ffmpeg.m4) include(scvp.m4) include(owt360.m4) diff --git a/Xeon/ubuntu-18.04/analytics/dev/Dockerfile b/Xeon/ubuntu-18.04/analytics/dev/Dockerfile index 6a53ab8a0..1c6565927 100644 --- a/Xeon/ubuntu-18.04/analytics/dev/Dockerfile +++ b/Xeon/ubuntu-18.04/analytics/dev/Dockerfile @@ -85,6 +85,24 @@ RUN cd /opt/build && \ make install DESTDIR=/opt/dist && \ make install +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + ca-certificates wget tar g++ make libtool autoconf && \ + rm -rf /var/lib/apt/lists/* + +# build openssl +ARG OPENSSL_REPO=https://github.com/openssl/openssl/archive/OpenSSL_1_1_1k.tar.gz +RUN cd /opt/build && \ + wget -O - ${OPENSSL_REPO} | tar xz && \ + cd openssl-OpenSSL_1_1_1k && \ + ./config no-ssl3 shared --prefix=/usr/local/ssl --openssldir=/usr/local/ssl -fPIC -Wl,-rpath=/usr/local/ssl/lib && \ + make depend && \ + make -s V=0 && \ + make install DESTDIR=/opt/dist && \ + (cd /opt/dist && mkdir -p ./usr/local/lib/pkgconfig && mv ./usr/local/ssl/lib/pkgconfig/*.pc ./usr/local/lib/pkgconfig/) && \ + make install && \ + (mkdir -p /usr/local/lib/pkgconfig && mv /usr/local/ssl/lib/pkgconfig/*.pc /usr/local/lib/pkgconfig/) + RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ ca-certificates wget g++ autoconf libtool autotools-dev automake make && \ @@ -161,53 +179,6 @@ RUN cd /opt/build && \ make install DESTDIR=/opt/dist && \ make install -RUN apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - git make autoconf && \ - rm -rf /var/lib/apt/lists/* - -# build libx264 -ARG LIBX264_REPO=https://github.com/mirror/x264 -RUN cd /opt/build && \ - git clone ${LIBX264_REPO} -b stable --depth 1 && \ - cd x264 && \ - ./configure --prefix=/usr/local --libdir=/usr/local/lib \ - --enable-shared && \ - make -j$(nproc) && \ - make install DESTDIR=/opt/dist && \ - make install - -RUN apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates wget tar g++ make && \ - rm -rf /var/lib/apt/lists/* - -# build yasm -ARG YASM_REPO=https://www.tortall.net/projects/yasm/releases/yasm-1.3.0.tar.gz -RUN cd /opt/build && \ - wget -O - ${YASM_REPO} | tar xz -RUN cd /opt/build/yasm-1.3.0 && \ - # TODO remove the line below whether no other component inside this project requires it. - # `sed -i "s/) ytasm.*/)/" Makefile.in' && \ - ./configure --prefix=/usr/local --libdir=/usr/local/lib && \ - make -j $(nproc) && \ - make install - -RUN apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - libnuma-dev make && \ - rm -rf /var/lib/apt/lists/* - -# build libx265 -ARG LIBX265_REPO=https://github.com/videolan/x265/archive/3.4.tar.gz -RUN cd /opt/build && \ - wget -O - ${LIBX265_REPO} | tar xz && \ - cd x265-3.4/build/linux && \ - cmake -DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX=/usr/local -DLIB_INSTALL_DIR=/usr/local/lib ../../source && \ - make -j$(nproc) && \ - make install DESTDIR=/opt/dist && \ - make install - RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ python3-pip ninja-build python3-setuptools && \ @@ -235,6 +206,22 @@ RUN cd /opt/build/dav1d-0.9.0 && \ ninja install && \ DESTDIR=/opt/dist ninja install +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + ca-certificates wget tar g++ make && \ + rm -rf /var/lib/apt/lists/* + +# build yasm +ARG YASM_REPO=https://www.tortall.net/projects/yasm/releases/yasm-1.3.0.tar.gz +RUN cd /opt/build && \ + wget -O - ${YASM_REPO} | tar xz +RUN cd /opt/build/yasm-1.3.0 && \ + # TODO remove the line below whether no other component inside this project requires it. + # `sed -i "s/) ytasm.*/)/" Makefile.in' && \ + ./configure --prefix=/usr/local --libdir=/usr/local/lib && \ + make -j $(nproc) && \ + make install + RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ ca-certificates wget tar g++ make git && \ @@ -506,7 +493,7 @@ RUN cd /opt/build/gst-plugins-good-1.19.1 && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates tar g++ wget pkg-config libglib2.0-dev flex bison gobject-introspection libgirepository1.0-dev openssl libcurl4-gnutls-dev librtmp-dev mjpegtools libde265-dev && \ + ca-certificates tar g++ wget pkg-config libglib2.0-dev flex bison gobject-introspection libgirepository1.0-dev libcurl4-gnutls-dev librtmp-dev mjpegtools libx265-dev libde265-dev && \ rm -rf /var/lib/apt/lists/* # build gst-plugin-bad @@ -535,7 +522,7 @@ RUN cd /opt/build && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates tar g++ wget pkg-config libglib2.0-dev flex bison && \ + ca-certificates tar g++ wget pkg-config libglib2.0-dev flex bison libx264-dev && \ rm -rf /var/lib/apt/lists/* # build gst-plugin-ugly @@ -576,7 +563,8 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-gpl --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --disable-hwaccels --disable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libx264 --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libdav1d && make -j$(nproc) && \ + --extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --disable-hwaccels --disable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-openssl --extra-ldflags=-Wldnl + --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libdav1d && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install @@ -751,6 +739,8 @@ RUN cd /opt/build/gst-python-1.19.1 && \ # cleanup RUN rm -rf /opt/dist/usr/local/share/doc /opt/dist/usr/local/share/gtk-doc RUN rm -rf /opt/dist/usr/local/share/man +RUN rm -rf /opt/dist/usr/local/ssl/share/man +RUN rm -rf /opt/dist/usr/local/ssl/share/doc RUN rm -rf /opt/dist/usr/local/openvino/inference-engine/external/tbb/doc FROM ubuntu:18.04 @@ -762,7 +752,7 @@ WORKDIR /home RUN apt-get update && apt-get upgrade -y systemd RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - libnuma1 libgtk-3-0 ocl-icd-libopencl1 libglib2.0-0 libx11-6 libxv1 libxt6 libasound2 libpangocairo-1.0-0 libcairo-gobject2 libtheora0 libvisual-0.4-0 libgl1-mesa-dri libgl1-mesa-glx libegl1-mesa libgdk-pixbuf2.0-0 libjpeg-turbo8 libpng16-16 zlib1g libsoup2.4-1 openssl libcurl3-gnutls librtmp1 mjpegtools libde265-0 libxcb-shape0 libxcb-xfixes0 libv4l-0 libass9 python3-gi python3-gi-cairo python3-dev python3-numpy libglib2.0-dev && \ + libgtk-3-0 libnuma1 ocl-icd-libopencl1 libglib2.0-0 libx11-6 libxv1 libxt6 libasound2 libpangocairo-1.0-0 libcairo-gobject2 libtheora0 libvisual-0.4-0 libgl1-mesa-dri libgl1-mesa-glx libegl1-mesa libgdk-pixbuf2.0-0 libjpeg-turbo8 libpng16-16 zlib1g libsoup2.4-1 libcurl3-gnutls librtmp1 mjpegtools libx265-142 libde265-0 libx264-155 libxcb-shape0 libxcb-xfixes0 libv4l-0 libass9 python3-gi python3-gi-cairo python3-dev python3-numpy libglib2.0-dev && \ rm -rf /var/lib/apt/lists/* ENV PKG_CONFIG_PATH=/usr/local/lib/pkgconfig diff --git a/Xeon/ubuntu-18.04/analytics/dev/Dockerfile.m4 b/Xeon/ubuntu-18.04/analytics/dev/Dockerfile.m4 index 46d8e1a14..247e41ede 100644 --- a/Xeon/ubuntu-18.04/analytics/dev/Dockerfile.m4 +++ b/Xeon/ubuntu-18.04/analytics/dev/Dockerfile.m4 @@ -3,12 +3,11 @@ include(ubuntu.m4) include(cmake.m4) include(libogg.m4) include(libvorbis.m4) +include(openssl.m4) ifelse(defn(`BUILD_FDKAAC'),`ON',`include(libfdk-aac.m4)') include(libopus.m4) include(libvpx.m4) include(libaom.m4) -include(libx264.m4) -include(libx265.m4) include(meson.m4) include(dav1d.m4) include(svt-hevc.m4) diff --git a/Xeon/ubuntu-18.04/analytics/ffmpeg/Dockerfile b/Xeon/ubuntu-18.04/analytics/ffmpeg/Dockerfile index e0fa7ad26..5e789b786 100644 --- a/Xeon/ubuntu-18.04/analytics/ffmpeg/Dockerfile +++ b/Xeon/ubuntu-18.04/analytics/ffmpeg/Dockerfile @@ -436,7 +436,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-gpl --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --disable-hwaccels --disable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libx264 --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libdav1d && make -j$(nproc) && \ + --extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --disable-hwaccels --disable-vaapi --enable-libv4l2 --enable-indev=v4l2 -rpath=/usr/local/ssl/lib --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libdav1d && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install diff --git a/Xeon/ubuntu-18.04/analytics/gst/Dockerfile b/Xeon/ubuntu-18.04/analytics/gst/Dockerfile index b7a04e1d5..589c7ed8a 100644 --- a/Xeon/ubuntu-18.04/analytics/gst/Dockerfile +++ b/Xeon/ubuntu-18.04/analytics/gst/Dockerfile @@ -576,7 +576,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-gpl --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --disable-hwaccels --disable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libx264 --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libdav1d && make -j$(nproc) && \ + --extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --disable-hwaccels --disable-vaapi --enable-libv4l2 --enable-indev=v4l2 -rpath=/usr/local/ssl/lib --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libdav1d && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install diff --git a/Xeon/ubuntu-18.04/media/dev/Dockerfile b/Xeon/ubuntu-18.04/media/dev/Dockerfile index f73c199ba..7d140d5c8 100644 --- a/Xeon/ubuntu-18.04/media/dev/Dockerfile +++ b/Xeon/ubuntu-18.04/media/dev/Dockerfile @@ -72,6 +72,24 @@ RUN cd /opt/build && \ make install DESTDIR=/opt/dist && \ make install +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + ca-certificates wget tar g++ make libtool autoconf && \ + rm -rf /var/lib/apt/lists/* + +# build openssl +ARG OPENSSL_REPO=https://github.com/openssl/openssl/archive/OpenSSL_1_1_1k.tar.gz +RUN cd /opt/build && \ + wget -O - ${OPENSSL_REPO} | tar xz && \ + cd openssl-OpenSSL_1_1_1k && \ + ./config no-ssl3 shared --prefix=/usr/local/ssl --openssldir=/usr/local/ssl -fPIC -Wl,-rpath=/usr/local/ssl/lib && \ + make depend && \ + make -s V=0 && \ + make install DESTDIR=/opt/dist && \ + (cd /opt/dist && mkdir -p ./usr/local/lib/pkgconfig && mv ./usr/local/ssl/lib/pkgconfig/*.pc ./usr/local/lib/pkgconfig/) && \ + make install && \ + (mkdir -p /usr/local/lib/pkgconfig && mv /usr/local/ssl/lib/pkgconfig/*.pc /usr/local/lib/pkgconfig/) + RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ ca-certificates wget g++ autoconf libtool autotools-dev automake make && \ @@ -148,53 +166,6 @@ RUN cd /opt/build && \ make install DESTDIR=/opt/dist && \ make install -RUN apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - git cmake make autoconf && \ - rm -rf /var/lib/apt/lists/* - -# build libx264 -ARG LIBX264_REPO=https://github.com/mirror/x264 -RUN cd /opt/build && \ - git clone ${LIBX264_REPO} -b stable --depth 1 && \ - cd x264 && \ - ./configure --prefix=/usr/local --libdir=/usr/local/lib \ - --enable-shared && \ - make -j$(nproc) && \ - make install DESTDIR=/opt/dist && \ - make install - -RUN apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates wget tar g++ make && \ - rm -rf /var/lib/apt/lists/* - -# build yasm -ARG YASM_REPO=https://www.tortall.net/projects/yasm/releases/yasm-1.3.0.tar.gz -RUN cd /opt/build && \ - wget -O - ${YASM_REPO} | tar xz -RUN cd /opt/build/yasm-1.3.0 && \ - # TODO remove the line below whether no other component inside this project requires it. - # `sed -i "s/) ytasm.*/)/" Makefile.in' && \ - ./configure --prefix=/usr/local --libdir=/usr/local/lib && \ - make -j $(nproc) && \ - make install - -RUN apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - libnuma-dev cmake make && \ - rm -rf /var/lib/apt/lists/* - -# build libx265 -ARG LIBX265_REPO=https://github.com/videolan/x265/archive/3.4.tar.gz -RUN cd /opt/build && \ - wget -O - ${LIBX265_REPO} | tar xz && \ - cd x265-3.4/build/linux && \ - cmake -DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX=/usr/local -DLIB_INSTALL_DIR=/usr/local/lib ../../source && \ - make -j$(nproc) && \ - make install DESTDIR=/opt/dist && \ - make install - RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ python3-pip ninja-build python3-setuptools && \ @@ -224,20 +195,19 @@ RUN cd /opt/build/dav1d-0.9.0 && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates tar g++ wget pkg-config ninja-build && \ + ca-certificates wget tar g++ make && \ rm -rf /var/lib/apt/lists/* -# build VMAF -ARG VMAF_VER=2.1.1 -ARG LIBVMAF_REPO=https://github.com/Netflix/vmaf/archive/refs/tags/v${VMAF_VER}.tar.gz +# build yasm +ARG YASM_REPO=https://www.tortall.net/projects/yasm/releases/yasm-1.3.0.tar.gz RUN cd /opt/build && \ - wget -O - ${LIBVMAF_REPO} | tar xz && ls -RUN cd /opt/build/vmaf-2.1.1/libvmaf && \ - ls && \ - meson build --prefix=/usr/local --libdir /usr/local/lib --buildtype=plain && \ - cd build && \ - ninja install && \ - DESTDIR=/opt/dist ninja install + wget -O - ${YASM_REPO} | tar xz +RUN cd /opt/build/yasm-1.3.0 && \ + # TODO remove the line below whether no other component inside this project requires it. + # `sed -i "s/) ytasm.*/)/" Makefile.in' && \ + ./configure --prefix=/usr/local --libdir=/usr/local/lib && \ + make -j $(nproc) && \ + make install RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ @@ -365,7 +335,7 @@ RUN cd /opt/build/gst-plugins-good-1.19.1 && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates tar g++ wget pkg-config libglib2.0-dev flex bison gobject-introspection libgirepository1.0-dev openssl libcurl4-gnutls-dev librtmp-dev mjpegtools libde265-dev && \ + ca-certificates tar g++ wget pkg-config libglib2.0-dev flex bison gobject-introspection libgirepository1.0-dev libcurl4-gnutls-dev librtmp-dev mjpegtools libx265-dev libde265-dev && \ rm -rf /var/lib/apt/lists/* # build gst-plugin-bad @@ -394,7 +364,7 @@ RUN cd /opt/build && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates tar g++ wget pkg-config libglib2.0-dev flex bison && \ + ca-certificates tar g++ wget pkg-config libglib2.0-dev flex bison libx264-dev && \ rm -rf /var/lib/apt/lists/* # build gst-plugin-ugly @@ -435,7 +405,8 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-gpl --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --disable-hwaccels --disable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libx264 --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libvmaf --enable-version3 --enable-libdav1d && make -j$(nproc) && \ + --extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --disable-hwaccels --disable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-openssl --extra-ldflags=-Wldnl + --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libdav1d && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install @@ -480,6 +451,8 @@ RUN cd /opt/build/SVT-VP9/gstreamer-plugin && \ # cleanup RUN rm -rf /opt/dist/usr/local/share/doc /opt/dist/usr/local/share/gtk-doc RUN rm -rf /opt/dist/usr/local/share/man +RUN rm -rf /opt/dist/usr/local/ssl/share/man +RUN rm -rf /opt/dist/usr/local/ssl/share/doc FROM ubuntu:18.04 LABEL Description="This is the base image for Gstreamer ubuntu 18.04" @@ -490,7 +463,7 @@ WORKDIR /home RUN apt-get update && apt-get upgrade -y systemd RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - libnuma1 libglib2.0-0 libx11-6 libxv1 libxt6 libasound2 libpangocairo-1.0-0 libcairo-gobject2 libtheora0 libvisual-0.4-0 libgl1-mesa-dri libgl1-mesa-glx libegl1-mesa libgdk-pixbuf2.0-0 libjpeg-turbo8 libpng16-16 zlib1g libsoup2.4-1 openssl libcurl3-gnutls librtmp1 mjpegtools libde265-0 libxcb-shape0 libxcb-xfixes0 libv4l-0 libass9 && \ + libglib2.0-0 libx11-6 libxv1 libxt6 libasound2 libpangocairo-1.0-0 libcairo-gobject2 libtheora0 libvisual-0.4-0 libgl1-mesa-dri libgl1-mesa-glx libegl1-mesa libgdk-pixbuf2.0-0 libjpeg-turbo8 libpng16-16 zlib1g libsoup2.4-1 libcurl3-gnutls librtmp1 mjpegtools libx265-142 libde265-0 libx264-155 libxcb-shape0 libxcb-xfixes0 libv4l-0 libass9 && \ rm -rf /var/lib/apt/lists/* ENV PKG_CONFIG_PATH=/usr/local/lib/pkgconfig diff --git a/Xeon/ubuntu-18.04/media/dev/Dockerfile.m4 b/Xeon/ubuntu-18.04/media/dev/Dockerfile.m4 index be2d9b3a7..37ec67371 100644 --- a/Xeon/ubuntu-18.04/media/dev/Dockerfile.m4 +++ b/Xeon/ubuntu-18.04/media/dev/Dockerfile.m4 @@ -3,15 +3,13 @@ include(begin.m4) include(ubuntu.m4) include(libogg.m4) include(libvorbis.m4) +include(openssl.m4) ifelse(defn(`BUILD_FDKAAC'),`ON',`include(libfdk-aac.m4)') include(libopus.m4) include(libvpx.m4) include(libaom.m4) -include(libx264.m4) -include(libx265.m4) include(meson.m4) include(dav1d.m4) -include(libvmaf.m4) include(svt-hevc.m4) include(svt-av1.m4) include(svt-vp9.m4) diff --git a/Xeon/ubuntu-18.04/media/ffmpeg-vmaf/.dockerignore b/Xeon/ubuntu-18.04/media/ffmpeg-vmaf/.dockerignore new file mode 100644 index 000000000..1cb8a04d9 --- /dev/null +++ b/Xeon/ubuntu-18.04/media/ffmpeg-vmaf/.dockerignore @@ -0,0 +1,4 @@ +CMakeLists.txt +*.sh +*.m4 +test/* diff --git a/Xeon/ubuntu-18.04/media/ffmpeg-vmaf/CMakeLists.txt b/Xeon/ubuntu-18.04/media/ffmpeg-vmaf/CMakeLists.txt new file mode 100644 index 000000000..b564746a2 --- /dev/null +++ b/Xeon/ubuntu-18.04/media/ffmpeg-vmaf/CMakeLists.txt @@ -0,0 +1,3 @@ +set(image "xeon_ffmpeg_vmaf_ubuntu1804") +include(image) +include(ffmpeg-tests) diff --git a/Xeon/ubuntu-18.04/media/ffmpeg-vmaf/Dockerfile b/Xeon/ubuntu-18.04/media/ffmpeg-vmaf/Dockerfile new file mode 100644 index 000000000..6f4fe9453 --- /dev/null +++ b/Xeon/ubuntu-18.04/media/ffmpeg-vmaf/Dockerfile @@ -0,0 +1,365 @@ + + +# BSD 3-Clause License +# +# Copyright (c) 2021, Intel Corporation +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are met: +# +# * Redistributions of source code must retain the above copyright notice, this +# list of conditions and the following disclaimer. +# +# * Redistributions in binary form must reproduce the above copyright notice, +# this list of conditions and the following disclaimer in the documentation +# and/or other materials provided with the distribution. +# +# * Neither the name of the copyright holder nor the names of its +# contributors may be used to endorse or promote products derived from +# this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +# This file is automatically generated from .m4 template. +# To update, modify the template and regenerate. +FROM ubuntu:18.04 AS build + + +RUN mkdir -p /opt/build && mkdir -p /opt/dist + +ENV PKG_CONFIG_PATH=/usr/local/lib/pkgconfig + +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + ca-certificates wget make autoconf automake g++ && \ + rm -rf /var/lib/apt/lists/* + +# build libogg +ARG OGG_VER=1.3.5 +ARG LIBOGG_REPO=https://github.com/xiph/ogg/releases/download/v${OGG_VER}/libogg-1.3.5.tar.gz + +RUN cd /opt/build && \ + wget -O - ${LIBOGG_REPO} | tar xz && \ + cd libogg-1.3.5 && \ + ./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared && \ + make -j$(nproc) && \ + make install DESTDIR=/opt/dist && \ + make install + +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + ca-certificates wget make autoconf automake && \ + rm -rf /var/lib/apt/lists/* + +# build libvorbis +ARG VORBIS_VER=1.3.7 +ARG LIBVORBIS_REPO=https://github.com/xiph/vorbis/releases/download/v${VORBIS_VER}/libvorbis-1.3.7.tar.gz +RUN cd /opt/build && \ + wget -O - ${LIBVORBIS_REPO} | tar xz && \ + cd libvorbis-1.3.7 && \ + ./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared && \ + make -j$(nproc) && \ + make install DESTDIR=/opt/dist && \ + make install + +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + ca-certificates wget g++ autoconf libtool autotools-dev automake make && \ + rm -rf /var/lib/apt/lists/* + +# build libfdkaac +ARG LIBFDKAAC_REPO=https://github.com/mstorsjo/fdk-aac/archive/v2.0.2.tar.gz +RUN cd /opt/build && \ + wget -O - ${LIBFDKAAC_REPO} | tar xz && \ + cd fdk-aac-2.0.2 && \ + ./autogen.sh && \ + ./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared && \ + make -j$(nproc) && \ + make install DESTDIR=/opt/dist && \ + make install + +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + ca-certificates wget autoconf libtool make && \ + rm -rf /var/lib/apt/lists/* + +# build libopus +ARG LIBOPUS_REPO=https://archive.mozilla.org/pub/opus/opus-1.3.1.tar.gz +RUN cd /opt/build && \ + wget -O - ${LIBOPUS_REPO} | tar xz && \ + cd opus-1.3.1 && \ + ./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared && \ + make -j$(nproc) && \ + make install DESTDIR=/opt/dist && \ + make install + +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + ca-certificates wget tar g++ make bzip2 && \ + rm -rf /var/lib/apt/lists/* + +# build nasm +ARG NASM_REPO=https://www.nasm.us/pub/nasm/releasebuilds/2.15.05/nasm-2.15.05.tar.bz2 +RUN cd /opt/build && \ + wget -O - ${NASM_REPO} | tar xj && \ + cd nasm-2.15.05 && \ + ./autogen.sh && \ + ./configure --prefix=/usr/local --libdir=/usr/local/lib && \ + make -j$(nproc) && \ + make install + +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + git cmake make autoconf && \ + rm -rf /var/lib/apt/lists/* + +# build libvpx +ARG LIBVPX_REPO=https://chromium.googlesource.com/webm/libvpx.git +RUN cd /opt/build && \ + git clone ${LIBVPX_REPO} -b v1.10.0 --depth 1 && \ + cd libvpx && \ + ./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-examples --disable-unit-tests --enable-vp9-highbitdepth --as=nasm && \ + make -j$(nproc) && \ + make install DESTDIR=/opt/dist && \ + make install + +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + git cmake make autoconf && \ + rm -rf /var/lib/apt/lists/* + +# build libx264 +ARG LIBX264_REPO=https://github.com/mirror/x264 +RUN cd /opt/build && \ + git clone ${LIBX264_REPO} -b stable --depth 1 && \ + cd x264 && \ + ./configure --prefix=/usr/local --libdir=/usr/local/lib \ + --enable-shared && \ + make -j$(nproc) && \ + make install DESTDIR=/opt/dist && \ + make install + +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + ca-certificates wget tar g++ make && \ + rm -rf /var/lib/apt/lists/* + +# build yasm +ARG YASM_REPO=https://www.tortall.net/projects/yasm/releases/yasm-1.3.0.tar.gz +RUN cd /opt/build && \ + wget -O - ${YASM_REPO} | tar xz +RUN cd /opt/build/yasm-1.3.0 && \ + # TODO remove the line below whether no other component inside this project requires it. + # `sed -i "s/) ytasm.*/)/" Makefile.in' && \ + ./configure --prefix=/usr/local --libdir=/usr/local/lib && \ + make -j $(nproc) && \ + make install + +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + libnuma-dev cmake make && \ + rm -rf /var/lib/apt/lists/* + +# build libx265 +ARG LIBX265_REPO=https://github.com/videolan/x265/archive/3.4.tar.gz +RUN cd /opt/build && \ + wget -O - ${LIBX265_REPO} | tar xz && \ + cd x265-3.4/build/linux && \ + cmake -DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX=/usr/local -DLIB_INSTALL_DIR=/usr/local/lib ../../source && \ + make -j$(nproc) && \ + make install DESTDIR=/opt/dist && \ + make install + +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + python3-pip ninja-build python3-setuptools && \ + rm -rf /var/lib/apt/lists/* + +# build meson +ARG MESON_REPO=https://github.com/mesonbuild/meson +RUN git clone ${MESON_REPO}; \ + cd meson; \ + git checkout 0.58.1; \ + python3 setup.py install; + +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + ca-certificates tar g++ wget pkg-config && \ + rm -rf /var/lib/apt/lists/* + +# build dav1d +ARG DAV1D_REPO=https://code.videolan.org/videolan/dav1d/-/archive/0.9.0/dav1d-0.9.0.tar.gz +RUN cd /opt/build && \ + wget -O - ${DAV1D_REPO} | tar xz +RUN cd /opt/build/dav1d-0.9.0 && \ + meson build --prefix=/usr/local --libdir /usr/local/lib --buildtype=plain && \ + cd build && \ + ninja install && \ + DESTDIR=/opt/dist ninja install + +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + ca-certificates tar g++ wget pkg-config ninja-build && \ + rm -rf /var/lib/apt/lists/* + +# build VMAF +ARG VMAF_VER=2.1.1 +ARG LIBVMAF_REPO=https://github.com/Netflix/vmaf/archive/refs/tags/v${VMAF_VER}.tar.gz +RUN cd /opt/build && \ + wget -O - ${LIBVMAF_REPO} | tar xz && ls +RUN cd /opt/build/vmaf-2.1.1/libvmaf && \ + ls && \ + meson build --prefix=/usr/local --libdir /usr/local/lib --buildtype=plain && \ + cd build && \ + ninja install && \ + DESTDIR=/opt/dist ninja install + +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + ca-certificates wget tar g++ make cmake git && \ + rm -rf /var/lib/apt/lists/* + +# build svt-hevc +ARG SVT_HEVC_REPO=https://github.com/OpenVisualCloud/SVT-HEVC +RUN cd /opt/build && \ + git clone -b v1.5.1 --depth 1 ${SVT_HEVC_REPO} +RUN cd /opt/build/SVT-HEVC/Build/linux && \ + cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_INSTALL_LIBDIR=/usr/local/lib -DCMAKE_ASM_NASM_COMPILER=yasm ../.. && \ + make -j $(nproc) && \ + make install DESTDIR=/opt/dist && \ + make install + +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + ca-certificates wget tar g++ make cmake git && \ + rm -rf /var/lib/apt/lists/* + +# build svt av1 +ARG SVT_AV1_REPO=https://gitlab.com/AOMediaCodec/SVT-AV1/-/archive/v0.8.7/SVT-AV1-v0.8.7.tar.gz +RUN cd /opt/build && \ + wget -O - ${SVT_AV1_REPO} | tar zx && \ + mv SVT-AV1-v0.8.7 SVT-AV1 && \ + cd SVT-AV1/Build/linux && \ + cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_INSTALL_LIBDIR=/usr/local/lib -DCMAKE_ASM_NASM_COMPILER=yasm ../.. && \ + make -j $(nproc) && \ + sed -i "s/SvtAv1dec/SvtAv1Dec/" SvtAv1Dec.pc && \ + make install DESTDIR=/opt/dist && \ + make install + +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + ca-certificates wget tar g++ make cmake git && \ + rm -rf /var/lib/apt/lists/* + +# build svt vp9 +ARG SVT_VP9_REPO=https://github.com/OpenVisualCloud/SVT-VP9 +RUN cd /opt/build && \ + git clone ${SVT_VP9_REPO} -b v0.2.2 --depth 1 && \ + cd SVT-VP9/Build/linux && \ + cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_INSTALL_LIBDIR=/usr/local/lib -DCMAKE_ASM_NASM_COMPILER=yasm ../.. && \ + make -j $(nproc) && \ + make install DESTDIR=/opt/dist && \ + make install + +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + ca-certificates cmake gcc g++ make wget python3-numpy ccache libeigen3-dev && \ + rm -rf /var/lib/apt/lists/* + +# build opencv +ARG OPENCV_REPO=https://github.com/opencv/opencv/archive/4.5.2.tar.gz +RUN cd /opt/build && \ + wget -O - ${OPENCV_REPO} | tar xz +# TODO: file a bug against opencv since they do not accept full libdir +RUN cd /opt/build/opencv-4.5.2 && mkdir build && cd build && \ + cmake \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr/local \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DOPENCV_GENERATE_PKGCONFIG=ON \ + -DBUILD_DOCS=OFF \ + -DBUILD_EXAMPLES=OFF \ + -DBUILD_PERF_TESTS=OFF \ + -DBUILD_TESTS=OFF \ + .. && \ + make -j $(nproc) && \ + make install DESTDIR=/opt/dist && \ + make install + +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + build-essential ca-certificates wget patch libv4l-dev libass-dev && \ + rm -rf /var/lib/apt/lists/* + +# build ffmpeg +ARG FFMPEG_REPO=https://github.com/FFmpeg/FFmpeg/archive/n4.4.tar.gz +RUN cd /opt/build && \ + wget -O - ${FFMPEG_REPO} | tar xz + +RUN cd /opt/build/FFmpeg-n4.4 && \ + patch -p1 < /opt/build/SVT-HEVC/ffmpeg_plugin/n4.4-0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch || true +#ifdef(`BUILD_SVT_VP9',`FFMPEG_PATCH_SVT_VP9(BUILD_HOME/FFmpeg-FFMPEG_VER)')dnl +#ifdef(`BUILD_DLDT',`FFMPEG_PATCH_ANALYTICS(BUILD_HOME/FFmpeg-FFMPEG_VER)')dnl +#ifdef(`BUILD_OPENVINO',`FFMPEG_PATCH_ANALYTICS(BUILD_HOME/FFmpeg-FFMPEG_VER)')dnl + + +ARG FFMPEG_1TN_PATCH_REPO=https://raw.githubusercontent.com/OpenVisualCloud/Dockerfiles-Resources/master/n4.4-enhance_1tn_performance.patch +RUN cd /opt/build/FFmpeg-n4.4 && \ + wget -O - ${FFMPEG_1TN_PATCH_REPO} | patch -p1; + +RUN cd /opt/build/FFmpeg-n4.4 && \ + ./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-static --disable-doc --disable-htmlpages \ + --disable-manpages --disable-podpages --disable-txtpages \ + --extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --disable-hwaccels --disable-vaapi --enable-libv4l2 --enable-indev=v4l2 -rpath=/usr/local/ssl/lib --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libvmaf --enable-version3 --enable-libdav1d && make -j$(nproc) && \ + make install DESTDIR=/opt/dist && \ + make install + +RUN cd /opt/build/opencv-4.5.2/build && \ + rm -rf ./* && \ + cmake \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr/local \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DOPENCV_GENERATE_PKGCONFIG=ON \ + -DBUILD_DOCS=OFF \ + -DBUILD_EXAMPLES=OFF \ + -DBUILD_PERF_TESTS=OFF \ + -DBUILD_TESTS=OFF \ + .. && \ + cd modules/videoio && \ + make -j $(nproc) && \ + cp -f ../../lib/libopencv_videoio.so.4.5.2 /opt/dist/usr/local/lib + +# cleanup +RUN rm -rf /opt/dist/usr/local/include && \ + rm -rf /opt/dist/usr/local/lib/pkgconfig && \ + find /opt/dist -name "*.a" -exec rm -f {} \; || echo "" +RUN rm -rf /opt/dist/usr/local/share/doc /opt/dist/usr/local/share/gtk-doc +RUN rm -rf /opt/dist/usr/local/share/man + +FROM ubuntu:18.04 +LABEL Description="This is the base image for FFMPEG ubuntu 18.04" +LABEL Vendor="Intel Corporation" +WORKDIR /home + +# Install +RUN apt-get update && apt-get upgrade -y systemd +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + libnuma1 libxcb-shape0 libxcb-xfixes0 libv4l-0 libass9 && \ + rm -rf /var/lib/apt/lists/* + +COPY --from=build /opt/dist / +RUN echo "/usr/local/lib" >> /etc/ld.so.conf.d/all-libs.conf && ldconfig + + diff --git a/Xeon/ubuntu-18.04/media/ffmpeg-vmaf/Dockerfile.m4 b/Xeon/ubuntu-18.04/media/ffmpeg-vmaf/Dockerfile.m4 new file mode 100644 index 000000000..3346515cc --- /dev/null +++ b/Xeon/ubuntu-18.04/media/ffmpeg-vmaf/Dockerfile.m4 @@ -0,0 +1,34 @@ + +include(begin.m4) +include(ubuntu.m4) +include(libogg.m4) +include(libvorbis.m4) +ifelse(defn(`BUILD_FDKAAC'),`ON',`include(libfdk-aac.m4)') +include(libopus.m4) +include(libvpx.m4) +include(libx264.m4) +include(libx265.m4) +include(meson.m4) +include(dav1d.m4) +include(libvmaf.m4) +include(svt-hevc.m4) +include(svt-av1.m4) +include(svt-vp9.m4) +include(opencv.m4) +include(ffmpeg.m4) +include(end.m4)dnl + +PREAMBLE +FROM OS_NAME:OS_VERSION AS build + +BUILD_ALL()dnl +CLEANUP()dnl + +FROM OS_NAME:OS_VERSION +LABEL Description="This is the base image for FFMPEG OS_NAME OS_VERSION" +LABEL Vendor="Intel Corporation" +WORKDIR /home + +# Install +UPGRADE_UBUNTU_COMPONENTS() +INSTALL_ALL(runtime,build) diff --git a/Xeon/ubuntu-18.04/media/ffmpeg-vmaf/README.md b/Xeon/ubuntu-18.04/media/ffmpeg-vmaf/README.md new file mode 100644 index 000000000..e13f76ea8 --- /dev/null +++ b/Xeon/ubuntu-18.04/media/ffmpeg-vmaf/README.md @@ -0,0 +1,43 @@ +This docker image is part of Open Visual Cloud software stacks. Optimized for the media creation and delivery use case. Included FFmpeg and codecs such as opus, ogg, vorbis, x264, x265, vp8/9, av1 and SVT-HEVC. The docker image can be used in the FROM field of a downstream Dockerfile. + +## Supported tags and respective Dockerfile links + - [xeon-ubuntu-1804-media-ffmpeg](https://github.com/OpenVisualCloud/Dockerfiles/blob/v21.3/Xeon/ubuntu-18.04/media/ffmpeg/Dockerfile) + +## Quick reference +- #### Supported platform and OS + Intel® Xeon® platform, Ubuntu 18.04 + +- #### Usage instructions: + [FFmpeg](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/doc/ffmpeg.md) + + +- #### Getting started with Dockerfiles: + [OpenVisualCloud Dockerfiles Wiki](https://github.com/OpenVisualCloud/Dockerfiles/wiki) + +- #### File issues: + [OpenVisualCloud Dockerfiles Issues](https://github.com/OpenVisualCloud/Dockerfiles/issues) + + +## License +This docker installs third party components licensed under various open source licenses. The terms under which those components may be used and distributed can be found with the license document that is provided with those components. Please familiarize yourself with those terms to ensure your distribution of those components complies with the terms of those licenses. + + +| Components | License | +| ----- | ----- | +|Ubuntu| [Various](https://hub.docker.com/_/ubuntu) | +|libogg|BSD 3-clause "New" or "Revised" License| +|libvorbis|BSD 3-clause "New" or "Revised" License| +|Opus Interactive Audio Codec|BSD 3-clause "New" or "Revised" License| +|libvpx|BSD 3-clause "New" or "Revised" License| +|x264|GNU General Public License v2.0 or later| +|x265|GNU General Public License v2.0 or later| +|dav1d|BSD 2-clause "Simplified" License| +|Intel SVT-HEVC|BSD-2-Clause Plus Patent License| +|Intel SVT-AV1|BSD-2-Clause Plus Patent License| +|Intel SVT-VP9|BSD-2-Clause Plus Patent License| +|OpenCV|BSD 3-clause "New" or "Revised" License| +|FFmpeg|GNU Lesser General Public License v2.1 or later| + + +More license information can be found in [components source package](https://github.com/OpenVisualCloud/Dockerfiles-Resources). +As for any pre-built image usage, it is the image user's responsibility to ensure that any use of this image complies with any relevant licenses and potential fees for all software contained within. We will have no indemnity or warranty coverage from suppliers. diff --git a/Xeon/ubuntu-18.04/media/ffmpeg-vmaf/build.sh b/Xeon/ubuntu-18.04/media/ffmpeg-vmaf/build.sh new file mode 100755 index 000000000..b454af0f4 --- /dev/null +++ b/Xeon/ubuntu-18.04/media/ffmpeg-vmaf/build.sh @@ -0,0 +1,6 @@ +#!/bin/bash -e + +IMAGE="xeon-ubuntu1804-media-ffmpeg-vmaf" +DIR=$(dirname $(readlink -f "$0")) + +. "${DIR}/../../../../script/build.sh" diff --git a/Xeon/ubuntu-18.04/media/ffmpeg-vmaf/shell.sh b/Xeon/ubuntu-18.04/media/ffmpeg-vmaf/shell.sh new file mode 100755 index 000000000..013a56c64 --- /dev/null +++ b/Xeon/ubuntu-18.04/media/ffmpeg-vmaf/shell.sh @@ -0,0 +1,6 @@ +#!/bin/bash -e + +IMAGE="xeon-ubuntu1804-media-ffmpeg-vmaf" +DIR=$(dirname $(readlink -f "$0")) + +. "${DIR}/../../../../script/shell.sh" diff --git a/Xeon/ubuntu-18.04/media/ffmpeg/Dockerfile b/Xeon/ubuntu-18.04/media/ffmpeg/Dockerfile index a2d2e05c6..faf973a8e 100644 --- a/Xeon/ubuntu-18.04/media/ffmpeg/Dockerfile +++ b/Xeon/ubuntu-18.04/media/ffmpeg/Dockerfile @@ -207,23 +207,6 @@ RUN cd /opt/build/dav1d-0.9.0 && \ ninja install && \ DESTDIR=/opt/dist ninja install -RUN apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates tar g++ wget pkg-config ninja-build && \ - rm -rf /var/lib/apt/lists/* - -# build VMAF -ARG VMAF_VER=2.1.1 -ARG LIBVMAF_REPO=https://github.com/Netflix/vmaf/archive/refs/tags/v${VMAF_VER}.tar.gz -RUN cd /opt/build && \ - wget -O - ${LIBVMAF_REPO} | tar xz && ls -RUN cd /opt/build/vmaf-2.1.1/libvmaf && \ - ls && \ - meson build --prefix=/usr/local --libdir /usr/local/lib --buildtype=plain && \ - cd build && \ - ninja install && \ - DESTDIR=/opt/dist ninja install - RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ ca-certificates wget tar g++ make cmake git && \ @@ -320,7 +303,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-gpl --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --disable-hwaccels --disable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libx264 --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libvmaf --enable-version3 --enable-libdav1d && make -j$(nproc) && \ + --extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --disable-hwaccels --disable-vaapi --enable-libv4l2 --enable-indev=v4l2 -rpath=/usr/local/ssl/lib --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libdav1d && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install diff --git a/Xeon/ubuntu-18.04/media/ffmpeg/Dockerfile.m4 b/Xeon/ubuntu-18.04/media/ffmpeg/Dockerfile.m4 index 3346515cc..a50b3c845 100644 --- a/Xeon/ubuntu-18.04/media/ffmpeg/Dockerfile.m4 +++ b/Xeon/ubuntu-18.04/media/ffmpeg/Dockerfile.m4 @@ -10,7 +10,6 @@ include(libx264.m4) include(libx265.m4) include(meson.m4) include(dav1d.m4) -include(libvmaf.m4) include(svt-hevc.m4) include(svt-av1.m4) include(svt-vp9.m4) diff --git a/Xeon/ubuntu-18.04/media/gst/Dockerfile b/Xeon/ubuntu-18.04/media/gst/Dockerfile index 189fc90fd..98711c882 100644 --- a/Xeon/ubuntu-18.04/media/gst/Dockerfile +++ b/Xeon/ubuntu-18.04/media/gst/Dockerfile @@ -418,7 +418,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-gpl --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --disable-hwaccels --disable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libx264 --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libdav1d && make -j$(nproc) && \ + --extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --disable-hwaccels --disable-vaapi --enable-libv4l2 --enable-indev=v4l2 -rpath=/usr/local/ssl/lib --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libdav1d && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install diff --git a/Xeon/ubuntu-18.04/service/owt-dev/Dockerfile b/Xeon/ubuntu-18.04/service/owt-dev/Dockerfile index 1bb88ce9d..861418019 100644 --- a/Xeon/ubuntu-18.04/service/owt-dev/Dockerfile +++ b/Xeon/ubuntu-18.04/service/owt-dev/Dockerfile @@ -310,7 +310,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-gpl --enable-nonfree --enable-libass --disable-xlib --disable-sdl2 --disable-hwaccels --disable-vaapi --enable-openssl --extra-ldflags=-Wl,-rpath=/usr/local/ssl/lib --enable-libfdk-aac --enable-libvpx --enable-libx264 --enable-libsvthevc && make -j$(nproc) && \ + --extra-cflags=-w --enable-libass --disable-xlib --disable-sdl2 --disable-hwaccels --disable-vaapi --enable-libfdk-aac --enable-libvpx --enable-gpl --enable-libx264 --enable-libsvthevc && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install diff --git a/Xeon/ubuntu-18.04/service/owt-dev/Dockerfile.m4 b/Xeon/ubuntu-18.04/service/owt-dev/Dockerfile.m4 index c6c6880da..7d21783f0 100644 --- a/Xeon/ubuntu-18.04/service/owt-dev/Dockerfile.m4 +++ b/Xeon/ubuntu-18.04/service/owt-dev/Dockerfile.m4 @@ -9,6 +9,7 @@ include(libvpx.m4) include(libx264.m4) include(opencv.m4) include(dldt-ie.m4) +DECLARE(`FFMPEG_OPENSSL_NOBIND',true) include(ffmpeg.m4) include(meson.m4) include(gst-core.m4) diff --git a/Xeon/ubuntu-18.04/service/owt/Dockerfile b/Xeon/ubuntu-18.04/service/owt/Dockerfile index 6f256db71..5b76cd27e 100644 --- a/Xeon/ubuntu-18.04/service/owt/Dockerfile +++ b/Xeon/ubuntu-18.04/service/owt/Dockerfile @@ -310,7 +310,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-gpl --enable-nonfree --enable-libass --disable-xlib --disable-sdl2 --disable-hwaccels --disable-vaapi --enable-openssl --extra-ldflags=-Wl,-rpath=/usr/local/ssl/lib --enable-libfdk-aac --enable-libvpx --enable-libx264 --enable-libsvthevc && make -j$(nproc) && \ + --extra-cflags=-w --enable-libass --disable-xlib --disable-sdl2 --disable-hwaccels --disable-vaapi --enable-libfdk-aac --enable-libvpx --enable-gpl --enable-libx264 --enable-libsvthevc && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install diff --git a/Xeon/ubuntu-18.04/service/owt/Dockerfile.m4 b/Xeon/ubuntu-18.04/service/owt/Dockerfile.m4 index 5ae07b817..6ef53b4ad 100644 --- a/Xeon/ubuntu-18.04/service/owt/Dockerfile.m4 +++ b/Xeon/ubuntu-18.04/service/owt/Dockerfile.m4 @@ -9,6 +9,7 @@ include(libvpx.m4) include(libx264.m4) include(opencv.m4) include(dldt-ie.m4) +DECLARE(`FFMPEG_OPENSSL_NOBIND',true) include(ffmpeg.m4) include(meson.m4) include(gst-core.m4) diff --git a/Xeon/ubuntu-18.04/service/owt360/Dockerfile b/Xeon/ubuntu-18.04/service/owt360/Dockerfile index 396c81cf4..d2029a336 100644 --- a/Xeon/ubuntu-18.04/service/owt360/Dockerfile +++ b/Xeon/ubuntu-18.04/service/owt360/Dockerfile @@ -311,7 +311,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-gpl --enable-nonfree --enable-libass --disable-xlib --disable-sdl2 --disable-hwaccels --disable-vaapi --enable-openssl --extra-ldflags=-Wl,-rpath=/usr/local/ssl/lib --enable-libfdk-aac --enable-libvpx --enable-libx264 --enable-libsvthevc && make -j$(nproc) && \ + --extra-cflags=-w --enable-libass --disable-xlib --disable-sdl2 --disable-hwaccels --disable-vaapi --enable-libfdk-aac --enable-libvpx --enable-gpl --enable-libx264 --enable-libsvthevc && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install diff --git a/Xeon/ubuntu-18.04/service/owt360/Dockerfile.m4 b/Xeon/ubuntu-18.04/service/owt360/Dockerfile.m4 index 83f02cb6e..9650028f6 100644 --- a/Xeon/ubuntu-18.04/service/owt360/Dockerfile.m4 +++ b/Xeon/ubuntu-18.04/service/owt360/Dockerfile.m4 @@ -10,6 +10,7 @@ include(libvpx.m4) include(libx264.m4) include(opencv.m4) include(dldt-ie.m4) +DECLARE(`FFMPEG_OPENSSL_NOBIND',true) include(ffmpeg.m4) include(scvp.m4) include(owt360.m4) diff --git a/Xeon/ubuntu-20.04/analytics/dev/Dockerfile b/Xeon/ubuntu-20.04/analytics/dev/Dockerfile index b3f68a593..3a97f1777 100644 --- a/Xeon/ubuntu-20.04/analytics/dev/Dockerfile +++ b/Xeon/ubuntu-20.04/analytics/dev/Dockerfile @@ -71,6 +71,24 @@ RUN cd /opt/build && \ make install DESTDIR=/opt/dist && \ make install +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + ca-certificates wget tar g++ make libtool autoconf && \ + rm -rf /var/lib/apt/lists/* + +# build openssl +ARG OPENSSL_REPO=https://github.com/openssl/openssl/archive/OpenSSL_1_1_1k.tar.gz +RUN cd /opt/build && \ + wget -O - ${OPENSSL_REPO} | tar xz && \ + cd openssl-OpenSSL_1_1_1k && \ + ./config no-ssl3 shared --prefix=/usr/local/ssl --openssldir=/usr/local/ssl -fPIC -Wl,-rpath=/usr/local/ssl/lib && \ + make depend && \ + make -s V=0 && \ + make install DESTDIR=/opt/dist && \ + (cd /opt/dist && mkdir -p ./usr/local/lib/pkgconfig && mv ./usr/local/ssl/lib/pkgconfig/*.pc ./usr/local/lib/pkgconfig/) && \ + make install && \ + (mkdir -p /usr/local/lib/pkgconfig && mv /usr/local/ssl/lib/pkgconfig/*.pc /usr/local/lib/pkgconfig/) + RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ ca-certificates wget g++ autoconf libtool autotools-dev automake make && \ @@ -147,53 +165,6 @@ RUN cd /opt/build && \ make install DESTDIR=/opt/dist && \ make install -RUN apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - git cmake make autoconf && \ - rm -rf /var/lib/apt/lists/* - -# build libx264 -ARG LIBX264_REPO=https://github.com/mirror/x264 -RUN cd /opt/build && \ - git clone ${LIBX264_REPO} -b stable --depth 1 && \ - cd x264 && \ - ./configure --prefix=/usr/local --libdir=/usr/local/lib \ - --enable-shared && \ - make -j$(nproc) && \ - make install DESTDIR=/opt/dist && \ - make install - -RUN apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates wget tar g++ make && \ - rm -rf /var/lib/apt/lists/* - -# build yasm -ARG YASM_REPO=https://www.tortall.net/projects/yasm/releases/yasm-1.3.0.tar.gz -RUN cd /opt/build && \ - wget -O - ${YASM_REPO} | tar xz -RUN cd /opt/build/yasm-1.3.0 && \ - # TODO remove the line below whether no other component inside this project requires it. - # `sed -i "s/) ytasm.*/)/" Makefile.in' && \ - ./configure --prefix=/usr/local --libdir=/usr/local/lib && \ - make -j $(nproc) && \ - make install - -RUN apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - libnuma-dev cmake make && \ - rm -rf /var/lib/apt/lists/* - -# build libx265 -ARG LIBX265_REPO=https://github.com/videolan/x265/archive/3.4.tar.gz -RUN cd /opt/build && \ - wget -O - ${LIBX265_REPO} | tar xz && \ - cd x265-3.4/build/linux && \ - cmake -DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX=/usr/local -DLIB_INSTALL_DIR=/usr/local/lib ../../source && \ - make -j$(nproc) && \ - make install DESTDIR=/opt/dist && \ - make install - RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ python3-pip ninja-build python3-setuptools && \ @@ -244,6 +215,22 @@ RUN cd /opt/build && \ make install DESTDIR=/opt/dist && \ make install +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + ca-certificates wget tar g++ make && \ + rm -rf /var/lib/apt/lists/* + +# build yasm +ARG YASM_REPO=https://www.tortall.net/projects/yasm/releases/yasm-1.3.0.tar.gz +RUN cd /opt/build && \ + wget -O - ${YASM_REPO} | tar xz +RUN cd /opt/build/yasm-1.3.0 && \ + # TODO remove the line below whether no other component inside this project requires it. + # `sed -i "s/) ytasm.*/)/" Makefile.in' && \ + ./configure --prefix=/usr/local --libdir=/usr/local/lib && \ + make -j $(nproc) && \ + make install + RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ ca-certificates wget tar g++ make cmake git && \ @@ -492,7 +479,7 @@ RUN cd /opt/build/gst-plugins-good-1.19.1 && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates tar g++ wget pkg-config libglib2.0-dev flex bison gobject-introspection libgirepository1.0-dev openssl libcurl4-gnutls-dev librtmp-dev mjpegtools libde265-dev && \ + ca-certificates tar g++ wget pkg-config libglib2.0-dev flex bison gobject-introspection libgirepository1.0-dev libcurl4-gnutls-dev librtmp-dev mjpegtools libx265-dev libde265-dev && \ rm -rf /var/lib/apt/lists/* # build gst-plugin-bad @@ -521,7 +508,7 @@ RUN cd /opt/build && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates tar g++ wget pkg-config libglib2.0-dev flex bison && \ + ca-certificates tar g++ wget pkg-config libglib2.0-dev flex bison libx264-dev && \ rm -rf /var/lib/apt/lists/* # build gst-plugin-ugly @@ -562,7 +549,8 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-gpl --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --disable-hwaccels --disable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libx264 --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libdav1d && make -j$(nproc) && \ + --extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --disable-hwaccels --disable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-openssl --extra-ldflags=-Wldnl + --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libdav1d && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install @@ -737,6 +725,8 @@ sed -i "s/.*python\.dependency.*/pythonver \= python\.language_version\(\)\npyth # cleanup RUN rm -rf /opt/dist/usr/local/share/doc /opt/dist/usr/local/share/gtk-doc RUN rm -rf /opt/dist/usr/local/share/man +RUN rm -rf /opt/dist/usr/local/ssl/share/man +RUN rm -rf /opt/dist/usr/local/ssl/share/doc RUN rm -rf /opt/dist/usr/local/openvino/inference-engine/external/tbb/doc FROM ubuntu:20.04 @@ -748,7 +738,7 @@ WORKDIR /home RUN apt-get update && apt-get upgrade -y systemd RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - libnuma1 libgtk-3-0 ocl-icd-libopencl1 libglib2.0-0 libx11-6 libxv1 libxt6 libasound2 libpangocairo-1.0-0 libcairo-gobject2 libtheora0 libvisual-0.4-0 libgl1-mesa-dri libgl1-mesa-glx libegl1-mesa libgdk-pixbuf2.0-0 libjpeg-turbo8 libpng16-16 zlib1g libsoup2.4-1 openssl libcurl3-gnutls librtmp1 mjpegtools libde265-0 libxcb-shape0 libxcb-xfixes0 libv4l-0 libass9 python3-gi python3-gi-cairo python3-dev python3-numpy libglib2.0-dev && \ + libgtk-3-0 libnuma1 ocl-icd-libopencl1 libglib2.0-0 libx11-6 libxv1 libxt6 libasound2 libpangocairo-1.0-0 libcairo-gobject2 libtheora0 libvisual-0.4-0 libgl1-mesa-dri libgl1-mesa-glx libegl1-mesa libgdk-pixbuf2.0-0 libjpeg-turbo8 libpng16-16 zlib1g libsoup2.4-1 libcurl3-gnutls librtmp1 mjpegtools libx265-179 libde265-0 libx264-155 libxcb-shape0 libxcb-xfixes0 libv4l-0 libass9 python3-gi python3-gi-cairo python3-dev python3-numpy libglib2.0-dev && \ rm -rf /var/lib/apt/lists/* ENV PKG_CONFIG_PATH=/usr/local/lib/pkgconfig diff --git a/Xeon/ubuntu-20.04/analytics/dev/Dockerfile.m4 b/Xeon/ubuntu-20.04/analytics/dev/Dockerfile.m4 index 91bbade16..3a9e4d486 100644 --- a/Xeon/ubuntu-20.04/analytics/dev/Dockerfile.m4 +++ b/Xeon/ubuntu-20.04/analytics/dev/Dockerfile.m4 @@ -2,12 +2,11 @@ include(begin.m4) include(ubuntu.m4) include(libogg.m4) include(libvorbis.m4) +include(openssl.m4) ifelse(defn(`BUILD_FDKAAC'),`ON',`include(libfdk-aac.m4)') include(libopus.m4) include(libvpx.m4) include(libaom.m4) -include(libx264.m4) -include(libx265.m4) include(meson.m4) include(dav1d.m4) include(libjsonc.m4) diff --git a/Xeon/ubuntu-20.04/analytics/ffmpeg/Dockerfile b/Xeon/ubuntu-20.04/analytics/ffmpeg/Dockerfile index dae262c67..b521d076d 100644 --- a/Xeon/ubuntu-20.04/analytics/ffmpeg/Dockerfile +++ b/Xeon/ubuntu-20.04/analytics/ffmpeg/Dockerfile @@ -410,7 +410,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-gpl --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --disable-hwaccels --disable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libx264 --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libdav1d && make -j$(nproc) && \ + --extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --disable-hwaccels --disable-vaapi --enable-libv4l2 --enable-indev=v4l2 -rpath=/usr/local/ssl/lib --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libdav1d && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install diff --git a/Xeon/ubuntu-20.04/analytics/gst/Dockerfile b/Xeon/ubuntu-20.04/analytics/gst/Dockerfile index e42ff2474..cdd25c4b5 100644 --- a/Xeon/ubuntu-20.04/analytics/gst/Dockerfile +++ b/Xeon/ubuntu-20.04/analytics/gst/Dockerfile @@ -562,7 +562,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-gpl --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --disable-hwaccels --disable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libx264 --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libdav1d && make -j$(nproc) && \ + --extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --disable-hwaccels --disable-vaapi --enable-libv4l2 --enable-indev=v4l2 -rpath=/usr/local/ssl/lib --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libdav1d && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install diff --git a/Xeon/ubuntu-20.04/media/dev/Dockerfile b/Xeon/ubuntu-20.04/media/dev/Dockerfile index 5d8f80b12..f83b01ec2 100644 --- a/Xeon/ubuntu-20.04/media/dev/Dockerfile +++ b/Xeon/ubuntu-20.04/media/dev/Dockerfile @@ -72,6 +72,24 @@ RUN cd /opt/build && \ make install DESTDIR=/opt/dist && \ make install +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + ca-certificates wget tar g++ make libtool autoconf && \ + rm -rf /var/lib/apt/lists/* + +# build openssl +ARG OPENSSL_REPO=https://github.com/openssl/openssl/archive/OpenSSL_1_1_1k.tar.gz +RUN cd /opt/build && \ + wget -O - ${OPENSSL_REPO} | tar xz && \ + cd openssl-OpenSSL_1_1_1k && \ + ./config no-ssl3 shared --prefix=/usr/local/ssl --openssldir=/usr/local/ssl -fPIC -Wl,-rpath=/usr/local/ssl/lib && \ + make depend && \ + make -s V=0 && \ + make install DESTDIR=/opt/dist && \ + (cd /opt/dist && mkdir -p ./usr/local/lib/pkgconfig && mv ./usr/local/ssl/lib/pkgconfig/*.pc ./usr/local/lib/pkgconfig/) && \ + make install && \ + (mkdir -p /usr/local/lib/pkgconfig && mv /usr/local/ssl/lib/pkgconfig/*.pc /usr/local/lib/pkgconfig/) + RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ ca-certificates wget g++ autoconf libtool autotools-dev automake make && \ @@ -148,53 +166,6 @@ RUN cd /opt/build && \ make install DESTDIR=/opt/dist && \ make install -RUN apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - git cmake make autoconf && \ - rm -rf /var/lib/apt/lists/* - -# build libx264 -ARG LIBX264_REPO=https://github.com/mirror/x264 -RUN cd /opt/build && \ - git clone ${LIBX264_REPO} -b stable --depth 1 && \ - cd x264 && \ - ./configure --prefix=/usr/local --libdir=/usr/local/lib \ - --enable-shared && \ - make -j$(nproc) && \ - make install DESTDIR=/opt/dist && \ - make install - -RUN apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates wget tar g++ make && \ - rm -rf /var/lib/apt/lists/* - -# build yasm -ARG YASM_REPO=https://www.tortall.net/projects/yasm/releases/yasm-1.3.0.tar.gz -RUN cd /opt/build && \ - wget -O - ${YASM_REPO} | tar xz -RUN cd /opt/build/yasm-1.3.0 && \ - # TODO remove the line below whether no other component inside this project requires it. - # `sed -i "s/) ytasm.*/)/" Makefile.in' && \ - ./configure --prefix=/usr/local --libdir=/usr/local/lib && \ - make -j $(nproc) && \ - make install - -RUN apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - libnuma-dev cmake make && \ - rm -rf /var/lib/apt/lists/* - -# build libx265 -ARG LIBX265_REPO=https://github.com/videolan/x265/archive/3.4.tar.gz -RUN cd /opt/build && \ - wget -O - ${LIBX265_REPO} | tar xz && \ - cd x265-3.4/build/linux && \ - cmake -DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX=/usr/local -DLIB_INSTALL_DIR=/usr/local/lib ../../source && \ - make -j$(nproc) && \ - make install DESTDIR=/opt/dist && \ - make install - RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ python3-pip ninja-build python3-setuptools && \ @@ -224,20 +195,19 @@ RUN cd /opt/build/dav1d-0.9.0 && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates tar g++ wget pkg-config ninja-build && \ + ca-certificates wget tar g++ make && \ rm -rf /var/lib/apt/lists/* -# build VMAF -ARG VMAF_VER=2.1.1 -ARG LIBVMAF_REPO=https://github.com/Netflix/vmaf/archive/refs/tags/v${VMAF_VER}.tar.gz +# build yasm +ARG YASM_REPO=https://www.tortall.net/projects/yasm/releases/yasm-1.3.0.tar.gz RUN cd /opt/build && \ - wget -O - ${LIBVMAF_REPO} | tar xz && ls -RUN cd /opt/build/vmaf-2.1.1/libvmaf && \ - ls && \ - meson build --prefix=/usr/local --libdir /usr/local/lib --buildtype=plain && \ - cd build && \ - ninja install && \ - DESTDIR=/opt/dist ninja install + wget -O - ${YASM_REPO} | tar xz +RUN cd /opt/build/yasm-1.3.0 && \ + # TODO remove the line below whether no other component inside this project requires it. + # `sed -i "s/) ytasm.*/)/" Makefile.in' && \ + ./configure --prefix=/usr/local --libdir=/usr/local/lib && \ + make -j $(nproc) && \ + make install RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ @@ -365,7 +335,7 @@ RUN cd /opt/build/gst-plugins-good-1.19.1 && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates tar g++ wget pkg-config libglib2.0-dev flex bison gobject-introspection libgirepository1.0-dev openssl libcurl4-gnutls-dev librtmp-dev mjpegtools libde265-dev && \ + ca-certificates tar g++ wget pkg-config libglib2.0-dev flex bison gobject-introspection libgirepository1.0-dev libcurl4-gnutls-dev librtmp-dev mjpegtools libx265-dev libde265-dev && \ rm -rf /var/lib/apt/lists/* # build gst-plugin-bad @@ -394,7 +364,7 @@ RUN cd /opt/build && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates tar g++ wget pkg-config libglib2.0-dev flex bison && \ + ca-certificates tar g++ wget pkg-config libglib2.0-dev flex bison libx264-dev && \ rm -rf /var/lib/apt/lists/* # build gst-plugin-ugly @@ -435,7 +405,8 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-gpl --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --disable-hwaccels --disable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libx264 --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libvmaf --enable-version3 --enable-libdav1d && make -j$(nproc) && \ + --extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --disable-hwaccels --disable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-openssl --extra-ldflags=-Wldnl + --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libdav1d && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install @@ -480,6 +451,8 @@ RUN cd /opt/build/SVT-VP9/gstreamer-plugin && \ # cleanup RUN rm -rf /opt/dist/usr/local/share/doc /opt/dist/usr/local/share/gtk-doc RUN rm -rf /opt/dist/usr/local/share/man +RUN rm -rf /opt/dist/usr/local/ssl/share/man +RUN rm -rf /opt/dist/usr/local/ssl/share/doc FROM ubuntu:20.04 LABEL Description="This is the base image for Gstreamer ubuntu 20.04" @@ -490,7 +463,7 @@ WORKDIR /home RUN apt-get update && apt-get upgrade -y systemd RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - libnuma1 libglib2.0-0 libx11-6 libxv1 libxt6 libasound2 libpangocairo-1.0-0 libcairo-gobject2 libtheora0 libvisual-0.4-0 libgl1-mesa-dri libgl1-mesa-glx libegl1-mesa libgdk-pixbuf2.0-0 libjpeg-turbo8 libpng16-16 zlib1g libsoup2.4-1 openssl libcurl3-gnutls librtmp1 mjpegtools libde265-0 libxcb-shape0 libxcb-xfixes0 libv4l-0 libass9 && \ + libglib2.0-0 libx11-6 libxv1 libxt6 libasound2 libpangocairo-1.0-0 libcairo-gobject2 libtheora0 libvisual-0.4-0 libgl1-mesa-dri libgl1-mesa-glx libegl1-mesa libgdk-pixbuf2.0-0 libjpeg-turbo8 libpng16-16 zlib1g libsoup2.4-1 libcurl3-gnutls librtmp1 mjpegtools libx265-179 libde265-0 libx264-155 libxcb-shape0 libxcb-xfixes0 libv4l-0 libass9 && \ rm -rf /var/lib/apt/lists/* ENV PKG_CONFIG_PATH=/usr/local/lib/pkgconfig diff --git a/Xeon/ubuntu-20.04/media/dev/Dockerfile.m4 b/Xeon/ubuntu-20.04/media/dev/Dockerfile.m4 index be2d9b3a7..37ec67371 100644 --- a/Xeon/ubuntu-20.04/media/dev/Dockerfile.m4 +++ b/Xeon/ubuntu-20.04/media/dev/Dockerfile.m4 @@ -3,15 +3,13 @@ include(begin.m4) include(ubuntu.m4) include(libogg.m4) include(libvorbis.m4) +include(openssl.m4) ifelse(defn(`BUILD_FDKAAC'),`ON',`include(libfdk-aac.m4)') include(libopus.m4) include(libvpx.m4) include(libaom.m4) -include(libx264.m4) -include(libx265.m4) include(meson.m4) include(dav1d.m4) -include(libvmaf.m4) include(svt-hevc.m4) include(svt-av1.m4) include(svt-vp9.m4) diff --git a/Xeon/ubuntu-20.04/media/ffmpeg/Dockerfile b/Xeon/ubuntu-20.04/media/ffmpeg/Dockerfile index f329c1b49..0bcd3b73a 100644 --- a/Xeon/ubuntu-20.04/media/ffmpeg/Dockerfile +++ b/Xeon/ubuntu-20.04/media/ffmpeg/Dockerfile @@ -195,23 +195,6 @@ RUN cd /opt/build/dav1d-0.9.0 && \ ninja install && \ DESTDIR=/opt/dist ninja install -RUN apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates meson tar g++ wget pkg-config ninja-build && \ - rm -rf /var/lib/apt/lists/* - -# build VMAF -ARG VMAF_VER=2.1.1 -ARG LIBVMAF_REPO=https://github.com/Netflix/vmaf/archive/refs/tags/v${VMAF_VER}.tar.gz -RUN cd /opt/build && \ - wget -O - ${LIBVMAF_REPO} | tar xz && ls -RUN cd /opt/build/vmaf-2.1.1/libvmaf && \ - ls && \ - meson build --prefix=/usr/local --libdir /usr/local/lib --buildtype=plain && \ - cd build && \ - ninja install && \ - DESTDIR=/opt/dist ninja install - RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ ca-certificates wget tar g++ make cmake git && \ @@ -308,7 +291,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-gpl --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --disable-hwaccels --disable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libx264 --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libvmaf --enable-version3 --enable-libdav1d && make -j$(nproc) && \ + --extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --disable-hwaccels --disable-vaapi --enable-libv4l2 --enable-indev=v4l2 -rpath=/usr/local/ssl/lib --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libdav1d && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install diff --git a/Xeon/ubuntu-20.04/media/ffmpeg/Dockerfile.m4 b/Xeon/ubuntu-20.04/media/ffmpeg/Dockerfile.m4 index f2ca00143..c2c0e064f 100644 --- a/Xeon/ubuntu-20.04/media/ffmpeg/Dockerfile.m4 +++ b/Xeon/ubuntu-20.04/media/ffmpeg/Dockerfile.m4 @@ -9,7 +9,6 @@ include(libvpx.m4) include(libx264.m4) include(libx265.m4) include(dav1d.m4) -include(libvmaf.m4) include(svt-hevc.m4) include(svt-av1.m4) include(svt-vp9.m4) diff --git a/Xeon/ubuntu-20.04/media/gst/Dockerfile b/Xeon/ubuntu-20.04/media/gst/Dockerfile index d0327e6df..961013d71 100644 --- a/Xeon/ubuntu-20.04/media/gst/Dockerfile +++ b/Xeon/ubuntu-20.04/media/gst/Dockerfile @@ -418,7 +418,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-gpl --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --disable-hwaccels --disable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libx264 --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libdav1d && make -j$(nproc) && \ + --extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --disable-hwaccels --disable-vaapi --enable-libv4l2 --enable-indev=v4l2 -rpath=/usr/local/ssl/lib --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libdav1d && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install diff --git a/XeonE3/centos-7/analytics/dev/Dockerfile b/XeonE3/centos-7/analytics/dev/Dockerfile index 897154507..65023ed05 100644 --- a/XeonE3/centos-7/analytics/dev/Dockerfile +++ b/XeonE3/centos-7/analytics/dev/Dockerfile @@ -82,6 +82,21 @@ RUN cd /opt/build && \ make install DESTDIR=/opt/dist && \ make install +RUN yum install -y wget tar gcc-c++ make libtool autoconf + +# build openssl +ARG OPENSSL_REPO=https://github.com/openssl/openssl/archive/OpenSSL_1_1_1k.tar.gz +RUN cd /opt/build && \ + wget -O - ${OPENSSL_REPO} | tar xz && \ + cd openssl-OpenSSL_1_1_1k && \ + ./config no-ssl3 shared --prefix=/usr/local/ssl --openssldir=/usr/local/ssl -fPIC -Wl,-rpath=/usr/local/ssl/lib && \ + make depend && \ + make -s V=0 && \ + make install DESTDIR=/opt/dist && \ + (cd /opt/dist && mkdir -p ./usr/local/lib64/pkgconfig && mv ./usr/local/ssl/lib/pkgconfig/*.pc ./usr/local/lib64/pkgconfig/) && \ + make install && \ + (mkdir -p /usr/local/lib64/pkgconfig && mv /usr/local/ssl/lib/pkgconfig/*.pc /usr/local/lib64/pkgconfig/) + RUN yum install -y wget gcc-c++ autoconf libtool make automake # build libfdkaac @@ -143,18 +158,17 @@ RUN cd /opt/build && \ make install DESTDIR=/opt/dist && \ make install -RUN yum install -y git make autoconf diffutils +RUN yum install -y meson wget tar gcc-c++ -# build libx264 -ARG LIBX264_REPO=https://github.com/mirror/x264 +# build dav1d +ARG DAV1D_REPO=https://code.videolan.org/videolan/dav1d/-/archive/0.9.0/dav1d-0.9.0.tar.gz RUN cd /opt/build && \ - git clone ${LIBX264_REPO} -b stable --depth 1 && \ - cd x264 && \ - ./configure --prefix=/usr/local --libdir=/usr/local/lib64 \ - --enable-shared && \ - make -j$(nproc) && \ - make install DESTDIR=/opt/dist && \ - make install + wget -O - ${DAV1D_REPO} | tar xz +RUN cd /opt/build/dav1d-0.9.0 && \ + meson build --prefix=/usr/local --libdir /usr/local/lib64 --buildtype=plain && \ + cd build && \ + ninja install && \ + DESTDIR=/opt/dist ninja install RUN yum install -y wget tar gcc-c++ make @@ -169,30 +183,6 @@ RUN cd /opt/build/yasm-1.3.0 && \ make -j $(nproc) && \ make install -RUN yum install -y make numactl-devel libpciaccess-devel - -# build libx265 -ARG LIBX265_REPO=https://github.com/videolan/x265/archive/3.4.tar.gz -RUN cd /opt/build && \ - wget -O - ${LIBX265_REPO} | tar xz && \ - cd x265-3.4/build/linux && \ - cmake -DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX=/usr/local -DLIB_INSTALL_DIR=/usr/local/lib64 ../../source && \ - make -j$(nproc) && \ - make install DESTDIR=/opt/dist && \ - make install - -RUN yum install -y meson wget tar gcc-c++ - -# build dav1d -ARG DAV1D_REPO=https://code.videolan.org/videolan/dav1d/-/archive/0.9.0/dav1d-0.9.0.tar.gz -RUN cd /opt/build && \ - wget -O - ${DAV1D_REPO} | tar xz -RUN cd /opt/build/dav1d-0.9.0 && \ - meson build --prefix=/usr/local --libdir /usr/local/lib64 --buildtype=plain && \ - cd build && \ - ninja install && \ - DESTDIR=/opt/dist ninja install - RUN yum install -y wget tar gcc-c++ make git # build svt-hevc @@ -488,7 +478,7 @@ RUN cd /opt/build/gst-plugins-good-1.19.1 && \ ninja install && \ DESTDIR=/opt/dist ninja install -RUN yum install -y meson wget tar glib2-devel bison flex gobject-introspection-devel openssl libcurl-devel librtmp-devel mjpegtools libde265-devel devtoolset-9 +RUN yum install -y meson wget tar glib2-devel bison flex gobject-introspection-devel libcurl-devel librtmp-devel mjpegtools x265-devel libde265-devel devtoolset-9 # build gst-plugin-bad ARG GSTBAD_REPO=https://github.com/GStreamer/gst-plugins-bad/archive/1.19.1.tar.gz @@ -514,7 +504,7 @@ RUN cd /opt/build && \ ninja install && \ DESTDIR=/opt/dist ninja install ) -RUN yum install -y meson wget tar gcc-c++ glib2-devel bison flex +RUN yum install -y meson wget tar gcc-c++ glib2-devel bison flex libx264-devel # build gst-plugin-ugly ARG GSTUGLY_REPO=https://github.com/GStreamer/gst-plugins-ugly/archive/1.19.1.tar.gz @@ -556,7 +546,8 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib64 --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-gpl --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libx264 --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libdav1d && make -j$(nproc) && \ + --extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-openssl --extra-ldflags=-Wldnl + --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libdav1d && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install @@ -750,6 +741,9 @@ RUN rm -rf /opt/dist/usr/local/include && \ find /opt/dist -name "*.a" -exec rm -f {} \; || echo "" RUN rm -rf /opt/dist/usr/local/share/doc /opt/dist/usr/local/share/gtk-doc RUN rm -rf /opt/dist/usr/local/share/man +RUN rm -rf /opt/dist/usr/local/ssl/include +RUN rm -rf /opt/dist/usr/local/ssl/share/man +RUN rm -rf /opt/dist/usr/local/ssl/share/doc RUN cd /opt/dist/usr/local/openvino/inference-engine && \ rm -rf /opt/dist/usr/local/lib64/pkgconfig/openvino.pc \ include src share/*.cmake cmake lib/intel64/*.a external/tbb/include external/tbb/cmake @@ -767,7 +761,7 @@ RUN dnf install -y https://download1.rpmfusion.org/free/el/rpmfusion-free-releas dnf install -y https://download1.rpmfusion.org/nonfree/el/rpmfusion-nonfree-release-7.noarch.rpm # Install -RUN yum install -y bash numactl-libs libpciaccess libdrm libX11 libXfixes libXext libwayland-client gtk3 numactl ocl-icd glib2 gobject-introspection mesa-libEGL libXv libXt alsa-lib pango libtheora libvisual mesa-libGL mesa-dri-drivers gdk-pixbuf2 libjpeg-turbo libpng zlib libsoup openssl librtmp mjpegtools libde265 libv4l libass python3-devel boost-regex python36-gobject python36-gobject-devel python36-gobject-base +RUN yum install -y bash libdrm libX11 libXfixes libXext libwayland-client gtk3 numactl ocl-icd glib2 gobject-introspection mesa-libEGL libXv libXt alsa-lib pango libtheora libvisual mesa-libGL mesa-dri-drivers gdk-pixbuf2 libjpeg-turbo libpng zlib libsoup librtmp mjpegtools x265 libde265 libx264-static libv4l libass libpciaccess python3-devel boost-regex python36-gobject python36-gobject-devel python36-gobject-base COPY --from=build /opt/dist / RUN echo "/usr/local/lib64" >> /etc/ld.so.conf.d/all-libs.conf && ldconfig diff --git a/XeonE3/centos-7/analytics/dev/Dockerfile.m4 b/XeonE3/centos-7/analytics/dev/Dockerfile.m4 index 685a9ae79..6dea596f1 100644 --- a/XeonE3/centos-7/analytics/dev/Dockerfile.m4 +++ b/XeonE3/centos-7/analytics/dev/Dockerfile.m4 @@ -3,12 +3,11 @@ include(centos-repo.m4) include(cmake.m4) include(libogg.m4) include(libvorbis.m4) +include(openssl.m4) ifelse(defn(`BUILD_FDKAAC'),`ON',`include(libfdk-aac.m4)') include(libopus.m4) include(libvpx.m4) include(libaom.m4) -include(libx264.m4) -include(libx265.m4) include(dav1d.m4) include(svt-hevc.m4) include(svt-av1.m4) diff --git a/XeonE3/centos-7/analytics/ffmpeg/Dockerfile b/XeonE3/centos-7/analytics/ffmpeg/Dockerfile index 0ac062474..637bda4cc 100644 --- a/XeonE3/centos-7/analytics/ffmpeg/Dockerfile +++ b/XeonE3/centos-7/analytics/ffmpeg/Dockerfile @@ -442,7 +442,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib64 --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-gpl --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libx264 --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libdav1d && make -j$(nproc) && \ + --extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 -rpath=/usr/local/ssl/lib --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libdav1d && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install diff --git a/XeonE3/centos-7/analytics/gst/Dockerfile b/XeonE3/centos-7/analytics/gst/Dockerfile index fafc8d6ba..7dbf41bd0 100644 --- a/XeonE3/centos-7/analytics/gst/Dockerfile +++ b/XeonE3/centos-7/analytics/gst/Dockerfile @@ -538,7 +538,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib64 --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-gpl --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libx264 --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libdav1d && make -j$(nproc) && \ + --extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 -rpath=/usr/local/ssl/lib --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libdav1d && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install diff --git a/XeonE3/centos-7/media/dev/Dockerfile b/XeonE3/centos-7/media/dev/Dockerfile index 11271ec51..74f549183 100644 --- a/XeonE3/centos-7/media/dev/Dockerfile +++ b/XeonE3/centos-7/media/dev/Dockerfile @@ -83,6 +83,21 @@ RUN cd /opt/build && \ make install DESTDIR=/opt/dist && \ make install +RUN yum install -y wget tar gcc-c++ make libtool autoconf + +# build openssl +ARG OPENSSL_REPO=https://github.com/openssl/openssl/archive/OpenSSL_1_1_1k.tar.gz +RUN cd /opt/build && \ + wget -O - ${OPENSSL_REPO} | tar xz && \ + cd openssl-OpenSSL_1_1_1k && \ + ./config no-ssl3 shared --prefix=/usr/local/ssl --openssldir=/usr/local/ssl -fPIC -Wl,-rpath=/usr/local/ssl/lib && \ + make depend && \ + make -s V=0 && \ + make install DESTDIR=/opt/dist && \ + (cd /opt/dist && mkdir -p ./usr/local/lib64/pkgconfig && mv ./usr/local/ssl/lib/pkgconfig/*.pc ./usr/local/lib64/pkgconfig/) && \ + make install && \ + (mkdir -p /usr/local/lib64/pkgconfig && mv /usr/local/ssl/lib/pkgconfig/*.pc /usr/local/lib64/pkgconfig/) + RUN yum install -y wget gcc-c++ autoconf libtool make automake # build libfdkaac @@ -144,18 +159,17 @@ RUN cd /opt/build && \ make install DESTDIR=/opt/dist && \ make install -RUN yum install -y git make autoconf diffutils +RUN yum install -y meson wget tar gcc-c++ -# build libx264 -ARG LIBX264_REPO=https://github.com/mirror/x264 +# build dav1d +ARG DAV1D_REPO=https://code.videolan.org/videolan/dav1d/-/archive/0.9.0/dav1d-0.9.0.tar.gz RUN cd /opt/build && \ - git clone ${LIBX264_REPO} -b stable --depth 1 && \ - cd x264 && \ - ./configure --prefix=/usr/local --libdir=/usr/local/lib64 \ - --enable-shared && \ - make -j$(nproc) && \ - make install DESTDIR=/opt/dist && \ - make install + wget -O - ${DAV1D_REPO} | tar xz +RUN cd /opt/build/dav1d-0.9.0 && \ + meson build --prefix=/usr/local --libdir /usr/local/lib64 --buildtype=plain && \ + cd build && \ + ninja install && \ + DESTDIR=/opt/dist ninja install RUN yum install -y wget tar gcc-c++ make @@ -170,44 +184,6 @@ RUN cd /opt/build/yasm-1.3.0 && \ make -j $(nproc) && \ make install -RUN yum install -y make numactl-devel libpciaccess-devel - -# build libx265 -ARG LIBX265_REPO=https://github.com/videolan/x265/archive/3.4.tar.gz -RUN cd /opt/build && \ - wget -O - ${LIBX265_REPO} | tar xz && \ - cd x265-3.4/build/linux && \ - cmake -DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX=/usr/local -DLIB_INSTALL_DIR=/usr/local/lib64 ../../source && \ - make -j$(nproc) && \ - make install DESTDIR=/opt/dist && \ - make install - -RUN yum install -y meson wget tar gcc-c++ - -# build dav1d -ARG DAV1D_REPO=https://code.videolan.org/videolan/dav1d/-/archive/0.9.0/dav1d-0.9.0.tar.gz -RUN cd /opt/build && \ - wget -O - ${DAV1D_REPO} | tar xz -RUN cd /opt/build/dav1d-0.9.0 && \ - meson build --prefix=/usr/local --libdir /usr/local/lib64 --buildtype=plain && \ - cd build && \ - ninja install && \ - DESTDIR=/opt/dist ninja install - -RUN yum install -y meson wget tar gcc-c++ ninja-build devtoolset-9 - -# build VMAF -ARG VMAF_VER=2.1.1 -ARG LIBVMAF_REPO=https://github.com/Netflix/vmaf/archive/refs/tags/v${VMAF_VER}.tar.gz -RUN cd /opt/build && \ - wget -O - ${LIBVMAF_REPO} | tar xz && ls -RUN cd /opt/build/vmaf-2.1.1/libvmaf && \ - ls && \ - (. /opt/rh/devtoolset-9/enable && meson build --prefix=/usr/local --libdir /usr/local/lib64 --buildtype=plain && \ - cd build && \ - ninja install && \ - DESTDIR=/opt/dist ninja install ) - RUN yum install -y wget tar gcc-c++ make git # build svt-hevc @@ -368,7 +344,7 @@ RUN cd /opt/build/gst-plugins-good-1.19.1 && \ ninja install && \ DESTDIR=/opt/dist ninja install -RUN yum install -y meson wget tar glib2-devel bison flex gobject-introspection-devel openssl libcurl-devel librtmp-devel mjpegtools libde265-devel devtoolset-9 +RUN yum install -y meson wget tar glib2-devel bison flex gobject-introspection-devel libcurl-devel librtmp-devel mjpegtools x265-devel libde265-devel devtoolset-9 # build gst-plugin-bad ARG GSTBAD_REPO=https://github.com/GStreamer/gst-plugins-bad/archive/1.19.1.tar.gz @@ -394,7 +370,7 @@ RUN cd /opt/build && \ ninja install && \ DESTDIR=/opt/dist ninja install ) -RUN yum install -y meson wget tar gcc-c++ glib2-devel bison flex +RUN yum install -y meson wget tar gcc-c++ glib2-devel bison flex libx264-devel # build gst-plugin-ugly ARG GSTUGLY_REPO=https://github.com/GStreamer/gst-plugins-ugly/archive/1.19.1.tar.gz @@ -436,7 +412,8 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib64 --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-gpl --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libx264 --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libvmaf --enable-version3 --enable-libdav1d && make -j$(nproc) && \ + --extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-openssl --extra-ldflags=-Wldnl + --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libdav1d && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install @@ -509,6 +486,9 @@ RUN rm -rf /opt/dist/usr/local/include && \ find /opt/dist -name "*.a" -exec rm -f {} \; || echo "" RUN rm -rf /opt/dist/usr/local/share/doc /opt/dist/usr/local/share/gtk-doc RUN rm -rf /opt/dist/usr/local/share/man +RUN rm -rf /opt/dist/usr/local/ssl/include +RUN rm -rf /opt/dist/usr/local/ssl/share/man +RUN rm -rf /opt/dist/usr/local/ssl/share/doc FROM centos:7 LABEL Description="This is the image for FFMPEG and Gstreamer application for media development on centos 7" @@ -522,7 +502,7 @@ RUN dnf install -y https://download1.rpmfusion.org/free/el/rpmfusion-free-releas dnf install -y https://download1.rpmfusion.org/nonfree/el/rpmfusion-nonfree-release-7.noarch.rpm # Install -RUN yum install -y bash numactl-libs libpciaccess libdrm libX11 libXfixes libXext libwayland-client glib2 gobject-introspection mesa-libEGL libXv libXt alsa-lib pango libtheora libvisual mesa-libGL mesa-dri-drivers gdk-pixbuf2 libjpeg-turbo libpng zlib libsoup openssl librtmp mjpegtools libde265 libv4l libass +RUN yum install -y bash libdrm libX11 libXfixes libXext libwayland-client glib2 gobject-introspection mesa-libEGL libXv libXt alsa-lib pango libtheora libvisual mesa-libGL mesa-dri-drivers gdk-pixbuf2 libjpeg-turbo libpng zlib libsoup librtmp mjpegtools x265 libde265 libx264-static libv4l libass libpciaccess COPY --from=build /opt/dist / RUN echo "/usr/local/lib64" >> /etc/ld.so.conf.d/all-libs.conf && ldconfig diff --git a/XeonE3/centos-7/media/dev/Dockerfile.m4 b/XeonE3/centos-7/media/dev/Dockerfile.m4 index c6d1a5c9f..9a2b90ad9 100644 --- a/XeonE3/centos-7/media/dev/Dockerfile.m4 +++ b/XeonE3/centos-7/media/dev/Dockerfile.m4 @@ -4,14 +4,12 @@ include(centos-repo.m4) include(cmake.m4) include(libogg.m4) include(libvorbis.m4) +include(openssl.m4) ifelse(defn(`BUILD_FDKAAC'),`ON',`include(libfdk-aac.m4)') include(libopus.m4) include(libvpx.m4) include(libaom.m4) -include(libx264.m4) -include(libx265.m4) include(dav1d.m4) -include(libvmaf.m4) include(svt-hevc.m4) include(svt-av1.m4) include(svt-vp9.m4) diff --git a/XeonE3/centos-7/media/ffmpeg/Dockerfile b/XeonE3/centos-7/media/ffmpeg/Dockerfile index 296029605..1ff09b6f0 100644 --- a/XeonE3/centos-7/media/ffmpeg/Dockerfile +++ b/XeonE3/centos-7/media/ffmpeg/Dockerfile @@ -179,20 +179,6 @@ RUN cd /opt/build/dav1d-0.9.0 && \ ninja install && \ DESTDIR=/opt/dist ninja install -RUN yum install -y meson wget tar gcc-c++ ninja-build devtoolset-9 - -# build VMAF -ARG VMAF_VER=2.1.1 -ARG LIBVMAF_REPO=https://github.com/Netflix/vmaf/archive/refs/tags/v${VMAF_VER}.tar.gz -RUN cd /opt/build && \ - wget -O - ${LIBVMAF_REPO} | tar xz && ls -RUN cd /opt/build/vmaf-2.1.1/libvmaf && \ - ls && \ - (. /opt/rh/devtoolset-9/enable && meson build --prefix=/usr/local --libdir /usr/local/lib64 --buildtype=plain && \ - cd build && \ - ninja install && \ - DESTDIR=/opt/dist ninja install ) - RUN yum install -y wget tar gcc-c++ make git # build svt-hevc @@ -333,7 +319,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib64 --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-gpl --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libx264 --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libvmaf --enable-version3 --enable-libdav1d && make -j$(nproc) && \ + --extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 -rpath=/usr/local/ssl/lib --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libdav1d && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install diff --git a/XeonE3/centos-7/media/ffmpeg/Dockerfile.m4 b/XeonE3/centos-7/media/ffmpeg/Dockerfile.m4 index 7788772aa..b4843ee67 100644 --- a/XeonE3/centos-7/media/ffmpeg/Dockerfile.m4 +++ b/XeonE3/centos-7/media/ffmpeg/Dockerfile.m4 @@ -10,7 +10,6 @@ include(libvpx.m4) include(libx264.m4) include(libx265.m4) include(dav1d.m4) -include(libvmaf.m4) include(svt-hevc.m4) include(svt-av1.m4) include(svt-vp9.m4) diff --git a/XeonE3/centos-7/media/gst/Dockerfile b/XeonE3/centos-7/media/gst/Dockerfile index 9ca3cd43d..ff408217f 100644 --- a/XeonE3/centos-7/media/gst/Dockerfile +++ b/XeonE3/centos-7/media/gst/Dockerfile @@ -404,7 +404,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib64 --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-gpl --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libx264 --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libdav1d && make -j$(nproc) && \ + --extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 -rpath=/usr/local/ssl/lib --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libdav1d && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install diff --git a/XeonE3/centos-7/service/owt-dev/Dockerfile b/XeonE3/centos-7/service/owt-dev/Dockerfile index 1bf943c65..3787a6178 100644 --- a/XeonE3/centos-7/service/owt-dev/Dockerfile +++ b/XeonE3/centos-7/service/owt-dev/Dockerfile @@ -351,7 +351,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib64 --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-gpl --enable-nonfree --enable-libass --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-openssl --extra-ldflags=-Wl,-rpath=/usr/local/ssl/lib --enable-libfdk-aac --enable-libvpx --enable-libx264 --enable-libsvthevc && make -j$(nproc) && \ + --extra-cflags=-w --enable-libass --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libfdk-aac --enable-libvpx --enable-gpl --enable-libx264 --enable-libsvthevc && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install diff --git a/XeonE3/centos-7/service/owt-dev/Dockerfile.m4 b/XeonE3/centos-7/service/owt-dev/Dockerfile.m4 index f1ea34429..0cfd36b4c 100644 --- a/XeonE3/centos-7/service/owt-dev/Dockerfile.m4 +++ b/XeonE3/centos-7/service/owt-dev/Dockerfile.m4 @@ -12,6 +12,7 @@ include(media-driver.m4) include(msdk.m4) include(opencv.m4) include(dldt-ie.m4) +DECLARE(`FFMPEG_OPENSSL_NOBIND',true) include(ffmpeg.m4) include(gst-core.m4) include(owt-gst-base.m4) diff --git a/XeonE3/centos-7/service/owt/Dockerfile b/XeonE3/centos-7/service/owt/Dockerfile index 05450681a..7abb6d510 100644 --- a/XeonE3/centos-7/service/owt/Dockerfile +++ b/XeonE3/centos-7/service/owt/Dockerfile @@ -352,7 +352,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib64 --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-gpl --enable-nonfree --enable-libass --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-openssl --extra-ldflags=-Wl,-rpath=/usr/local/ssl/lib --enable-libfdk-aac --enable-libvpx --enable-libx264 --enable-libsvthevc && make -j$(nproc) && \ + --extra-cflags=-w --enable-libass --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libfdk-aac --enable-libvpx --enable-gpl --enable-libx264 --enable-libsvthevc && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install diff --git a/XeonE3/centos-7/service/owt/Dockerfile.m4 b/XeonE3/centos-7/service/owt/Dockerfile.m4 index b503937bb..e92d9193f 100644 --- a/XeonE3/centos-7/service/owt/Dockerfile.m4 +++ b/XeonE3/centos-7/service/owt/Dockerfile.m4 @@ -13,6 +13,7 @@ include(libva2.m4) include(media-driver.m4) include(msdk.m4) include(dldt-ie.m4) +DECLARE(`FFMPEG_OPENSSL_NOBIND',true) include(ffmpeg.m4) include(gst-core.m4) include(owt-gst-base.m4) diff --git a/XeonE3/centos-7/service/owt360/Dockerfile b/XeonE3/centos-7/service/owt360/Dockerfile index c10eef208..a2a6da0e0 100644 --- a/XeonE3/centos-7/service/owt360/Dockerfile +++ b/XeonE3/centos-7/service/owt360/Dockerfile @@ -352,7 +352,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib64 --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-gpl --enable-nonfree --enable-libass --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-openssl --extra-ldflags=-Wl,-rpath=/usr/local/ssl/lib --enable-libfdk-aac --enable-libvpx --enable-libx264 --enable-libsvthevc && make -j$(nproc) && \ + --extra-cflags=-w --enable-libass --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libfdk-aac --enable-libvpx --enable-gpl --enable-libx264 --enable-libsvthevc && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install diff --git a/XeonE3/centos-7/service/owt360/Dockerfile.m4 b/XeonE3/centos-7/service/owt360/Dockerfile.m4 index c9a222119..802332887 100644 --- a/XeonE3/centos-7/service/owt360/Dockerfile.m4 +++ b/XeonE3/centos-7/service/owt360/Dockerfile.m4 @@ -13,6 +13,7 @@ include(media-driver.m4) include(msdk.m4) include(opencv.m4) include(dldt-ie.m4) +DECLARE(`FFMPEG_OPENSSL_NOBIND',true) include(ffmpeg.m4) include(scvp.m4) include(owt360.m4) diff --git a/XeonE3/ubuntu-18.04/analytics/dev/Dockerfile b/XeonE3/ubuntu-18.04/analytics/dev/Dockerfile index 46bb32eaa..aa54b36d4 100644 --- a/XeonE3/ubuntu-18.04/analytics/dev/Dockerfile +++ b/XeonE3/ubuntu-18.04/analytics/dev/Dockerfile @@ -85,6 +85,24 @@ RUN cd /opt/build && \ make install DESTDIR=/opt/dist && \ make install +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + ca-certificates wget tar g++ make libtool autoconf && \ + rm -rf /var/lib/apt/lists/* + +# build openssl +ARG OPENSSL_REPO=https://github.com/openssl/openssl/archive/OpenSSL_1_1_1k.tar.gz +RUN cd /opt/build && \ + wget -O - ${OPENSSL_REPO} | tar xz && \ + cd openssl-OpenSSL_1_1_1k && \ + ./config no-ssl3 shared --prefix=/usr/local/ssl --openssldir=/usr/local/ssl -fPIC -Wl,-rpath=/usr/local/ssl/lib && \ + make depend && \ + make -s V=0 && \ + make install DESTDIR=/opt/dist && \ + (cd /opt/dist && mkdir -p ./usr/local/lib/pkgconfig && mv ./usr/local/ssl/lib/pkgconfig/*.pc ./usr/local/lib/pkgconfig/) && \ + make install && \ + (mkdir -p /usr/local/lib/pkgconfig && mv /usr/local/ssl/lib/pkgconfig/*.pc /usr/local/lib/pkgconfig/) + RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ ca-certificates wget g++ autoconf libtool autotools-dev automake make && \ @@ -161,53 +179,6 @@ RUN cd /opt/build && \ make install DESTDIR=/opt/dist && \ make install -RUN apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - git make autoconf && \ - rm -rf /var/lib/apt/lists/* - -# build libx264 -ARG LIBX264_REPO=https://github.com/mirror/x264 -RUN cd /opt/build && \ - git clone ${LIBX264_REPO} -b stable --depth 1 && \ - cd x264 && \ - ./configure --prefix=/usr/local --libdir=/usr/local/lib \ - --enable-shared && \ - make -j$(nproc) && \ - make install DESTDIR=/opt/dist && \ - make install - -RUN apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates wget tar g++ make && \ - rm -rf /var/lib/apt/lists/* - -# build yasm -ARG YASM_REPO=https://www.tortall.net/projects/yasm/releases/yasm-1.3.0.tar.gz -RUN cd /opt/build && \ - wget -O - ${YASM_REPO} | tar xz -RUN cd /opt/build/yasm-1.3.0 && \ - # TODO remove the line below whether no other component inside this project requires it. - # `sed -i "s/) ytasm.*/)/" Makefile.in' && \ - ./configure --prefix=/usr/local --libdir=/usr/local/lib && \ - make -j $(nproc) && \ - make install - -RUN apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - libnuma-dev make && \ - rm -rf /var/lib/apt/lists/* - -# build libx265 -ARG LIBX265_REPO=https://github.com/videolan/x265/archive/3.4.tar.gz -RUN cd /opt/build && \ - wget -O - ${LIBX265_REPO} | tar xz && \ - cd x265-3.4/build/linux && \ - cmake -DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX=/usr/local -DLIB_INSTALL_DIR=/usr/local/lib ../../source && \ - make -j$(nproc) && \ - make install DESTDIR=/opt/dist && \ - make install - RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ python3-pip ninja-build python3-setuptools && \ @@ -235,6 +206,22 @@ RUN cd /opt/build/dav1d-0.9.0 && \ ninja install && \ DESTDIR=/opt/dist ninja install +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + ca-certificates wget tar g++ make && \ + rm -rf /var/lib/apt/lists/* + +# build yasm +ARG YASM_REPO=https://www.tortall.net/projects/yasm/releases/yasm-1.3.0.tar.gz +RUN cd /opt/build && \ + wget -O - ${YASM_REPO} | tar xz +RUN cd /opt/build/yasm-1.3.0 && \ + # TODO remove the line below whether no other component inside this project requires it. + # `sed -i "s/) ytasm.*/)/" Makefile.in' && \ + ./configure --prefix=/usr/local --libdir=/usr/local/lib && \ + make -j $(nproc) && \ + make install + RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ ca-certificates wget tar g++ make git && \ @@ -589,7 +576,7 @@ RUN cd /opt/build/gst-plugins-good-1.19.1 && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates tar g++ wget pkg-config libglib2.0-dev flex bison gobject-introspection libgirepository1.0-dev openssl libcurl4-gnutls-dev librtmp-dev mjpegtools libde265-dev && \ + ca-certificates tar g++ wget pkg-config libglib2.0-dev flex bison gobject-introspection libgirepository1.0-dev libcurl4-gnutls-dev librtmp-dev mjpegtools libx265-dev libde265-dev && \ rm -rf /var/lib/apt/lists/* # build gst-plugin-bad @@ -618,7 +605,7 @@ RUN cd /opt/build && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates tar g++ wget pkg-config libglib2.0-dev flex bison && \ + ca-certificates tar g++ wget pkg-config libglib2.0-dev flex bison libx264-dev && \ rm -rf /var/lib/apt/lists/* # build gst-plugin-ugly @@ -664,7 +651,8 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-gpl --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libx264 --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libdav1d && make -j$(nproc) && \ + --extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-openssl --extra-ldflags=-Wldnl + --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libdav1d && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install @@ -876,6 +864,9 @@ RUN rm -rf /opt/dist/usr/local/include && \ find /opt/dist -name "*.a" -exec rm -f {} \; || echo "" RUN rm -rf /opt/dist/usr/local/share/doc /opt/dist/usr/local/share/gtk-doc RUN rm -rf /opt/dist/usr/local/share/man +RUN rm -rf /opt/dist/usr/local/ssl/include +RUN rm -rf /opt/dist/usr/local/ssl/share/man +RUN rm -rf /opt/dist/usr/local/ssl/share/doc RUN cd /opt/dist/usr/local/openvino/inference-engine && \ rm -rf /opt/dist/usr/local/lib/pkgconfig/openvino.pc \ include src share/*.cmake cmake lib/intel64/*.a external/tbb/include external/tbb/cmake @@ -890,7 +881,7 @@ WORKDIR /home RUN apt-get update && apt-get upgrade -y systemd RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - libnuma1 libdrm2 libx11-6 libxext6 libxfixes3 libwayland-client0 libpciaccess0 libgtk-3-0 ocl-icd-libopencl1 libglib2.0-0 libxv1 libxt6 libasound2 libpangocairo-1.0-0 libcairo-gobject2 libtheora0 libvisual-0.4-0 libgl1-mesa-dri libgl1-mesa-glx libegl1-mesa libgdk-pixbuf2.0-0 libjpeg-turbo8 libpng16-16 zlib1g libsoup2.4-1 openssl libcurl3-gnutls librtmp1 mjpegtools libde265-0 libxcb-shape0 libxcb-xfixes0 libv4l-0 libass9 python3-gi python3-gi-cairo python3-dev python3-numpy libglib2.0-dev && \ + libdrm2 libx11-6 libxext6 libxfixes3 libwayland-client0 libpciaccess0 libgtk-3-0 libnuma1 ocl-icd-libopencl1 libglib2.0-0 libxv1 libxt6 libasound2 libpangocairo-1.0-0 libcairo-gobject2 libtheora0 libvisual-0.4-0 libgl1-mesa-dri libgl1-mesa-glx libegl1-mesa libgdk-pixbuf2.0-0 libjpeg-turbo8 libpng16-16 zlib1g libsoup2.4-1 libcurl3-gnutls librtmp1 mjpegtools libx265-142 libde265-0 libx264-155 libxcb-shape0 libxcb-xfixes0 libv4l-0 libass9 python3-gi python3-gi-cairo python3-dev python3-numpy libglib2.0-dev && \ rm -rf /var/lib/apt/lists/* COPY --from=build /opt/dist / diff --git a/XeonE3/ubuntu-18.04/analytics/dev/Dockerfile.m4 b/XeonE3/ubuntu-18.04/analytics/dev/Dockerfile.m4 index 85ac3bd27..a0fdc92a2 100644 --- a/XeonE3/ubuntu-18.04/analytics/dev/Dockerfile.m4 +++ b/XeonE3/ubuntu-18.04/analytics/dev/Dockerfile.m4 @@ -3,12 +3,11 @@ include(ubuntu.m4) include(cmake.m4) include(libogg.m4) include(libvorbis.m4) +include(openssl.m4) ifelse(defn(`BUILD_FDKAAC'),`ON',`include(libfdk-aac.m4)') include(libopus.m4) include(libvpx.m4) include(libaom.m4) -include(libx264.m4) -include(libx265.m4) include(meson.m4) include(dav1d.m4) include(svt-hevc.m4) diff --git a/XeonE3/ubuntu-18.04/analytics/ffmpeg/Dockerfile b/XeonE3/ubuntu-18.04/analytics/ffmpeg/Dockerfile index f317902ca..2daac83cf 100644 --- a/XeonE3/ubuntu-18.04/analytics/ffmpeg/Dockerfile +++ b/XeonE3/ubuntu-18.04/analytics/ffmpeg/Dockerfile @@ -524,7 +524,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-gpl --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libx264 --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libdav1d && make -j$(nproc) && \ + --extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 -rpath=/usr/local/ssl/lib --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libdav1d && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install diff --git a/XeonE3/ubuntu-18.04/analytics/gst/Dockerfile b/XeonE3/ubuntu-18.04/analytics/gst/Dockerfile index 76d53948a..e9ac1e205 100644 --- a/XeonE3/ubuntu-18.04/analytics/gst/Dockerfile +++ b/XeonE3/ubuntu-18.04/analytics/gst/Dockerfile @@ -643,7 +643,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-gpl --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libx264 --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libdav1d && make -j$(nproc) && \ + --extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 -rpath=/usr/local/ssl/lib --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libdav1d && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install diff --git a/XeonE3/ubuntu-18.04/media/dev/Dockerfile b/XeonE3/ubuntu-18.04/media/dev/Dockerfile index 5aaad5048..fcf213ebf 100644 --- a/XeonE3/ubuntu-18.04/media/dev/Dockerfile +++ b/XeonE3/ubuntu-18.04/media/dev/Dockerfile @@ -72,6 +72,24 @@ RUN cd /opt/build && \ make install DESTDIR=/opt/dist && \ make install +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + ca-certificates wget tar g++ make libtool autoconf && \ + rm -rf /var/lib/apt/lists/* + +# build openssl +ARG OPENSSL_REPO=https://github.com/openssl/openssl/archive/OpenSSL_1_1_1k.tar.gz +RUN cd /opt/build && \ + wget -O - ${OPENSSL_REPO} | tar xz && \ + cd openssl-OpenSSL_1_1_1k && \ + ./config no-ssl3 shared --prefix=/usr/local/ssl --openssldir=/usr/local/ssl -fPIC -Wl,-rpath=/usr/local/ssl/lib && \ + make depend && \ + make -s V=0 && \ + make install DESTDIR=/opt/dist && \ + (cd /opt/dist && mkdir -p ./usr/local/lib/pkgconfig && mv ./usr/local/ssl/lib/pkgconfig/*.pc ./usr/local/lib/pkgconfig/) && \ + make install && \ + (mkdir -p /usr/local/lib/pkgconfig && mv /usr/local/ssl/lib/pkgconfig/*.pc /usr/local/lib/pkgconfig/) + RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ ca-certificates wget g++ autoconf libtool autotools-dev automake make && \ @@ -148,53 +166,6 @@ RUN cd /opt/build && \ make install DESTDIR=/opt/dist && \ make install -RUN apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - git cmake make autoconf && \ - rm -rf /var/lib/apt/lists/* - -# build libx264 -ARG LIBX264_REPO=https://github.com/mirror/x264 -RUN cd /opt/build && \ - git clone ${LIBX264_REPO} -b stable --depth 1 && \ - cd x264 && \ - ./configure --prefix=/usr/local --libdir=/usr/local/lib \ - --enable-shared && \ - make -j$(nproc) && \ - make install DESTDIR=/opt/dist && \ - make install - -RUN apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates wget tar g++ make && \ - rm -rf /var/lib/apt/lists/* - -# build yasm -ARG YASM_REPO=https://www.tortall.net/projects/yasm/releases/yasm-1.3.0.tar.gz -RUN cd /opt/build && \ - wget -O - ${YASM_REPO} | tar xz -RUN cd /opt/build/yasm-1.3.0 && \ - # TODO remove the line below whether no other component inside this project requires it. - # `sed -i "s/) ytasm.*/)/" Makefile.in' && \ - ./configure --prefix=/usr/local --libdir=/usr/local/lib && \ - make -j $(nproc) && \ - make install - -RUN apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - libnuma-dev cmake make && \ - rm -rf /var/lib/apt/lists/* - -# build libx265 -ARG LIBX265_REPO=https://github.com/videolan/x265/archive/3.4.tar.gz -RUN cd /opt/build && \ - wget -O - ${LIBX265_REPO} | tar xz && \ - cd x265-3.4/build/linux && \ - cmake -DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX=/usr/local -DLIB_INSTALL_DIR=/usr/local/lib ../../source && \ - make -j$(nproc) && \ - make install DESTDIR=/opt/dist && \ - make install - RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ python3-pip ninja-build python3-setuptools && \ @@ -224,20 +195,19 @@ RUN cd /opt/build/dav1d-0.9.0 && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates tar g++ wget pkg-config ninja-build && \ + ca-certificates wget tar g++ make && \ rm -rf /var/lib/apt/lists/* -# build VMAF -ARG VMAF_VER=2.1.1 -ARG LIBVMAF_REPO=https://github.com/Netflix/vmaf/archive/refs/tags/v${VMAF_VER}.tar.gz +# build yasm +ARG YASM_REPO=https://www.tortall.net/projects/yasm/releases/yasm-1.3.0.tar.gz RUN cd /opt/build && \ - wget -O - ${LIBVMAF_REPO} | tar xz && ls -RUN cd /opt/build/vmaf-2.1.1/libvmaf && \ - ls && \ - meson build --prefix=/usr/local --libdir /usr/local/lib --buildtype=plain && \ - cd build && \ - ninja install && \ - DESTDIR=/opt/dist ninja install + wget -O - ${YASM_REPO} | tar xz +RUN cd /opt/build/yasm-1.3.0 && \ + # TODO remove the line below whether no other component inside this project requires it. + # `sed -i "s/) ytasm.*/)/" Makefile.in' && \ + ./configure --prefix=/usr/local --libdir=/usr/local/lib && \ + make -j $(nproc) && \ + make install RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ @@ -431,7 +401,7 @@ RUN cd /opt/build/gst-plugins-good-1.19.1 && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates tar g++ wget pkg-config libglib2.0-dev flex bison gobject-introspection libgirepository1.0-dev openssl libcurl4-gnutls-dev librtmp-dev mjpegtools libde265-dev && \ + ca-certificates tar g++ wget pkg-config libglib2.0-dev flex bison gobject-introspection libgirepository1.0-dev libcurl4-gnutls-dev librtmp-dev mjpegtools libx265-dev libde265-dev && \ rm -rf /var/lib/apt/lists/* # build gst-plugin-bad @@ -460,7 +430,7 @@ RUN cd /opt/build && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates tar g++ wget pkg-config libglib2.0-dev flex bison && \ + ca-certificates tar g++ wget pkg-config libglib2.0-dev flex bison libx264-dev && \ rm -rf /var/lib/apt/lists/* # build gst-plugin-ugly @@ -506,7 +476,8 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-gpl --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libx264 --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libvmaf --enable-version3 --enable-libdav1d && make -j$(nproc) && \ + --extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-openssl --extra-ldflags=-Wldnl + --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libdav1d && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install @@ -588,6 +559,9 @@ RUN rm -rf /opt/dist/usr/local/include && \ find /opt/dist -name "*.a" -exec rm -f {} \; || echo "" RUN rm -rf /opt/dist/usr/local/share/doc /opt/dist/usr/local/share/gtk-doc RUN rm -rf /opt/dist/usr/local/share/man +RUN rm -rf /opt/dist/usr/local/ssl/include +RUN rm -rf /opt/dist/usr/local/ssl/share/man +RUN rm -rf /opt/dist/usr/local/ssl/share/doc FROM ubuntu:18.04 LABEL Description="This is the base image for Gstreamer ubuntu 18.04" @@ -598,7 +572,7 @@ WORKDIR /home RUN apt-get update && apt-get upgrade -y systemd RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - libnuma1 libdrm2 libx11-6 libxext6 libxfixes3 libwayland-client0 libpciaccess0 libglib2.0-0 libxv1 libxt6 libasound2 libpangocairo-1.0-0 libcairo-gobject2 libtheora0 libvisual-0.4-0 libgl1-mesa-dri libgl1-mesa-glx libegl1-mesa libgdk-pixbuf2.0-0 libjpeg-turbo8 libpng16-16 zlib1g libsoup2.4-1 openssl libcurl3-gnutls librtmp1 mjpegtools libde265-0 libxcb-shape0 libxcb-xfixes0 libv4l-0 libass9 && \ + libdrm2 libx11-6 libxext6 libxfixes3 libwayland-client0 libpciaccess0 libglib2.0-0 libxv1 libxt6 libasound2 libpangocairo-1.0-0 libcairo-gobject2 libtheora0 libvisual-0.4-0 libgl1-mesa-dri libgl1-mesa-glx libegl1-mesa libgdk-pixbuf2.0-0 libjpeg-turbo8 libpng16-16 zlib1g libsoup2.4-1 libcurl3-gnutls librtmp1 mjpegtools libx265-142 libde265-0 libx264-155 libxcb-shape0 libxcb-xfixes0 libv4l-0 libass9 && \ rm -rf /var/lib/apt/lists/* COPY --from=build /opt/dist / diff --git a/XeonE3/ubuntu-18.04/media/dev/Dockerfile.m4 b/XeonE3/ubuntu-18.04/media/dev/Dockerfile.m4 index cd8915c4f..ceefd8726 100644 --- a/XeonE3/ubuntu-18.04/media/dev/Dockerfile.m4 +++ b/XeonE3/ubuntu-18.04/media/dev/Dockerfile.m4 @@ -3,15 +3,13 @@ include(begin.m4) include(ubuntu.m4) include(libogg.m4) include(libvorbis.m4) +include(openssl.m4) ifelse(defn(`BUILD_FDKAAC'),`ON',`include(libfdk-aac.m4)') include(libopus.m4) include(libvpx.m4) include(libaom.m4) -include(libx264.m4) -include(libx265.m4) include(meson.m4) include(dav1d.m4) -include(libvmaf.m4) include(svt-hevc.m4) include(svt-av1.m4) include(svt-vp9.m4) diff --git a/XeonE3/ubuntu-18.04/media/ffmpeg-vmaf/.dockerignore b/XeonE3/ubuntu-18.04/media/ffmpeg-vmaf/.dockerignore new file mode 100644 index 000000000..1cb8a04d9 --- /dev/null +++ b/XeonE3/ubuntu-18.04/media/ffmpeg-vmaf/.dockerignore @@ -0,0 +1,4 @@ +CMakeLists.txt +*.sh +*.m4 +test/* diff --git a/XeonE3/ubuntu-18.04/media/ffmpeg-vmaf/CMakeLists.txt b/XeonE3/ubuntu-18.04/media/ffmpeg-vmaf/CMakeLists.txt new file mode 100644 index 000000000..356c9dc18 --- /dev/null +++ b/XeonE3/ubuntu-18.04/media/ffmpeg-vmaf/CMakeLists.txt @@ -0,0 +1,3 @@ +set(image "xeone3_ffmpeg_vmaf_ubuntu1804") +include(image) +include(ffmpeg-tests) diff --git a/XeonE3/ubuntu-18.04/media/ffmpeg-vmaf/Dockerfile b/XeonE3/ubuntu-18.04/media/ffmpeg-vmaf/Dockerfile new file mode 100644 index 000000000..b048724e9 --- /dev/null +++ b/XeonE3/ubuntu-18.04/media/ffmpeg-vmaf/Dockerfile @@ -0,0 +1,440 @@ + + +# BSD 3-Clause License +# +# Copyright (c) 2021, Intel Corporation +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are met: +# +# * Redistributions of source code must retain the above copyright notice, this +# list of conditions and the following disclaimer. +# +# * Redistributions in binary form must reproduce the above copyright notice, +# this list of conditions and the following disclaimer in the documentation +# and/or other materials provided with the distribution. +# +# * Neither the name of the copyright holder nor the names of its +# contributors may be used to endorse or promote products derived from +# this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +# This file is automatically generated from .m4 template. +# To update, modify the template and regenerate. +FROM ubuntu:18.04 AS build + + +RUN mkdir -p /opt/build && mkdir -p /opt/dist + +ENV PKG_CONFIG_PATH=/usr/local/lib/pkgconfig + +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + ca-certificates wget make autoconf automake g++ && \ + rm -rf /var/lib/apt/lists/* + +# build libogg +ARG OGG_VER=1.3.5 +ARG LIBOGG_REPO=https://github.com/xiph/ogg/releases/download/v${OGG_VER}/libogg-1.3.5.tar.gz + +RUN cd /opt/build && \ + wget -O - ${LIBOGG_REPO} | tar xz && \ + cd libogg-1.3.5 && \ + ./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared && \ + make -j$(nproc) && \ + make install DESTDIR=/opt/dist && \ + make install + +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + ca-certificates wget make autoconf automake && \ + rm -rf /var/lib/apt/lists/* + +# build libvorbis +ARG VORBIS_VER=1.3.7 +ARG LIBVORBIS_REPO=https://github.com/xiph/vorbis/releases/download/v${VORBIS_VER}/libvorbis-1.3.7.tar.gz +RUN cd /opt/build && \ + wget -O - ${LIBVORBIS_REPO} | tar xz && \ + cd libvorbis-1.3.7 && \ + ./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared && \ + make -j$(nproc) && \ + make install DESTDIR=/opt/dist && \ + make install + +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + ca-certificates wget g++ autoconf libtool autotools-dev automake make && \ + rm -rf /var/lib/apt/lists/* + +# build libfdkaac +ARG LIBFDKAAC_REPO=https://github.com/mstorsjo/fdk-aac/archive/v2.0.2.tar.gz +RUN cd /opt/build && \ + wget -O - ${LIBFDKAAC_REPO} | tar xz && \ + cd fdk-aac-2.0.2 && \ + ./autogen.sh && \ + ./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared && \ + make -j$(nproc) && \ + make install DESTDIR=/opt/dist && \ + make install + +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + ca-certificates wget autoconf libtool make && \ + rm -rf /var/lib/apt/lists/* + +# build libopus +ARG LIBOPUS_REPO=https://archive.mozilla.org/pub/opus/opus-1.3.1.tar.gz +RUN cd /opt/build && \ + wget -O - ${LIBOPUS_REPO} | tar xz && \ + cd opus-1.3.1 && \ + ./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared && \ + make -j$(nproc) && \ + make install DESTDIR=/opt/dist && \ + make install + +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + ca-certificates wget tar g++ make bzip2 && \ + rm -rf /var/lib/apt/lists/* + +# build nasm +ARG NASM_REPO=https://www.nasm.us/pub/nasm/releasebuilds/2.15.05/nasm-2.15.05.tar.bz2 +RUN cd /opt/build && \ + wget -O - ${NASM_REPO} | tar xj && \ + cd nasm-2.15.05 && \ + ./autogen.sh && \ + ./configure --prefix=/usr/local --libdir=/usr/local/lib && \ + make -j$(nproc) && \ + make install + +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + git cmake make autoconf && \ + rm -rf /var/lib/apt/lists/* + +# build libvpx +ARG LIBVPX_REPO=https://chromium.googlesource.com/webm/libvpx.git +RUN cd /opt/build && \ + git clone ${LIBVPX_REPO} -b v1.10.0 --depth 1 && \ + cd libvpx && \ + ./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-examples --disable-unit-tests --enable-vp9-highbitdepth --as=nasm && \ + make -j$(nproc) && \ + make install DESTDIR=/opt/dist && \ + make install + +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + git cmake make autoconf && \ + rm -rf /var/lib/apt/lists/* + +# build libx264 +ARG LIBX264_REPO=https://github.com/mirror/x264 +RUN cd /opt/build && \ + git clone ${LIBX264_REPO} -b stable --depth 1 && \ + cd x264 && \ + ./configure --prefix=/usr/local --libdir=/usr/local/lib \ + --enable-shared && \ + make -j$(nproc) && \ + make install DESTDIR=/opt/dist && \ + make install + +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + ca-certificates wget tar g++ make && \ + rm -rf /var/lib/apt/lists/* + +# build yasm +ARG YASM_REPO=https://www.tortall.net/projects/yasm/releases/yasm-1.3.0.tar.gz +RUN cd /opt/build && \ + wget -O - ${YASM_REPO} | tar xz +RUN cd /opt/build/yasm-1.3.0 && \ + # TODO remove the line below whether no other component inside this project requires it. + # `sed -i "s/) ytasm.*/)/" Makefile.in' && \ + ./configure --prefix=/usr/local --libdir=/usr/local/lib && \ + make -j $(nproc) && \ + make install + +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + libnuma-dev cmake make && \ + rm -rf /var/lib/apt/lists/* + +# build libx265 +ARG LIBX265_REPO=https://github.com/videolan/x265/archive/3.4.tar.gz +RUN cd /opt/build && \ + wget -O - ${LIBX265_REPO} | tar xz && \ + cd x265-3.4/build/linux && \ + cmake -DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX=/usr/local -DLIB_INSTALL_DIR=/usr/local/lib ../../source && \ + make -j$(nproc) && \ + make install DESTDIR=/opt/dist && \ + make install + +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + python3-pip ninja-build python3-setuptools && \ + rm -rf /var/lib/apt/lists/* + +# build meson +ARG MESON_REPO=https://github.com/mesonbuild/meson +RUN git clone ${MESON_REPO}; \ + cd meson; \ + git checkout 0.58.1; \ + python3 setup.py install; + +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + ca-certificates tar g++ wget pkg-config && \ + rm -rf /var/lib/apt/lists/* + +# build dav1d +ARG DAV1D_REPO=https://code.videolan.org/videolan/dav1d/-/archive/0.9.0/dav1d-0.9.0.tar.gz +RUN cd /opt/build && \ + wget -O - ${DAV1D_REPO} | tar xz +RUN cd /opt/build/dav1d-0.9.0 && \ + meson build --prefix=/usr/local --libdir /usr/local/lib --buildtype=plain && \ + cd build && \ + ninja install && \ + DESTDIR=/opt/dist ninja install + +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + ca-certificates tar g++ wget pkg-config ninja-build && \ + rm -rf /var/lib/apt/lists/* + +# build VMAF +ARG VMAF_VER=2.1.1 +ARG LIBVMAF_REPO=https://github.com/Netflix/vmaf/archive/refs/tags/v${VMAF_VER}.tar.gz +RUN cd /opt/build && \ + wget -O - ${LIBVMAF_REPO} | tar xz && ls +RUN cd /opt/build/vmaf-2.1.1/libvmaf && \ + ls && \ + meson build --prefix=/usr/local --libdir /usr/local/lib --buildtype=plain && \ + cd build && \ + ninja install && \ + DESTDIR=/opt/dist ninja install + +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + ca-certificates wget tar g++ make cmake git && \ + rm -rf /var/lib/apt/lists/* + +# build svt-hevc +ARG SVT_HEVC_REPO=https://github.com/OpenVisualCloud/SVT-HEVC +RUN cd /opt/build && \ + git clone -b v1.5.1 --depth 1 ${SVT_HEVC_REPO} +RUN cd /opt/build/SVT-HEVC/Build/linux && \ + cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_INSTALL_LIBDIR=/usr/local/lib -DCMAKE_ASM_NASM_COMPILER=yasm ../.. && \ + make -j $(nproc) && \ + make install DESTDIR=/opt/dist && \ + make install + +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + ca-certificates wget tar g++ make cmake git && \ + rm -rf /var/lib/apt/lists/* + +# build svt av1 +ARG SVT_AV1_REPO=https://gitlab.com/AOMediaCodec/SVT-AV1/-/archive/v0.8.7/SVT-AV1-v0.8.7.tar.gz +RUN cd /opt/build && \ + wget -O - ${SVT_AV1_REPO} | tar zx && \ + mv SVT-AV1-v0.8.7 SVT-AV1 && \ + cd SVT-AV1/Build/linux && \ + cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_INSTALL_LIBDIR=/usr/local/lib -DCMAKE_ASM_NASM_COMPILER=yasm ../.. && \ + make -j $(nproc) && \ + sed -i "s/SvtAv1dec/SvtAv1Dec/" SvtAv1Dec.pc && \ + make install DESTDIR=/opt/dist && \ + make install + +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + ca-certificates wget tar g++ make cmake git && \ + rm -rf /var/lib/apt/lists/* + +# build svt vp9 +ARG SVT_VP9_REPO=https://github.com/OpenVisualCloud/SVT-VP9 +RUN cd /opt/build && \ + git clone ${SVT_VP9_REPO} -b v0.2.2 --depth 1 && \ + cd SVT-VP9/Build/linux && \ + cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_INSTALL_LIBDIR=/usr/local/lib -DCMAKE_ASM_NASM_COMPILER=yasm ../.. && \ + make -j $(nproc) && \ + make install DESTDIR=/opt/dist && \ + make install + +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + ca-certificates cmake g++ make wget && \ + rm -rf /var/lib/apt/lists/* + +# build gmmlib +ARG GMMLIB_REPO=https://github.com/intel/gmmlib/archive/intel-gmmlib-21.1.3.tar.gz +RUN cd /opt/build && \ + wget -O - ${GMMLIB_REPO} | tar xz +RUN cd /opt/build/gmmlib-intel-gmmlib-21.1.3 && mkdir build && cd build && \ + cmake -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_INSTALL_LIBDIR=/usr/local/lib .. && \ + make -j$(nproc) && \ + make install DESTDIR=/opt/dist && \ + make install + +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + automake ca-certificates gcc libdrm-dev libtool make pkg-config wget libx11-dev libxext-dev libxfixes-dev libwayland-dev && \ + rm -rf /var/lib/apt/lists/* + +# build libva2 +ARG LIBVA2_REPO=https://github.com/intel/libva/archive/2.11.0.tar.gz +RUN cd /opt/build && \ + wget -O - ${LIBVA2_REPO} | tar xz +RUN cd /opt/build/libva-2.11.0 && \ + ./autogen.sh --prefix=/usr/local --libdir=/usr/local/lib && \ + make -j$(nproc) && \ + make install DESTDIR=/opt/dist && \ + make install + +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + ca-certificates cmake g++ libpciaccess-dev make pkg-config wget && \ + rm -rf /var/lib/apt/lists/* + +# build media driver +ARG MEDIA_DRIVER_REPO=https://github.com/intel/media-driver/archive/intel-media-21.1.3.tar.gz +RUN cd /opt/build && \ + wget -O - ${MEDIA_DRIVER_REPO} | tar xz +RUN cd /opt/build/media-driver-intel-media-21.1.3 && mkdir build && cd build && \ + cmake -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_INSTALL_LIBDIR=/usr/local/lib -DENABLE_PRODUCTION_KMD=OFF .. && \ + make -j$(nproc) && \ + make install DESTDIR=/opt/dist && \ + make install + +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + ca-certificates gcc g++ make cmake pkg-config wget && \ + rm -rf /var/lib/apt/lists/* + +# build media sdk +ARG MSDK_REPO=https://github.com/Intel-Media-SDK/MediaSDK/archive/intel-mediasdk-21.1.3.tar.gz +RUN cd /opt/build && \ + wget -O - ${MSDK_REPO} | tar xz +RUN cd /opt/build/MediaSDK-intel-mediasdk-21.1.3 && \ + mkdir -p build && cd build && \ + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr/local \ + -DCMAKE_INSTALL_LIBDIR=/usr/local/lib \ + -DBUILD_SAMPLES=no \ + -DBUILD_TUTORIALS=OFF \ + .. && \ + make -j$(nproc) && \ + make install DESTDIR=/opt/dist && \ + make install + +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + ca-certificates cmake gcc g++ make wget python3-numpy ccache libeigen3-dev && \ + rm -rf /var/lib/apt/lists/* + +# build opencv +ARG OPENCV_REPO=https://github.com/opencv/opencv/archive/4.5.2.tar.gz +RUN cd /opt/build && \ + wget -O - ${OPENCV_REPO} | tar xz +# TODO: file a bug against opencv since they do not accept full libdir +RUN cd /opt/build/opencv-4.5.2 && mkdir build && cd build && \ + cmake \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr/local \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DOPENCV_GENERATE_PKGCONFIG=ON \ + -DBUILD_DOCS=OFF \ + -DBUILD_EXAMPLES=OFF \ + -DBUILD_PERF_TESTS=OFF \ + -DBUILD_TESTS=OFF \ + .. && \ + make -j $(nproc) && \ + make install DESTDIR=/opt/dist && \ + make install + +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + build-essential ca-certificates wget patch libv4l-dev libass-dev && \ + rm -rf /var/lib/apt/lists/* + +# build ffmpeg +ARG FFMPEG_REPO=https://github.com/FFmpeg/FFmpeg/archive/n4.4.tar.gz +RUN cd /opt/build && \ + wget -O - ${FFMPEG_REPO} | tar xz + +RUN cd /opt/build/FFmpeg-n4.4 && \ + patch -p1 < /opt/build/SVT-HEVC/ffmpeg_plugin/n4.4-0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch || true +#ifdef(`BUILD_SVT_VP9',`FFMPEG_PATCH_SVT_VP9(BUILD_HOME/FFmpeg-FFMPEG_VER)')dnl +#ifdef(`BUILD_DLDT',`FFMPEG_PATCH_ANALYTICS(BUILD_HOME/FFmpeg-FFMPEG_VER)')dnl +#ifdef(`BUILD_OPENVINO',`FFMPEG_PATCH_ANALYTICS(BUILD_HOME/FFmpeg-FFMPEG_VER)')dnl +ARG FFMPEG_PATCH_VAAPI_REPO=https://github.com/OpenVisualCloud/Dockerfiles-Resources/raw/master/ffmpeg-patch-0041-lavc-vaapi_encode_h265-fix-max_transform_hierarchy_d.tar.gz +RUN cd /opt/build && \ + wget -O - ${FFMPEG_PATCH_VAAPI_REPO} | tar xz && \ + cd /opt/build/FFmpeg-n4.4 && \ + patch -p1 < ../0041-lavc-vaapi_encode_h265-fix-max_transform_hierarchy_d.patch || true + + +ARG FFMPEG_1TN_PATCH_REPO=https://raw.githubusercontent.com/OpenVisualCloud/Dockerfiles-Resources/master/n4.4-enhance_1tn_performance.patch +RUN cd /opt/build/FFmpeg-n4.4 && \ + wget -O - ${FFMPEG_1TN_PATCH_REPO} | patch -p1; + +RUN cd /opt/build/FFmpeg-n4.4 && \ + ./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-static --disable-doc --disable-htmlpages \ + --disable-manpages --disable-podpages --disable-txtpages \ + --extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 -rpath=/usr/local/ssl/lib --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libvmaf --enable-version3 --enable-libdav1d && make -j$(nproc) && \ + make install DESTDIR=/opt/dist && \ + make install + +RUN cd /opt/build/opencv-4.5.2/build && \ + rm -rf ./* && \ + cmake \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr/local \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DOPENCV_GENERATE_PKGCONFIG=ON \ + -DBUILD_DOCS=OFF \ + -DBUILD_EXAMPLES=OFF \ + -DBUILD_PERF_TESTS=OFF \ + -DBUILD_TESTS=OFF \ + .. && \ + cd modules/videoio && \ + make -j $(nproc) && \ + cp -f ../../lib/libopencv_videoio.so.4.5.2 /opt/dist/usr/local/lib + +# cleanup +RUN rm -rf /opt/dist/usr/local/include && \ + rm -rf /opt/dist/usr/local/lib/pkgconfig && \ + find /opt/dist -name "*.a" -exec rm -f {} \; || echo "" +RUN rm -rf /opt/dist/usr/local/share/doc /opt/dist/usr/local/share/gtk-doc +RUN rm -rf /opt/dist/usr/local/share/man + +FROM ubuntu:18.04 +LABEL Description="This is the base image for FFMPEG ubuntu 18.04" +LABEL Vendor="Intel Corporation" +WORKDIR /home + +# Install +RUN apt-get update && apt-get upgrade -y systemd +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + libnuma1 libdrm2 libx11-6 libxext6 libxfixes3 libwayland-client0 libpciaccess0 libxcb-shape0 libxcb-xfixes0 libv4l-0 libass9 && \ + rm -rf /var/lib/apt/lists/* + +COPY --from=build /opt/dist / +RUN echo "/usr/local/lib" >> /etc/ld.so.conf.d/all-libs.conf && ldconfig + +ENV LIBVA_DRIVERS_PATH=/usr/local/lib/dri +ENV LIBVA_DRIVER_NAME=iHD +ENV DISPLAY=:0.0 + + diff --git a/XeonE3/ubuntu-18.04/media/ffmpeg-vmaf/Dockerfile.m4 b/XeonE3/ubuntu-18.04/media/ffmpeg-vmaf/Dockerfile.m4 new file mode 100644 index 000000000..f93ce01ca --- /dev/null +++ b/XeonE3/ubuntu-18.04/media/ffmpeg-vmaf/Dockerfile.m4 @@ -0,0 +1,39 @@ + +include(begin.m4) +include(ubuntu.m4) +include(libogg.m4) +include(libvorbis.m4) +ifelse(defn(`BUILD_FDKAAC'),`ON',`include(libfdk-aac.m4)') +include(libopus.m4) +include(libvpx.m4) +include(libx264.m4) +include(libx265.m4) +include(meson.m4) +include(dav1d.m4) +include(libvmaf.m4) +include(svt-hevc.m4) +include(svt-av1.m4) +include(svt-vp9.m4) +include(gmmlib.m4) +include(libva2.m4) +include(media-driver.m4) +include(msdk.m4) +include(opencv.m4) +include(ffmpeg.m4) +include(end.m4)dnl + +PREAMBLE +FROM OS_NAME:OS_VERSION AS build + +BUILD_ALL()dnl +CLEANUP()dnl + +FROM OS_NAME:OS_VERSION +LABEL Description="This is the base image for FFMPEG OS_NAME OS_VERSION" +LABEL Vendor="Intel Corporation" +WORKDIR /home + +# Install +UPGRADE_UBUNTU_COMPONENTS() +INSTALL_ALL(runtime,build) + diff --git a/XeonE3/ubuntu-18.04/media/ffmpeg-vmaf/README.md b/XeonE3/ubuntu-18.04/media/ffmpeg-vmaf/README.md new file mode 100644 index 000000000..6f11f521e --- /dev/null +++ b/XeonE3/ubuntu-18.04/media/ffmpeg-vmaf/README.md @@ -0,0 +1,47 @@ +This docker image is part of Open Visual Cloud software stacks. Optimized for the media creation and delivery use case. Included FFmpeg and codecs such as opus, ogg, vorbis, x264, x265, vp8/9, av1 and SVT-HEVC. Also included Intel hardware accelaration software stack such as media SDK, media driver, gmmlib and libva. The docker image can be used in the FROM field of a downstream Dockerfile. + +## Supported tags and respective Dockerfile links + - [xeone3-ubuntu-1804-media-ffmpeg](https://github.com/OpenVisualCloud/Dockerfiles/blob/v21.3/XeonE3/ubuntu-18.04/media/ffmpeg/Dockerfile) + +## Quick reference +- #### Supported platform and OS + Intel® Xeon® E3 platform, Ubuntu 18.04 + +- #### Usage instructions: + [FFmpeg](https://github.com/OpenVisualCloud/Dockerfiles/blob/master/doc/ffmpeg.md) + + +- #### Getting started with Dockerfiles: + [OpenVisualCloud Dockerfiles Wiki](https://github.com/OpenVisualCloud/Dockerfiles/wiki) + +- #### File issues: + [OpenVisualCloud Dockerfiles Issues](https://github.com/OpenVisualCloud/Dockerfiles/issues) + + +## License +This docker installs third party components licensed under various open source licenses. The terms under which those components may be used and distributed can be found with the license document that is provided with those components. Please familiarize yourself with those terms to ensure your distribution of those components complies with the terms of those licenses. + + +| Components | License | +| ----- | ----- | +|Ubuntu| [Various](https://hub.docker.com/_/ubuntu) | +|libogg|BSD 3-clause "New" or "Revised" License| +|libvorbis|BSD 3-clause "New" or "Revised" License| +|Opus Interactive Audio Codec|BSD 3-clause "New" or "Revised" License| +|libvpx|BSD 3-clause "New" or "Revised" License| +|x264|GNU General Public License v2.0 or later| +|x265|GNU General Public License v2.0 or later| +|dav1d|BSD 2-clause "Simplified" License| +|Intel SVT-HEVC|BSD-2-Clause Plus Patent License| +|Intel SVT-AV1|BSD-2-Clause Plus Patent License| +|Intel SVT-VP9|BSD-2-Clause Plus Patent License| +|Intel Graphics Memory Management Library| MIT License| +|Intel libva| MIT License +|Intel media driver | MIT License| +|Intel media SDK|MIT License| +|OpenCV|BSD 3-clause "New" or "Revised" License| +|FFmpeg|GNU Lesser General Public License v2.1 or later| + + +More license information can be found in [components source package](https://github.com/OpenVisualCloud/Dockerfiles-Resources). +As for any pre-built image usage, it is the image user's responsibility to ensure that any use of this image complies with any relevant licenses and potential fees for all software contained within. We will have no indemnity or warranty coverage from suppliers. diff --git a/XeonE3/ubuntu-18.04/media/ffmpeg-vmaf/build.sh b/XeonE3/ubuntu-18.04/media/ffmpeg-vmaf/build.sh new file mode 100755 index 000000000..b93ff05b8 --- /dev/null +++ b/XeonE3/ubuntu-18.04/media/ffmpeg-vmaf/build.sh @@ -0,0 +1,6 @@ +#!/bin/bash -e + +IMAGE="xeone3-ubuntu1804-media-ffmpeg-vmaf" +DIR=$(dirname $(readlink -f "$0")) + +. "${DIR}/../../../../script/build.sh" diff --git a/XeonE3/ubuntu-18.04/media/ffmpeg-vmaf/shell.sh b/XeonE3/ubuntu-18.04/media/ffmpeg-vmaf/shell.sh new file mode 100755 index 000000000..133c453ff --- /dev/null +++ b/XeonE3/ubuntu-18.04/media/ffmpeg-vmaf/shell.sh @@ -0,0 +1,6 @@ +#!/bin/bash -e + +IMAGE="xeone3-ubuntu1804-media-ffmpeg-vmaf" +DIR=$(dirname $(readlink -f "$0")) + +. "${DIR}/../../../../script/shell.sh" diff --git a/XeonE3/ubuntu-18.04/media/ffmpeg/Dockerfile b/XeonE3/ubuntu-18.04/media/ffmpeg/Dockerfile index 8e46ee188..1cf669042 100644 --- a/XeonE3/ubuntu-18.04/media/ffmpeg/Dockerfile +++ b/XeonE3/ubuntu-18.04/media/ffmpeg/Dockerfile @@ -207,23 +207,6 @@ RUN cd /opt/build/dav1d-0.9.0 && \ ninja install && \ DESTDIR=/opt/dist ninja install -RUN apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates tar g++ wget pkg-config ninja-build && \ - rm -rf /var/lib/apt/lists/* - -# build VMAF -ARG VMAF_VER=2.1.1 -ARG LIBVMAF_REPO=https://github.com/Netflix/vmaf/archive/refs/tags/v${VMAF_VER}.tar.gz -RUN cd /opt/build && \ - wget -O - ${LIBVMAF_REPO} | tar xz && ls -RUN cd /opt/build/vmaf-2.1.1/libvmaf && \ - ls && \ - meson build --prefix=/usr/local --libdir /usr/local/lib --buildtype=plain && \ - cd build && \ - ninja install && \ - DESTDIR=/opt/dist ninja install - RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ ca-certificates wget tar g++ make cmake git && \ @@ -391,7 +374,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-gpl --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libx264 --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libvmaf --enable-version3 --enable-libdav1d && make -j$(nproc) && \ + --extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 -rpath=/usr/local/ssl/lib --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libdav1d && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install diff --git a/XeonE3/ubuntu-18.04/media/ffmpeg/Dockerfile.m4 b/XeonE3/ubuntu-18.04/media/ffmpeg/Dockerfile.m4 index f93ce01ca..dfa35f41f 100644 --- a/XeonE3/ubuntu-18.04/media/ffmpeg/Dockerfile.m4 +++ b/XeonE3/ubuntu-18.04/media/ffmpeg/Dockerfile.m4 @@ -10,7 +10,6 @@ include(libx264.m4) include(libx265.m4) include(meson.m4) include(dav1d.m4) -include(libvmaf.m4) include(svt-hevc.m4) include(svt-av1.m4) include(svt-vp9.m4) diff --git a/XeonE3/ubuntu-18.04/media/gst/Dockerfile b/XeonE3/ubuntu-18.04/media/gst/Dockerfile index 0e141d2e9..6ed8949a8 100644 --- a/XeonE3/ubuntu-18.04/media/gst/Dockerfile +++ b/XeonE3/ubuntu-18.04/media/gst/Dockerfile @@ -468,7 +468,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-gpl --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libx264 --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libdav1d && make -j$(nproc) && \ + --extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 -rpath=/usr/local/ssl/lib --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libdav1d && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install diff --git a/XeonE3/ubuntu-18.04/service/owt-dev/Dockerfile b/XeonE3/ubuntu-18.04/service/owt-dev/Dockerfile index 24f0b8e41..ec1814e3f 100644 --- a/XeonE3/ubuntu-18.04/service/owt-dev/Dockerfile +++ b/XeonE3/ubuntu-18.04/service/owt-dev/Dockerfile @@ -381,7 +381,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-gpl --enable-nonfree --enable-libass --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-openssl --extra-ldflags=-Wl,-rpath=/usr/local/ssl/lib --enable-libfdk-aac --enable-libvpx --enable-libx264 --enable-libsvthevc && make -j$(nproc) && \ + --extra-cflags=-w --enable-libass --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libfdk-aac --enable-libvpx --enable-gpl --enable-libx264 --enable-libsvthevc && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install diff --git a/XeonE3/ubuntu-18.04/service/owt-dev/Dockerfile.m4 b/XeonE3/ubuntu-18.04/service/owt-dev/Dockerfile.m4 index d91dace91..eb577642a 100644 --- a/XeonE3/ubuntu-18.04/service/owt-dev/Dockerfile.m4 +++ b/XeonE3/ubuntu-18.04/service/owt-dev/Dockerfile.m4 @@ -13,6 +13,7 @@ include(media-driver.m4) include(msdk.m4) include(opencv.m4) include(dldt-ie.m4) +DECLARE(`FFMPEG_OPENSSL_NOBIND',true) include(ffmpeg.m4) include(meson.m4) include(gst-core.m4) diff --git a/XeonE3/ubuntu-18.04/service/owt/Dockerfile b/XeonE3/ubuntu-18.04/service/owt/Dockerfile index d8dad4b84..0c0cb6f67 100644 --- a/XeonE3/ubuntu-18.04/service/owt/Dockerfile +++ b/XeonE3/ubuntu-18.04/service/owt/Dockerfile @@ -381,7 +381,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-gpl --enable-nonfree --enable-libass --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-openssl --extra-ldflags=-Wl,-rpath=/usr/local/ssl/lib --enable-libfdk-aac --enable-libvpx --enable-libx264 --enable-libsvthevc && make -j$(nproc) && \ + --extra-cflags=-w --enable-libass --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libfdk-aac --enable-libvpx --enable-gpl --enable-libx264 --enable-libsvthevc && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install diff --git a/XeonE3/ubuntu-18.04/service/owt/Dockerfile.m4 b/XeonE3/ubuntu-18.04/service/owt/Dockerfile.m4 index 2a5821723..23f2257cc 100644 --- a/XeonE3/ubuntu-18.04/service/owt/Dockerfile.m4 +++ b/XeonE3/ubuntu-18.04/service/owt/Dockerfile.m4 @@ -13,6 +13,7 @@ include(media-driver.m4) include(msdk.m4) include(opencv.m4) include(dldt-ie.m4) +DECLARE(`FFMPEG_OPENSSL_NOBIND',true) include(ffmpeg.m4) include(meson.m4) include(gst-core.m4) diff --git a/XeonE3/ubuntu-18.04/service/owt360/Dockerfile b/XeonE3/ubuntu-18.04/service/owt360/Dockerfile index d3bcbe62e..f8766ddbe 100644 --- a/XeonE3/ubuntu-18.04/service/owt360/Dockerfile +++ b/XeonE3/ubuntu-18.04/service/owt360/Dockerfile @@ -382,7 +382,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-gpl --enable-nonfree --enable-libass --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-openssl --extra-ldflags=-Wl,-rpath=/usr/local/ssl/lib --enable-libfdk-aac --enable-libvpx --enable-libx264 --enable-libsvthevc && make -j$(nproc) && \ + --extra-cflags=-w --enable-libass --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libfdk-aac --enable-libvpx --enable-gpl --enable-libx264 --enable-libsvthevc && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install diff --git a/XeonE3/ubuntu-18.04/service/owt360/Dockerfile.m4 b/XeonE3/ubuntu-18.04/service/owt360/Dockerfile.m4 index 16db706d0..cc01b7250 100644 --- a/XeonE3/ubuntu-18.04/service/owt360/Dockerfile.m4 +++ b/XeonE3/ubuntu-18.04/service/owt360/Dockerfile.m4 @@ -14,6 +14,7 @@ include(media-driver.m4) include(msdk.m4) include(opencv.m4) include(dldt-ie.m4) +DECLARE(`FFMPEG_OPENSSL_NOBIND',true) include(ffmpeg.m4) include(scvp.m4) include(owt360.m4) diff --git a/XeonE3/ubuntu-20.04/analytics/dev/Dockerfile b/XeonE3/ubuntu-20.04/analytics/dev/Dockerfile index ac8db38cd..eed344747 100644 --- a/XeonE3/ubuntu-20.04/analytics/dev/Dockerfile +++ b/XeonE3/ubuntu-20.04/analytics/dev/Dockerfile @@ -71,6 +71,24 @@ RUN cd /opt/build && \ make install DESTDIR=/opt/dist && \ make install +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + ca-certificates wget tar g++ make libtool autoconf && \ + rm -rf /var/lib/apt/lists/* + +# build openssl +ARG OPENSSL_REPO=https://github.com/openssl/openssl/archive/OpenSSL_1_1_1k.tar.gz +RUN cd /opt/build && \ + wget -O - ${OPENSSL_REPO} | tar xz && \ + cd openssl-OpenSSL_1_1_1k && \ + ./config no-ssl3 shared --prefix=/usr/local/ssl --openssldir=/usr/local/ssl -fPIC -Wl,-rpath=/usr/local/ssl/lib && \ + make depend && \ + make -s V=0 && \ + make install DESTDIR=/opt/dist && \ + (cd /opt/dist && mkdir -p ./usr/local/lib/pkgconfig && mv ./usr/local/ssl/lib/pkgconfig/*.pc ./usr/local/lib/pkgconfig/) && \ + make install && \ + (mkdir -p /usr/local/lib/pkgconfig && mv /usr/local/ssl/lib/pkgconfig/*.pc /usr/local/lib/pkgconfig/) + RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ ca-certificates wget g++ autoconf libtool autotools-dev automake make && \ @@ -147,53 +165,6 @@ RUN cd /opt/build && \ make install DESTDIR=/opt/dist && \ make install -RUN apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - git cmake make autoconf && \ - rm -rf /var/lib/apt/lists/* - -# build libx264 -ARG LIBX264_REPO=https://github.com/mirror/x264 -RUN cd /opt/build && \ - git clone ${LIBX264_REPO} -b stable --depth 1 && \ - cd x264 && \ - ./configure --prefix=/usr/local --libdir=/usr/local/lib \ - --enable-shared && \ - make -j$(nproc) && \ - make install DESTDIR=/opt/dist && \ - make install - -RUN apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates wget tar g++ make && \ - rm -rf /var/lib/apt/lists/* - -# build yasm -ARG YASM_REPO=https://www.tortall.net/projects/yasm/releases/yasm-1.3.0.tar.gz -RUN cd /opt/build && \ - wget -O - ${YASM_REPO} | tar xz -RUN cd /opt/build/yasm-1.3.0 && \ - # TODO remove the line below whether no other component inside this project requires it. - # `sed -i "s/) ytasm.*/)/" Makefile.in' && \ - ./configure --prefix=/usr/local --libdir=/usr/local/lib && \ - make -j $(nproc) && \ - make install - -RUN apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - libnuma-dev cmake make && \ - rm -rf /var/lib/apt/lists/* - -# build libx265 -ARG LIBX265_REPO=https://github.com/videolan/x265/archive/3.4.tar.gz -RUN cd /opt/build && \ - wget -O - ${LIBX265_REPO} | tar xz && \ - cd x265-3.4/build/linux && \ - cmake -DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX=/usr/local -DLIB_INSTALL_DIR=/usr/local/lib ../../source && \ - make -j$(nproc) && \ - make install DESTDIR=/opt/dist && \ - make install - RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ python3-pip ninja-build python3-setuptools && \ @@ -221,6 +192,22 @@ RUN cd /opt/build/dav1d-0.9.0 && \ ninja install && \ DESTDIR=/opt/dist ninja install +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + ca-certificates wget tar g++ make && \ + rm -rf /var/lib/apt/lists/* + +# build yasm +ARG YASM_REPO=https://www.tortall.net/projects/yasm/releases/yasm-1.3.0.tar.gz +RUN cd /opt/build && \ + wget -O - ${YASM_REPO} | tar xz +RUN cd /opt/build/yasm-1.3.0 && \ + # TODO remove the line below whether no other component inside this project requires it. + # `sed -i "s/) ytasm.*/)/" Makefile.in' && \ + ./configure --prefix=/usr/local --libdir=/usr/local/lib && \ + make -j $(nproc) && \ + make install + RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ ca-certificates wget tar g++ make cmake git && \ @@ -575,7 +562,7 @@ RUN cd /opt/build/gst-plugins-good-1.19.1 && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates tar g++ wget pkg-config libglib2.0-dev flex bison gobject-introspection libgirepository1.0-dev openssl libcurl4-gnutls-dev librtmp-dev mjpegtools libde265-dev && \ + ca-certificates tar g++ wget pkg-config libglib2.0-dev flex bison gobject-introspection libgirepository1.0-dev libcurl4-gnutls-dev librtmp-dev mjpegtools libx265-dev libde265-dev && \ rm -rf /var/lib/apt/lists/* # build gst-plugin-bad @@ -604,7 +591,7 @@ RUN cd /opt/build && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates tar g++ wget pkg-config libglib2.0-dev flex bison && \ + ca-certificates tar g++ wget pkg-config libglib2.0-dev flex bison libx264-dev && \ rm -rf /var/lib/apt/lists/* # build gst-plugin-ugly @@ -650,7 +637,8 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-gpl --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libx264 --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libdav1d && make -j$(nproc) && \ + --extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-openssl --extra-ldflags=-Wldnl + --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libdav1d && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install @@ -862,6 +850,9 @@ RUN rm -rf /opt/dist/usr/local/include && \ find /opt/dist -name "*.a" -exec rm -f {} \; || echo "" RUN rm -rf /opt/dist/usr/local/share/doc /opt/dist/usr/local/share/gtk-doc RUN rm -rf /opt/dist/usr/local/share/man +RUN rm -rf /opt/dist/usr/local/ssl/include +RUN rm -rf /opt/dist/usr/local/ssl/share/man +RUN rm -rf /opt/dist/usr/local/ssl/share/doc RUN cd /opt/dist/usr/local/openvino/inference-engine && \ rm -rf /opt/dist/usr/local/lib/pkgconfig/openvino.pc \ include src share/*.cmake cmake lib/intel64/*.a external/tbb/include external/tbb/cmake @@ -876,7 +867,7 @@ WORKDIR /home RUN apt-get update && apt-get upgrade -y systemd RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - libnuma1 libdrm2 libx11-6 libxext6 libxfixes3 libwayland-client0 libpciaccess0 libgtk-3-0 ocl-icd-libopencl1 libglib2.0-0 libxv1 libxt6 libasound2 libpangocairo-1.0-0 libcairo-gobject2 libtheora0 libvisual-0.4-0 libgl1-mesa-dri libgl1-mesa-glx libegl1-mesa libgdk-pixbuf2.0-0 libjpeg-turbo8 libpng16-16 zlib1g libsoup2.4-1 openssl libcurl3-gnutls librtmp1 mjpegtools libde265-0 libxcb-shape0 libxcb-xfixes0 libv4l-0 libass9 libgles2 python3-gi python3-gi-cairo python3-dev python3-numpy libglib2.0-dev && \ + libdrm2 libx11-6 libxext6 libxfixes3 libwayland-client0 libpciaccess0 libgtk-3-0 libnuma1 ocl-icd-libopencl1 libglib2.0-0 libxv1 libxt6 libasound2 libpangocairo-1.0-0 libcairo-gobject2 libtheora0 libvisual-0.4-0 libgl1-mesa-dri libgl1-mesa-glx libegl1-mesa libgdk-pixbuf2.0-0 libjpeg-turbo8 libpng16-16 zlib1g libsoup2.4-1 libcurl3-gnutls librtmp1 mjpegtools libx265-179 libde265-0 libx264-155 libxcb-shape0 libxcb-xfixes0 libv4l-0 libass9 libgles2 python3-gi python3-gi-cairo python3-dev python3-numpy libglib2.0-dev && \ rm -rf /var/lib/apt/lists/* COPY --from=build /opt/dist / diff --git a/XeonE3/ubuntu-20.04/analytics/dev/Dockerfile.m4 b/XeonE3/ubuntu-20.04/analytics/dev/Dockerfile.m4 index 43fb6e6c2..b06185961 100644 --- a/XeonE3/ubuntu-20.04/analytics/dev/Dockerfile.m4 +++ b/XeonE3/ubuntu-20.04/analytics/dev/Dockerfile.m4 @@ -2,12 +2,11 @@ include(begin.m4) include(ubuntu.m4) include(libogg.m4) include(libvorbis.m4) +include(openssl.m4) ifelse(defn(`BUILD_FDKAAC'),`ON',`include(libfdk-aac.m4)') include(libopus.m4) include(libvpx.m4) include(libaom.m4) -include(libx264.m4) -include(libx265.m4) include(meson.m4) include(dav1d.m4) include(svt-hevc.m4) diff --git a/XeonE3/ubuntu-20.04/analytics/ffmpeg/Dockerfile b/XeonE3/ubuntu-20.04/analytics/ffmpeg/Dockerfile index 8a0225e3c..ec5eb522a 100644 --- a/XeonE3/ubuntu-20.04/analytics/ffmpeg/Dockerfile +++ b/XeonE3/ubuntu-20.04/analytics/ffmpeg/Dockerfile @@ -498,7 +498,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-gpl --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libx264 --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libdav1d && make -j$(nproc) && \ + --extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 -rpath=/usr/local/ssl/lib --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libdav1d && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install diff --git a/XeonE3/ubuntu-20.04/analytics/gst/Dockerfile b/XeonE3/ubuntu-20.04/analytics/gst/Dockerfile index 24c717bc7..743e1e25e 100644 --- a/XeonE3/ubuntu-20.04/analytics/gst/Dockerfile +++ b/XeonE3/ubuntu-20.04/analytics/gst/Dockerfile @@ -629,7 +629,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-gpl --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libx264 --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libdav1d && make -j$(nproc) && \ + --extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 -rpath=/usr/local/ssl/lib --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libdav1d && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install diff --git a/XeonE3/ubuntu-20.04/media/dev/Dockerfile b/XeonE3/ubuntu-20.04/media/dev/Dockerfile index d4c627d3c..2ebb01403 100644 --- a/XeonE3/ubuntu-20.04/media/dev/Dockerfile +++ b/XeonE3/ubuntu-20.04/media/dev/Dockerfile @@ -72,6 +72,24 @@ RUN cd /opt/build && \ make install DESTDIR=/opt/dist && \ make install +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + ca-certificates wget tar g++ make libtool autoconf && \ + rm -rf /var/lib/apt/lists/* + +# build openssl +ARG OPENSSL_REPO=https://github.com/openssl/openssl/archive/OpenSSL_1_1_1k.tar.gz +RUN cd /opt/build && \ + wget -O - ${OPENSSL_REPO} | tar xz && \ + cd openssl-OpenSSL_1_1_1k && \ + ./config no-ssl3 shared --prefix=/usr/local/ssl --openssldir=/usr/local/ssl -fPIC -Wl,-rpath=/usr/local/ssl/lib && \ + make depend && \ + make -s V=0 && \ + make install DESTDIR=/opt/dist && \ + (cd /opt/dist && mkdir -p ./usr/local/lib/pkgconfig && mv ./usr/local/ssl/lib/pkgconfig/*.pc ./usr/local/lib/pkgconfig/) && \ + make install && \ + (mkdir -p /usr/local/lib/pkgconfig && mv /usr/local/ssl/lib/pkgconfig/*.pc /usr/local/lib/pkgconfig/) + RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ ca-certificates wget g++ autoconf libtool autotools-dev automake make && \ @@ -148,53 +166,6 @@ RUN cd /opt/build && \ make install DESTDIR=/opt/dist && \ make install -RUN apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - git cmake make autoconf && \ - rm -rf /var/lib/apt/lists/* - -# build libx264 -ARG LIBX264_REPO=https://github.com/mirror/x264 -RUN cd /opt/build && \ - git clone ${LIBX264_REPO} -b stable --depth 1 && \ - cd x264 && \ - ./configure --prefix=/usr/local --libdir=/usr/local/lib \ - --enable-shared && \ - make -j$(nproc) && \ - make install DESTDIR=/opt/dist && \ - make install - -RUN apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates wget tar g++ make && \ - rm -rf /var/lib/apt/lists/* - -# build yasm -ARG YASM_REPO=https://www.tortall.net/projects/yasm/releases/yasm-1.3.0.tar.gz -RUN cd /opt/build && \ - wget -O - ${YASM_REPO} | tar xz -RUN cd /opt/build/yasm-1.3.0 && \ - # TODO remove the line below whether no other component inside this project requires it. - # `sed -i "s/) ytasm.*/)/" Makefile.in' && \ - ./configure --prefix=/usr/local --libdir=/usr/local/lib && \ - make -j $(nproc) && \ - make install - -RUN apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - libnuma-dev cmake make && \ - rm -rf /var/lib/apt/lists/* - -# build libx265 -ARG LIBX265_REPO=https://github.com/videolan/x265/archive/3.4.tar.gz -RUN cd /opt/build && \ - wget -O - ${LIBX265_REPO} | tar xz && \ - cd x265-3.4/build/linux && \ - cmake -DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX=/usr/local -DLIB_INSTALL_DIR=/usr/local/lib ../../source && \ - make -j$(nproc) && \ - make install DESTDIR=/opt/dist && \ - make install - RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ python3-pip ninja-build python3-setuptools && \ @@ -239,6 +210,22 @@ RUN cd /opt/build/vmaf-2.1.1/libvmaf && \ ninja install && \ DESTDIR=/opt/dist ninja install +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + ca-certificates wget tar g++ make && \ + rm -rf /var/lib/apt/lists/* + +# build yasm +ARG YASM_REPO=https://www.tortall.net/projects/yasm/releases/yasm-1.3.0.tar.gz +RUN cd /opt/build && \ + wget -O - ${YASM_REPO} | tar xz +RUN cd /opt/build/yasm-1.3.0 && \ + # TODO remove the line below whether no other component inside this project requires it. + # `sed -i "s/) ytasm.*/)/" Makefile.in' && \ + ./configure --prefix=/usr/local --libdir=/usr/local/lib && \ + make -j $(nproc) && \ + make install + RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ ca-certificates wget tar g++ make cmake git && \ @@ -431,7 +418,7 @@ RUN cd /opt/build/gst-plugins-good-1.19.1 && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates tar g++ wget pkg-config libglib2.0-dev flex bison gobject-introspection libgirepository1.0-dev openssl libcurl4-gnutls-dev librtmp-dev mjpegtools libde265-dev && \ + ca-certificates tar g++ wget pkg-config libglib2.0-dev flex bison gobject-introspection libgirepository1.0-dev libcurl4-gnutls-dev librtmp-dev mjpegtools libx265-dev libde265-dev && \ rm -rf /var/lib/apt/lists/* # build gst-plugin-bad @@ -460,7 +447,7 @@ RUN cd /opt/build && \ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates tar g++ wget pkg-config libglib2.0-dev flex bison && \ + ca-certificates tar g++ wget pkg-config libglib2.0-dev flex bison libx264-dev && \ rm -rf /var/lib/apt/lists/* # build gst-plugin-ugly @@ -506,7 +493,8 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-gpl --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libx264 --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libvmaf --enable-version3 --enable-libdav1d && make -j$(nproc) && \ + --extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-openssl --extra-ldflags=-Wldnl + --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libvmaf --enable-version3 --enable-libdav1d && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install @@ -588,6 +576,9 @@ RUN rm -rf /opt/dist/usr/local/include && \ find /opt/dist -name "*.a" -exec rm -f {} \; || echo "" RUN rm -rf /opt/dist/usr/local/share/doc /opt/dist/usr/local/share/gtk-doc RUN rm -rf /opt/dist/usr/local/share/man +RUN rm -rf /opt/dist/usr/local/ssl/include +RUN rm -rf /opt/dist/usr/local/ssl/share/man +RUN rm -rf /opt/dist/usr/local/ssl/share/doc FROM ubuntu:20.04 LABEL Description="This is the base image for Gstreamer ubuntu 20.04" @@ -598,7 +589,7 @@ WORKDIR /home RUN apt-get update && apt-get upgrade -y systemd RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - libnuma1 libdrm2 libx11-6 libxext6 libxfixes3 libwayland-client0 libpciaccess0 libglib2.0-0 libxv1 libxt6 libasound2 libpangocairo-1.0-0 libcairo-gobject2 libtheora0 libvisual-0.4-0 libgl1-mesa-dri libgl1-mesa-glx libegl1-mesa libgdk-pixbuf2.0-0 libjpeg-turbo8 libpng16-16 zlib1g libsoup2.4-1 openssl libcurl3-gnutls librtmp1 mjpegtools libde265-0 libxcb-shape0 libxcb-xfixes0 libv4l-0 libass9 libgles2 && \ + libdrm2 libx11-6 libxext6 libxfixes3 libwayland-client0 libpciaccess0 libglib2.0-0 libxv1 libxt6 libasound2 libpangocairo-1.0-0 libcairo-gobject2 libtheora0 libvisual-0.4-0 libgl1-mesa-dri libgl1-mesa-glx libegl1-mesa libgdk-pixbuf2.0-0 libjpeg-turbo8 libpng16-16 zlib1g libsoup2.4-1 libcurl3-gnutls librtmp1 mjpegtools libx265-179 libde265-0 libx264-155 libxcb-shape0 libxcb-xfixes0 libv4l-0 libass9 libgles2 && \ rm -rf /var/lib/apt/lists/* COPY --from=build /opt/dist / diff --git a/XeonE3/ubuntu-20.04/media/dev/Dockerfile.m4 b/XeonE3/ubuntu-20.04/media/dev/Dockerfile.m4 index 0b2c73b13..3086aa5ef 100644 --- a/XeonE3/ubuntu-20.04/media/dev/Dockerfile.m4 +++ b/XeonE3/ubuntu-20.04/media/dev/Dockerfile.m4 @@ -3,12 +3,11 @@ include(begin.m4) include(ubuntu.m4) include(libogg.m4) include(libvorbis.m4) +include(openssl.m4) ifelse(defn(`BUILD_FDKAAC'),`ON',`include(libfdk-aac.m4)') include(libopus.m4) include(libvpx.m4) include(libaom.m4) -include(libx264.m4) -include(libx265.m4) include(meson.m4) include(dav1d.m4) include(libvmaf.m4) diff --git a/XeonE3/ubuntu-20.04/media/ffmpeg/Dockerfile b/XeonE3/ubuntu-20.04/media/ffmpeg/Dockerfile index 7e11d4515..93d6abb33 100644 --- a/XeonE3/ubuntu-20.04/media/ffmpeg/Dockerfile +++ b/XeonE3/ubuntu-20.04/media/ffmpeg/Dockerfile @@ -195,23 +195,6 @@ RUN cd /opt/build/dav1d-0.9.0 && \ ninja install && \ DESTDIR=/opt/dist ninja install -RUN apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ca-certificates meson tar g++ wget pkg-config ninja-build && \ - rm -rf /var/lib/apt/lists/* - -# build VMAF -ARG VMAF_VER=2.1.1 -ARG LIBVMAF_REPO=https://github.com/Netflix/vmaf/archive/refs/tags/v${VMAF_VER}.tar.gz -RUN cd /opt/build && \ - wget -O - ${LIBVMAF_REPO} | tar xz && ls -RUN cd /opt/build/vmaf-2.1.1/libvmaf && \ - ls && \ - meson build --prefix=/usr/local --libdir /usr/local/lib --buildtype=plain && \ - cd build && \ - ninja install && \ - DESTDIR=/opt/dist ninja install - RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ ca-certificates wget tar g++ make cmake git && \ @@ -379,7 +362,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-gpl --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libx264 --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libvmaf --enable-version3 --enable-libdav1d && make -j$(nproc) && \ + --extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-libmfx --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 -rpath=/usr/local/ssl/lib --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libdav1d && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install diff --git a/XeonE3/ubuntu-20.04/media/ffmpeg/Dockerfile.m4 b/XeonE3/ubuntu-20.04/media/ffmpeg/Dockerfile.m4 index fb7b1f323..cf17e6ed2 100644 --- a/XeonE3/ubuntu-20.04/media/ffmpeg/Dockerfile.m4 +++ b/XeonE3/ubuntu-20.04/media/ffmpeg/Dockerfile.m4 @@ -9,7 +9,6 @@ include(libvpx.m4) include(libx264.m4) include(libx265.m4) include(dav1d.m4) -include(libvmaf.m4) include(svt-hevc.m4) include(svt-av1.m4) include(svt-vp9.m4) diff --git a/XeonE3/ubuntu-20.04/media/gst/Dockerfile b/XeonE3/ubuntu-20.04/media/gst/Dockerfile index 093e6b8b7..40321d732 100644 --- a/XeonE3/ubuntu-20.04/media/gst/Dockerfile +++ b/XeonE3/ubuntu-20.04/media/gst/Dockerfile @@ -468,7 +468,7 @@ RUN cd /opt/build/FFmpeg-n4.4 && \ RUN cd /opt/build/FFmpeg-n4.4 && \ ./configure --prefix=/usr/local --libdir=/usr/local/lib --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ - --extra-cflags=-w --enable-gpl --enable-nonfree --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-libx264 --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libdav1d && make -j$(nproc) && \ + --extra-cflags=-w --enable-libass --enable-libfreetype --disable-xlib --disable-sdl2 --enable-vaapi --enable-libv4l2 --enable-indev=v4l2 -rpath=/usr/local/ssl/lib --enable-libfdk-aac --enable-libopus --enable-libvpx --enable-libvorbis --enable-gpl --enable-libx264 --enable-gpl --enable-libx265 --enable-libsvtav1 --enable-libsvthevc --enable-libaom --enable-libdav1d && make -j$(nproc) && \ make install DESTDIR=/opt/dist && \ make install diff --git a/script/dldt-gst-tests.cmake b/script/dldt-gst-tests.cmake index 8d050d9a4..56683f4ee 100644 --- a/script/dldt-gst-tests.cmake +++ b/script/dldt-gst-tests.cmake @@ -5,6 +5,7 @@ foreach(test ${tests}) #Do not add vcaca test to non-vcaca images elseif(("${image}" MATCHES "vcaca") AND NOT (${name} MATCHES "vcaca")) #Do not add non-vcaca video analytics test to vcaca + elseif("${image}" MATCHES "dev" AND ${name} MATCHES "video_analytics") else() add_test(test_${image}_${name} "${CMAKE_CURRENT_SOURCE_DIR}/shell.sh" "/mnt/${name}.sh" "${image}") endif() diff --git a/script/ffmpeg-tests.cmake b/script/ffmpeg-tests.cmake index f138bfab8..b5e0f4287 100644 --- a/script/ffmpeg-tests.cmake +++ b/script/ffmpeg-tests.cmake @@ -5,6 +5,8 @@ foreach(test ${tests}) #Do not add svt test for VCACA DEV image elseif(${image} MATCHES "analytics" AND ${name} STREQUAL "ffmpeg_vmaf") #Do not add vmaf test for analytics image + elseif(${image} MATCHES "dev" AND ${name} MATCHES "(1dns|x265|x264?)") + #Do not add vmaf test for analytics image else() add_test(test_${image}_${name} "${CMAKE_CURRENT_SOURCE_DIR}/shell.sh" "/mnt/${name}.sh" "${image}") endif() diff --git a/script/gst-tests.cmake b/script/gst-tests.cmake index 489cc0441..99a216f03 100644 --- a/script/gst-tests.cmake +++ b/script/gst-tests.cmake @@ -5,6 +5,8 @@ foreach(test ${tests}) #Do not add the gst_fdkaac test if the flag BUILD_FDKAAC is OFF elseif(${image} MATCHES "vcaca" AND ${name} MATCHES "(svt|hevc|av1?)") #Do not add svt test for VCACA DEV image + elseif(${image} MATCHES "dev" AND ${name} MATCHES "(x264|x265?)") + #Do not add svt test for VCACA DEV image else() add_test(test_${image}_${name} "${CMAKE_CURRENT_SOURCE_DIR}/shell.sh" "/mnt/${name}.sh" "${image}") endif() diff --git a/template/components/ffmpeg.m4 b/template/components/ffmpeg.m4 index 987e251cd..057a821e4 100644 --- a/template/components/ffmpeg.m4 +++ b/template/components/ffmpeg.m4 @@ -31,17 +31,14 @@ dnl include(begin.m4) DECLARE(`FFMPEG_VER',n4.4) -DECLARE(`FFMPEG_ENABLE_GPL',true) DECLARE(`FFMPEG_ENABLE_LIBASS',true) DECLARE(`FFMPEG_ENABLE_LIBFREETYPE',true) DECLARE(`FFMPEG_ENABLE_X11',false) -DECLARE(`FFMPEG_ENABLE_NONFREE',true) +DECLARE(`FFMPEG_ENABLE_NONFREE',false) DECLARE(`FFMPEG_ENABLE_V4L2',true) DECLARE(`FFMPEG_ENABLE_HWACCELS',ifdef(`ENABLE_INTEL_GFX_REPO',true,ifdef(`BUILD_LIBVA2',true,false))) DECLARE(`FFMPEG_ENABLE_LIBMFX',ifdef(`BUILD_MSDK',FFMPEG_ENABLE_HWACCELS,false)) DECLARE(`FFMPEG_ENABLE_VAAPI',ifdef(`BUILD_LIBVA2',FFMPEG_ENABLE_HWACCELS,false)) -DECLARE(`FFMPEG_ENABLE_X265',true) -DECLARE(`FFMPEG_ENABLE_X264',true) DECLARE(`FFMPEG_FLV_PATCH',false) DECLARE(`FFMPEG_1TN_PATCH',true) DECLARE(`FFMPEG_WARNING_AS_ERRORS',false) @@ -54,14 +51,14 @@ dnl For more information about optional configurations for this ffmpeg component dnl https://github.com/FFmpeg/FFmpeg/blob/master/configure ifelse(OS_NAME,ubuntu,` -define(`FFMPEG_BUILD_DEPS',`build-essential ca-certificates wget patch ifdef(`BUILD_LIBX264',,ifelse(FFMPEG_ENABLE_X264,true,libx264-dev)) ifdef(`BUILD_LIBX265',,ifelse(FFMPEG_ENABLE_X265,true,libx265-dev)) ifelse(FFMPEG_ENABLE_V4L2,true,libv4l-dev) ifelse(FFMPEG_ENABLE_LIBASS,true,libass-dev) ifelse(FFMPEG_LIBFREETYPE,true,libfreetype6-dev) ifdef(`ENABLE_INTEL_GFX_REPO',libva-dev)') +define(`FFMPEG_BUILD_DEPS',`build-essential ca-certificates wget patch ifelse(FFMPEG_ENABLE_V4L2,true,libv4l-dev) ifelse(FFMPEG_ENABLE_LIBASS,true,libass-dev) ifelse(FFMPEG_LIBFREETYPE,true,libfreetype6-dev) ifdef(`ENABLE_INTEL_GFX_REPO',libva-dev)') -define(`FFMPEG_INSTALL_DEPS',`libxcb-shape0 libxcb-xfixes0 ifdef(`BUILD_LIBX264',,ifelse(FFMPEG_ENABLE_X264,true,lib264-ifelse(OS_VERSION,18.04,152,155))) ifdef(`BUILD_LIBX265',,ifelse(FFMPEG_ENABLE_X265,true,libx265-ifelse(OS_VERSION,146,179))) ifelse(FFMPEG_ENABLE_V4L2,true,libv4l-0) ifelse(FFMPEG_ENABLE_LIBASS,true,libass9) ifdef(`ENABLE_INTEL_GFX_REPO',libva2)') +define(`FFMPEG_INSTALL_DEPS',`libxcb-shape0 libxcb-xfixes0 ifelse(FFMPEG_ENABLE_V4L2,true,libv4l-0) ifelse(FFMPEG_ENABLE_LIBASS,true,libass9) ifdef(`ENABLE_INTEL_GFX_REPO',libva2)') ') ifelse(OS_NAME,centos,` -define(`FFMPEG_BUILD_DEPS',`wget patch ifdef(`BUILD_LIBX264',,ifelse(FFMPEG_ENABLE_X264,true,libx264-devel)) ifdef(`BUILD_LIBX265',,ifelse(FFMPEG_ENABLE_X265,true,x265-devel)) ifelse(FFMPEG_ENABLE_V4L2,true,libv4l-devel) ifelse(FFMPEG_ENABLE_LIBASS,true,libass-devel) ifelse(FFMPEG_ENABLE_LIBFREETYPE,true,freetype-devel)') -define(`FFMPEG_INSTALL_DEPS',`ifdef(`BUILD_LIBX264',,ifelse(FFMPEG_ENABLE_X264,true,libx264-static)) ifdef(`BUILD_LIBX265',,ifelse(FFMPEG_ENABLE_X265,true,x265)) ifelse(FFMPEG_ENABLE_V4L2,true,libv4l) ifelse(FFMPEG_ENABLE_LIBASS,true,libass)') +define(`FFMPEG_BUILD_DEPS',`wget patch ifelse(FFMPEG_ENABLE_V4L2,true,libv4l-devel) ifelse(FFMPEG_ENABLE_LIBASS,true,libass-devel) ifelse(FFMPEG_ENABLE_LIBFREETYPE,true,freetype-devel)') +define(`FFMPEG_INSTALL_DEPS',`ifelse(FFMPEG_ENABLE_V4L2,true,libv4l) ifelse(FFMPEG_ENABLE_LIBASS,true,libass)') ') define(`BUILD_FFMPEG',` @@ -98,7 +95,6 @@ RUN cd BUILD_HOME/FFmpeg-FFMPEG_VER && \ ./configure --prefix=BUILD_PREFIX --libdir=BUILD_LIBDIR --enable-shared --disable-static --disable-doc --disable-htmlpages \ --disable-manpages --disable-podpages --disable-txtpages \ ifelse(FFMPEG_WARNING_AS_ERRORS,false,--extra-cflags=-w )dnl - ifelse(FFMPEG_ENABLE_GPL,true,--enable-gpl )dnl ifelse(FFMPEG_ENABLE_NONFREE,true,--enable-nonfree )dnl ifelse(FFMPEG_ENABLE_LIBASS,true,--enable-libass )dnl ifelse(FFMPEG_ENABLE_LIBFREETYPE,true,--enable-libfreetype )dnl @@ -107,13 +103,13 @@ RUN cd BUILD_HOME/FFmpeg-FFMPEG_VER && \ ifelse(FFMPEG_ENABLE_LIBMFX,true,--enable-libmfx )dnl ifelse(FFMPEG_ENABLE_VAAPI,true,--enable-vaapi ,--disable-vaapi )dnl ifelse(FFMPEG_ENABLE_V4L2,true,--enable-libv4l2 --enable-indev=v4l2 )dnl - ifdef(`BUILD_OPENSSL',--enable-openssl --extra-ldflags=-Wl`,'-rpath=BUILD_PREFIX/ssl/lib )dnl + ifdef(`BUILD_OPENSSL',ifelse(FFMPEG_OPENSSL_NOBIND,true,,`--enable-openssl --extra-ldflags=-Wl`,'-rpath=BUILD_PREFIX/ssl/lib '))dnl ifdef(`BUILD_LIBFDKAAC',--enable-libfdk-aac )dnl ifdef(`BUILD_LIBOPUS',--enable-libopus )dnl ifdef(`BUILD_LIBVPX',--enable-libvpx ,--disable-libvpx )dnl ifdef(`BUILD_LIBVORBIS',--enable-libvorbis )dnl - ifelse(FFMPEG_ENABLE_X264,true,--enable-libx264 )dnl - ifelse(FFMPEG_ENABLE_X265,true,--enable-libx265 )dnl + ifdef(`BUILD_LIBX264',--enable-gpl --enable-libx264 )dnl + ifdef(`BUILD_LIBX265',--enable-gpl --enable-libx265 )dnl ifdef(`BUILD_SVT_AV1',--enable-libsvtav1 )dnl ifdef(`BUILD_SVT_HEVC',--enable-libsvthevc )dnl ifdef(`BUILD_LIBAOM',--enable-libaom )dnl diff --git a/template/components/gst-plugins-bad.m4 b/template/components/gst-plugins-bad.m4 index 32af5c01b..53534c88a 100644 --- a/template/components/gst-plugins-bad.m4 +++ b/template/components/gst-plugins-bad.m4 @@ -43,21 +43,20 @@ dnl To manage this please refer to them by using the `BUILD_*` m4 definition in DECLARE(`GST_CURLUSESSL',true) DECLARE(`GST_RTMP',true) DECLARE(`GST_MJPEG',true) -DECLARE(`GST_X265ENC',true) DECLARE(`GST_LIBDE265DEC',true) DECLARE(`GST_RSVG',false) DECLARE(`GST_FDKAAC',ifdef(`BUILD_LIBFDKAAC',true,false)) ifelse(OS_NAME,ubuntu,` -define(`GSTBAD_BUILD_DEPS',`ca-certificates ifdef(`BUILD_MESON',,meson) tar g++ wget pkg-config libglib2.0-dev flex bison gobject-introspection libgirepository1.0-dev ifelse(GST_CURLUSESSL,true,ifdef(`BUILD_OPENSSL',,openssl) libcurl4-gnutls-dev) ifelse(GST_RTMP,true,librtmp-dev) ifelse(GST_MJPEG,true,mjpegtools) ifelse(GST_X265ENC,true,ifdef(`BUILD_LIBX265',,libx265-dev)) ifelse(GST_LIBDE265DEC,true,libde265-dev) ifelse(GST_RSVG,true,librsvg2-dev) ifelse(GST_FDKAAC,true,ifdef(`BUILD_LIBFDKAAC',,libfdk-aac-dev))') +define(`GSTBAD_BUILD_DEPS',`ca-certificates ifdef(`BUILD_MESON',,meson) tar g++ wget pkg-config libglib2.0-dev flex bison gobject-introspection libgirepository1.0-dev ifelse(GST_CURLUSESSL,true,ifdef(`BUILD_OPENSSL',,openssl) libcurl4-gnutls-dev) ifelse(GST_RTMP,true,librtmp-dev) ifelse(GST_MJPEG,true,mjpegtools) ifelse(GST_LIBDE265DEC,true,libde265-dev) ifelse(GST_RSVG,true,librsvg2-dev) ifelse(GST_FDKAAC,true,ifdef(`BUILD_LIBFDKAAC',,libfdk-aac-dev))') -define(`GSTBAD_INSTALL_DEPS',`libglib2.0-0 ifelse(GST_CURLUSESSL,true,ifdef(`BUILD_OPENSSL',,openssl) libcurl3-gnutls) ifelse(GST_RTMP,true,librtmp1) ifelse(GST_MJPEG,true,mjpegtools) ifelse(GST_X265ENC,true,ifdef(`BUILD_LIBX265',,libx265-ifelse(OS_VERSION,18.04,142,179))) ifelse(GST_LIBDE265DEC,true,libde265-0) ifelse(GST_RSVG,true,librsvg2-2) ifelse(GST_FDKAAC,true,ifdef(`BUILD_LIBFDKAAC',,libfdk-aac1))') +define(`GSTBAD_INSTALL_DEPS',`libglib2.0-0 ifelse(GST_CURLUSESSL,true,ifdef(`BUILD_OPENSSL',,openssl) libcurl3-gnutls) ifelse(GST_RTMP,true,librtmp1) ifelse(GST_MJPEG,true,mjpegtools) ifelse(GST_LIBDE265DEC,true,libde265-0) ifelse(GST_RSVG,true,librsvg2-2) ifelse(GST_FDKAAC,true,ifdef(`BUILD_LIBFDKAAC',,libfdk-aac1))') ') ifelse(OS_NAME,centos,` -define(`GSTBAD_BUILD_DEPS',`ifdef(`BUILD_MESON',,meson) wget tar glib2-devel bison flex gobject-introspection-devel ifelse(GST_CURLUSESSL,true,ifdef(`BUILD_OPENSSL',,openssl) libcurl-devel) ifelse(GST_RTMP,true,librtmp-devel) ifelse(GST_MJPEG,true,mjpegtools) ifelse(GST_X265ENC,true,ifdef(`BUILD_LIBX265',,x265-devel)) ifelse(GST_LIBDE265DEC,true,libde265-devel) ifelse(OS_VERSION,7,devtoolset-9) ifelse(GST_RSVG,true,librsvg2-devel)') +define(`GSTBAD_BUILD_DEPS',`ifdef(`BUILD_MESON',,meson) wget tar glib2-devel bison flex gobject-introspection-devel ifelse(GST_CURLUSESSL,true,ifdef(`BUILD_OPENSSL',,openssl) libcurl-devel) ifelse(GST_RTMP,true,librtmp-devel) ifelse(GST_MJPEG,true,mjpegtools) ifelse(GST_LIBDE265DEC,true,libde265-devel) ifelse(OS_VERSION,7,devtoolset-9) ifelse(GST_RSVG,true,librsvg2-devel)') -define(`GSTBAD_INSTALL_DEPS',`glib2 gobject-introspection ifelse(GST_CURLUSESSL,true,ifdef(`BUILD_OPENSSL',,openssl)) ifelse(GST_RTMP,true,librtmp) ifelse(GST_MJPEG,true,mjpegtools) ifelse(GST_X265ENC,true,ifdef(`BUILD_LIBX265',,x265)) ifelse(GST_LIBDE265DEC,true,libde265) ifelse(GST_RSVG,true,librsvg2)') +define(`GSTBAD_INSTALL_DEPS',`glib2 gobject-introspection ifelse(GST_CURLUSESSL,true,ifdef(`BUILD_OPENSSL',,openssl)) ifelse(GST_RTMP,true,librtmp) ifelse(GST_MJPEG,true,mjpegtools) ifelse(GST_LIBDE265DEC,true,libde265) ifelse(GST_RSVG,true,librsvg2)') ') define(`BUILD_GSTBAD',` @@ -78,7 +77,7 @@ RUN cd BUILD_HOME && \ -Dintrospection=enabled \ -Dgst_player_tests=false \ -Drtmp=ifelse(GST_RTMP,true,enabled,disabled) \ - -Dx265=ifelse(GST_X265ENC,true,enabled,disabled) \ + -Dx265=ifdef(`BUILD_LIBX265',enabled,disabled) \ -Drsvg=ifelse(GST_RSVG,true,enabled,disabled) \ -Dfdkaac=ifelse(GST_FDKAAC,true,enabled,disabled) \ && cd build && \ diff --git a/template/components/gst-plugins-ugly.m4 b/template/components/gst-plugins-ugly.m4 index 5f38dc514..a596b4c34 100644 --- a/template/components/gst-plugins-ugly.m4 +++ b/template/components/gst-plugins-ugly.m4 @@ -43,15 +43,15 @@ dnl To manage this please refer to them by using the `BUILD_*` m4 definition in DECLARE(`GST_X264ENC',true) ifelse(OS_NAME,ubuntu,` -define(`GSTUGLY_BUILD_DEPS',`ca-certificates ifdef(`BUILD_MESON',,meson) tar g++ wget pkg-config libglib2.0-dev flex bison ifelse(GST_X264ENC,true,ifdef(`BUILD_LIBX264',,libx264-dev))') +define(`GSTUGLY_BUILD_DEPS',`ca-certificates ifdef(`BUILD_MESON',,meson) tar g++ wget pkg-config libglib2.0-dev flex bison') -define(`GSTUGLY_INSTALL_DEPS',`libglib2.0-0 ifelse(GST_X264ENC,true,ifdef(`BUILD_LIBX264',,libx264-155))') +define(`GSTUGLY_INSTALL_DEPS',`libglib2.0-0') ') ifelse(OS_NAME,centos,` -define(`GSTUGLY_BUILD_DEPS',`ifdef(`BUILD_MESON',,meson) wget tar gcc-c++ glib2-devel bison flex ifelse(GST_X264ENC,true,ifdef(`BUILD_LIBX264',,libx264-devel))') +define(`GSTUGLY_BUILD_DEPS',`ifdef(`BUILD_MESON',,meson) wget tar gcc-c++ glib2-devel bison flex') -define(`GSTUGLY_INSTALL_DEPS',`glib2 ifelse(GST_X264ENC,true,ifdef(`BUILD_LIBX264',,libx264-static))') +define(`GSTUGLY_INSTALL_DEPS',`glib2') ') define(`BUILD_GSTUGLY',` @@ -64,7 +64,7 @@ RUN cd BUILD_HOME/gst-plugins-ugly-GSTCORE_VER && \ --prefix=BUILD_PREFIX --buildtype=plain \ -Ddoc=disabled \ -Dgtk_doc=disabled \ - -Dx264=ifelse(GST_X264ENC,true,enabled,disabled) \ + -Dx264=ifdef(`BUILD_LIBX264',enabled,disabled) \ && cd build && \ ninja install && \ DESTDIR=BUILD_DESTDIR ninja install From 93ca5085b74ba335cde04048e7ba9c23f4326a44 Mon Sep 17 00:00:00 2001 From: "Patel, Dhaval R" Date: Fri, 9 Jul 2021 15:49:35 -0700 Subject: [PATCH 13/13] vmaf test config fix --- script/dldt-gst-tests.cmake | 1 + script/ffmpeg-tests.cmake | 4 +++- script/gst-tests.cmake | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/script/dldt-gst-tests.cmake b/script/dldt-gst-tests.cmake index 56683f4ee..9d5fababf 100644 --- a/script/dldt-gst-tests.cmake +++ b/script/dldt-gst-tests.cmake @@ -6,6 +6,7 @@ foreach(test ${tests}) elseif(("${image}" MATCHES "vcaca") AND NOT (${name} MATCHES "vcaca")) #Do not add non-vcaca video analytics test to vcaca elseif("${image}" MATCHES "dev" AND ${name} MATCHES "video_analytics") + #Do not add analytics test case with 264 in dev images else() add_test(test_${image}_${name} "${CMAKE_CURRENT_SOURCE_DIR}/shell.sh" "/mnt/${name}.sh" "${image}") endif() diff --git a/script/ffmpeg-tests.cmake b/script/ffmpeg-tests.cmake index b5e0f4287..c0a3974e1 100644 --- a/script/ffmpeg-tests.cmake +++ b/script/ffmpeg-tests.cmake @@ -5,8 +5,10 @@ foreach(test ${tests}) #Do not add svt test for VCACA DEV image elseif(${image} MATCHES "analytics" AND ${name} STREQUAL "ffmpeg_vmaf") #Do not add vmaf test for analytics image + elseif(NOT ${image} MATCHES "vmaf" AND ${name} STREQUAL "ffmpeg_vmaf") + #Do not add vmaf test to non vmaf images elseif(${image} MATCHES "dev" AND ${name} MATCHES "(1dns|x265|x264?)") - #Do not add vmaf test for analytics image + #Do not add GPL component tests for dev image else() add_test(test_${image}_${name} "${CMAKE_CURRENT_SOURCE_DIR}/shell.sh" "/mnt/${name}.sh" "${image}") endif() diff --git a/script/gst-tests.cmake b/script/gst-tests.cmake index 99a216f03..02945c3de 100644 --- a/script/gst-tests.cmake +++ b/script/gst-tests.cmake @@ -6,7 +6,7 @@ foreach(test ${tests}) elseif(${image} MATCHES "vcaca" AND ${name} MATCHES "(svt|hevc|av1?)") #Do not add svt test for VCACA DEV image elseif(${image} MATCHES "dev" AND ${name} MATCHES "(x264|x265?)") - #Do not add svt test for VCACA DEV image + #Do not add GPL component test for DEV images else() add_test(test_${image}_${name} "${CMAKE_CURRENT_SOURCE_DIR}/shell.sh" "/mnt/${name}.sh" "${image}") endif()