From 8c9fd02ca6c70c590b2f4cd38fcf705f3272c396 Mon Sep 17 00:00:00 2001 From: MartinEesmaa Date: Mon, 3 Apr 2023 10:01:21 +1000 Subject: [PATCH] Forgot to add libvmaf command in FFmpeg configure --- FFMPEGMINGW.sh | 3 ++- libvvdecffmpeg.sh | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/FFMPEGMINGW.sh b/FFMPEGMINGW.sh index 904e597..6235c17 100644 --- a/FFMPEGMINGW.sh +++ b/FFMPEGMINGW.sh @@ -118,6 +118,7 @@ cd ../../ echo Starting to build vmaf to apply calculate VVC video references from original video: mkdir vmaf/libvmaf/build && cd vmaf/libvmaf/build && CFLAGS="-msse2 -mfpmath=sse -mstackrealign" meson -Denable_docs=false -Ddefault_library=static -Denable_float=true -Dbuilt_in_models=true -Dprefix=$MSYSTEM_PREFIX .. && ninja install -j $nproc cd ../../../ +sed -i 's/-lm/-lm -lstdc++/g' $MSYSTEM_PREFIX/lib/pkgconfig/libvmaf.pc echo Starting to build vvenc... cd vvenc @@ -135,7 +136,7 @@ cd ../../ echo Starting configuring and making FFmpeg VVCEasy build... cd FFmpeg-VVC ./configure --enable-libfdk-aac --enable-static --enable-libvvenc --enable-libvvdec --enable-pic \ ---enable-zlib --enable-libxml2 --enable-libdav1d --enable-libopus --enable-libcodec2 --enable-libjxl --extra-ldexeflags=-static \ +--enable-zlib --enable-libxml2 --enable-libdav1d --enable-libopus --enable-libcodec2 --enable-libjxl --enable-libvmaf --extra-ldexeflags=-static \ --pkg-config-flags=-static --disable-w32threads --enable-sdl2 && \ make -j echo FFmpeg VVC version tools are now compiled, please see buildffmpegwin/FFmpeg folder. diff --git a/libvvdecffmpeg.sh b/libvvdecffmpeg.sh index ad9ea53..2676a07 100644 --- a/libvvdecffmpeg.sh +++ b/libvvdecffmpeg.sh @@ -82,6 +82,7 @@ mkdir libjxl/build && cd libjxl/build && cmake -DCMAKE_BUILD_TYPE=Release -DBUIL cd ../../ && \ mkdir vmaf/libvmaf/build && cd vmaf/libvmaf/build && CFLAGS="-msse2 -mfpmath=sse -mstackrealign" meson -Denable_docs=false -Ddefault_library=static -Denable_float=true -Dbuilt_in_models=true -Dprefix=$PREFIX .. && sudo ninja install -j $nproc && \ cd ../../../ && \ +sudo sed -i 's/-lm/-lm -lstdc++/g' $PREFIX/lib/pkgconfig/libvmaf.pc && \ cd SDL && mkdir build && cd build && cmake -DCMAKE_EXE_LINKER_FLAGS="-static" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$PREFIX .. && sudo make install -j $nproc && \ cd ../../ && \ mkdir dav1d/build && cd dav1d/build && meson -Denable_docs=false -Ddefault_library=static -Dprefix=$PREFIX .. && sudo ninja install -j $nproc && \ @@ -89,7 +90,7 @@ cd ../../ && \ cd FFmpeg-VVC && \ ./configure --enable-static --pkg-config-flags="--static" --extra-ldexeflags="-static" \ --enable-libfdk-aac --enable-libvvenc --enable-libvvdec --enable-pic \ ---enable-libxml2 --enable-libopus --enable-libdav1d --enable-libjxl --enable-sdl2 && \ +--enable-libxml2 --enable-libopus --enable-libdav1d --enable-libjxl --enable-libvmaf --enable-sdl2 && \ make -j echo You're ready to preview VVC, view VVC information or convert from VVC using ffmpeg, ffplay and ffprobe. echo - Martin Eesmaa