jrottenberg / ffmpeg

Docker build for FFmpeg on Ubuntu / Alpine / Centos / Scratch / nvidia / vaapi
https://hub.docker.com/r/jrottenberg/ffmpeg/
Apache License 2.0
1.42k stars 454 forks source link

feat: add libzimg #386

Closed emmanuelgeoffray closed 7 months ago

emmanuelgeoffray commented 7 months ago

Zimg is very useful to manipulate HDR videos. I expect it to be mandatory for all projects in the next few months.

I've isolated the zimg part in https://github.com/jrottenberg/ffmpeg/pull/318

I've tested the build 6.1/ubuntu2004.

jrottenberg commented 7 months ago

Looks very promising, thank you, can you rebase to get the build going ?

emmanuelgeoffray commented 7 months ago

Looks very promising, thank you, can you rebase to get the build going ?

done

jrottenberg commented 7 months ago

No --enable-libzimg on ffmpeg compile parameters ?

jrottenberg commented 7 months ago

I've tested your branch, added the flag and got a successful build for one variant, so worth testing the rest.

emmanuelgeoffray commented 7 months ago

oops, forgot the flag, I've added it now @jrottenberg

jrottenberg commented 7 months ago

Great thank you !

jrottenberg commented 7 months ago

ok it worked great except on 2.8:

#41 [build 35/36] RUN          DIR=/tmp/ffmpeg && cd ${DIR} &&         ./configure         --disable-debug         --disable-doc         --disable-ffplay         --enable-avresample         --enable-fontconfig         --enable-gpl         --enable-libass         --enable-libbluray         --enable-libfdk_aac         --enable-libfreetype         --enable-libmp3lame         --enable-libopencore-amrnb         --enable-libopencore-amrwb         --enable-libopus         --enable-libtheora         --enable-libvidstab         --enable-libvorbis         --enable-libvpx         --enable-libwebp         --enable-libx264         --enable-libx265         --enable-libxvid         --enable-libzimg         --enable-libzmq         --enable-nonfree         --enable-openssl         --enable-postproc         --enable-shared         --enable-small         --enable-version3         --extra-cflags="-I/opt/ffmpeg/include"         --extra-ldflags="-L/opt/ffmpeg/lib"         --extra-libs=-ldl         --prefix="/opt/ffmpeg" &&         make clean &&         make &&         make install &&         make tools/zmqsend && cp tools/zmqsend /opt/ffmpeg/bin/ &&         make distclean &&         hash -r &&         cd tools &&         make qt-faststart && cp qt-faststart /opt/ffmpeg/bin/
#41 0.542 Unknown option "--enable-libzimg".
#41 0.542 See ./configure --help for available options.

Easy fix, thx again !

emmanuelgeoffray commented 7 months ago

ok it worked great except on 2.8:

#41 [build 35/36] RUN          DIR=/tmp/ffmpeg && cd ${DIR} &&         ./configure         --disable-debug         --disable-doc         --disable-ffplay         --enable-avresample         --enable-fontconfig         --enable-gpl         --enable-libass         --enable-libbluray         --enable-libfdk_aac         --enable-libfreetype         --enable-libmp3lame         --enable-libopencore-amrnb         --enable-libopencore-amrwb         --enable-libopus         --enable-libtheora         --enable-libvidstab         --enable-libvorbis         --enable-libvpx         --enable-libwebp         --enable-libx264         --enable-libx265         --enable-libxvid         --enable-libzimg         --enable-libzmq         --enable-nonfree         --enable-openssl         --enable-postproc         --enable-shared         --enable-small         --enable-version3         --extra-cflags="-I/opt/ffmpeg/include"         --extra-ldflags="-L/opt/ffmpeg/lib"         --extra-libs=-ldl         --prefix="/opt/ffmpeg" &&         make clean &&         make &&         make install &&         make tools/zmqsend && cp tools/zmqsend /opt/ffmpeg/bin/ &&         make distclean &&         hash -r &&         cd tools &&         make qt-faststart && cp qt-faststart /opt/ffmpeg/bin/
#41 0.542 Unknown option "--enable-libzimg".
#41 0.542 See ./configure --help for available options.

Easy fix, thx again !

sorry for this. Do you want me to fix it or are you going to do it ?

I guess the fix would be to make it conditional on the version in the section below image

jrottenberg commented 7 months ago

I'll have time this weekend, but if you want to take a stab at it before... No rush though I think the 2.8 variants are not building for another reason anyway...

;-)

;-p