Skip to content

Commit fed2a78

Browse files
Update Dockerfiles with more improvements
- CUDA Images updated to 11.4.2-devel - Docker as-well-as build script upgraded to use `python3` - `ninja-build` and `meson` packages are pre-installed either via system package manager or via `pip3` in favor of building `dav1d` codec - `cmake` updated to v3.21.2 - `svtav1` updated to last-known commit `1a3e32b` which successfully passed pipeline - `x264` updated to commit `5db6aa6` - `aom` updated to v3.1.2, commit `ae2be80` - Occasional sourceforge.net download fail due to downtime of mirror location is tried to bypass - `nv-codec-headers` updated to v11.1.5.0 - Script slightly re-arranged to differentiate codec types Signed-off-by: rokibhasansagar <10854164+rokibhasansagar@users.noreply.github.com>
1 parent a49eec4 commit fed2a78

File tree

7 files changed

+148
-141
lines changed

7 files changed

+148
-141
lines changed

.github/workflows/build.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -89,12 +89,12 @@ jobs:
8989
- name: pull base image
9090
id: cuda_ubuntu_pull
9191
run: |
92-
docker pull nvidia/cuda:11.1-devel-ubuntu20.04
92+
docker pull nvidia/cuda:11.4.2-devel-ubuntu20.04
9393
docker pull ubuntu:20.04
9494
- name: run if cuda_ubuntu_pull failed
9595
if: failure() && steps.cuda_ubuntu_pull.outcome == 'failure'
9696
run: |
97-
docker pull nvidia/cuda:11.1-devel-ubuntu20.04
97+
docker pull nvidia/cuda:11.4.2-devel-ubuntu20.04
9898
docker pull ubuntu:20.04
9999
- name: build ffmpeg
100100
run: |
@@ -113,12 +113,12 @@ jobs:
113113
- name: pull base image
114114
id: cuda_centos_pull
115115
run: |
116-
docker pull nvidia/cuda:11.1-devel-centos8
116+
docker pull nvidia/cuda:11.4.2-devel-centos8
117117
docker pull centos:8
118118
- name: run if cuda_centos_pull failed
119119
if: failure() && steps.cuda_centos_pull.outcome == 'failure'
120120
run: |
121-
docker pull nvidia/cuda:11.1-devel-centos8
121+
docker pull nvidia/cuda:11.4.2-devel-centos8
122122
docker pull centos:8
123123
- name: build ffmpeg
124124
run: |
@@ -137,11 +137,11 @@ jobs:
137137
- name: pull base image
138138
id: cuda_ubuntu_pull
139139
run: |
140-
docker pull nvidia/cuda:11.1-devel-ubuntu20.04
140+
docker pull nvidia/cuda:11.4.2-devel-ubuntu20.04
141141
- name: run if cuda_ubuntu_pull failed
142142
if: failure() && steps.cuda_ubuntu_pull.outcome == 'failure'
143143
run: |
144-
docker pull nvidia/cuda:11.1-devel-ubuntu20.04
144+
docker pull nvidia/cuda:11.4.2-devel-ubuntu20.04
145145
- name: build ffmpeg
146146
run: |
147147
docker build -t ffmpeg:cuda-static -f full-static.dockerfile .

Dockerfile

+3-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ FROM ubuntu:20.04 AS build
33
ENV DEBIAN_FRONTEND noninteractive
44

55
RUN apt-get update \
6-
&& apt-get -y --no-install-recommends install build-essential curl ca-certificates libva-dev python \
6+
&& apt-get -y --no-install-recommends install build-essential curl ca-certificates libva-dev \
7+
python3 python-is-python3 ninja-build meson \
78
&& apt-get clean; rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/* \
89
&& update-ca-certificates
910

@@ -32,4 +33,4 @@ RUN ldd /usr/bin/ffprobe
3233
RUN ldd /usr/bin/ffplay
3334

3435
CMD ["--help"]
35-
ENTRYPOINT ["/usr/bin/ffmpeg"]
36+
ENTRYPOINT ["/usr/bin/ffmpeg"]

README.md

+1
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ $ ./build-ffmpeg --build
5454
* `libsvtav1`: SVT-AV1 Encoder and Decoder
5555
* `aom`: AV1 Video Codec (Experimental and very slow!)
5656
* `librav1e`: rust based AV1 encoder (only available if [`cargo` is installed](https://doc.rust-lang.org/cargo/getting-started/installation.html))
57+
* `libdav1d`: Fastest AV1 decoder developed by the VideoLAN and FFmpeg communities and sponsored by the AOMedia (only available if `meson` and `ninja` are installed)
5758
* `fdk_aac`: Fraunhofer FDK AAC Codec
5859
* `xvidcore`: MPEG-4 video coding standard
5960
* `VP8/VP9/webm`: VP8 / VP9 Video Codec for the WebM video file format

0 commit comments

Comments
 (0)