vvc: add vvenc and vvdec binaries

Add vvenc & vvdec binaries and libraries, but not yet to FFmpeg Signed by: Martin Eesmaa <[email protected]> Signed by: Christopher Degawa <[email protected]> Co-authored-by: Christopher Degawa <[email protected]>
m-ab-s · Jun 16, 2022 · 2da55dd · 2da55dd
1 parent 87ece8e
commit 2da55dd
Show file tree

Hide file tree

Showing 3 changed files with 73 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -181,6 +181,7 @@ For information about the compiler environment see the wiki, there you also have
     - svt-av1 (git)
     - tesseract (git)
     - uvg266 (git)
+    - vvenc & vvdec (git)
     - vorbis-tools (git snapshot)
     - vpx (VP8 and VP9 8, 10 and 12 bit) (git)
     - vvc tools (git)

diff --git a/build/media-suite_compile.sh b/build/media-suite_compile.sh
@@ -58,6 +58,8 @@ while true; do
     --jpegxl=* ) jpegxl=${1#*=} && shift ;;
     --vvc=* ) vvc=${1#*=} && shift ;;
     --uvg266=* ) uvg266=${1#*=} && shift ;;
+    --vvenc=* ) vvenc=${1#*=} && shift ;;
+    --vvdec=* ) vvdec=${1#*=} && shift ;;
     --jq=* ) jq=${1#*=} && shift ;;
     --jo=* ) jo=${1#*=} && shift ;;
     --dssim=* ) dssim=${1#*=} && shift ;;
@@ -1823,6 +1825,31 @@ if [[ $bits = 64bit && $uvg266 = y ]] &&
     do_checkIfExist
 fi
 
+_check=(bin-video/vvenc{,FF}app.exe
+    vvenc/vvenc.h
+    libvvenc.{a,pc}
+    lib/cmake/vvenc/vvencConfig.cmake
+    libapputils.a)
+if [[ $bits = 64bit && $vvenc = y ]] &&
+    do_vcs "https://github.com/fraunhoferhhi/vvenc.git"; then
+    do_uninstall include/vvenc lib/cmake/vvenc "${_check[@]}"
+    do_cmakeinstall video \
+        -DBUILD_STATIC=on
+    do_checkIfExist
+fi
+
+_check=(bin-video/vvdecapp.exe
+    vvdec/vvdec.h
+    libvvdec.{a,pc}
+    lib/cmake/vvdec/vvdecConfig.cmake)
+if [[ $bits = 64bit && $vvdec = y ]] &&
+    do_vcs "https://github.com/fraunhoferhhi/vvdec.git"; then
+    do_uninstall include/vvdec lib/cmake/vvdec "${_check[@]}"
+    do_cmakeinstall video \
+        -DBUILD_STATIC=on
+    do_checkIfExist
+fi
+
 _check=(avisynth/avisynth{,_c}.h
         avisynth/avs/{alignment,arch,capi,config,cpuid,minmax,posix,types,win,version}.h)
 if [[ $ffmpeg != no ]] && enabled avisynth &&

diff --git a/media-autobuild_suite.bat b/media-autobuild_suite.bat
@@ -149,7 +149,7 @@ set iniOptions=arch license2 vpx2 x2643 x2652 other265 flac fdkaac mediainfo ^
 soxB ffmpegB2 ffmpegUpdate ffmpegChoice mp4box rtmpdump mplayer2 mpv cores deleteSource ^
 strip pack logging bmx standalone updateSuite aom faac exhale ffmbc curl cyanrip2 ^
 rav1e ripgrep dav1d libavif vvc uvg266 jq dssim avs2 timeStamp noMintty ccache ^
-svthevc svtav1 svtvp9 xvc jo vlc CC jpegxl autouploadlogs
+svthevc svtav1 svtvp9 xvc jo vlc CC jpegxl autouploadlogs vvenc vvdec
 
 set deleteIni=0
 set ini=%build%\media-autobuild_suite.ini
@@ -546,6 +546,46 @@ if %builduvg266%==2 set "uvg266=n"
 if %builduvg266% GTR 2 GOTO uvg266
 if %deleteINI%==1 echo.uvg266=^%builduvg266%>>%ini%
 
+:vvenc
+if %vvencINI%==0 (
+    echo -------------------------------------------------------------------------------
+    echo -------------------------------------------------------------------------------
+    echo.
+    echo. Build vvenc? [Fraunhoferhhi Versatile Video Encoder]
+    echo. 1 = Yes
+    echo. 2 = No
+    echo.
+    echo -------------------------------------------------------------------------------
+    echo -------------------------------------------------------------------------------
+    set /P buildvvenc="Build vvenc: "
+) else set buildvvenc=%vvencINI%
+
+if "%buildvvenc%"=="" GOTO vvenc
+if %buildvvenc%==1 set "vvenc=y"
+if %buildvvenc%==2 set "vvenc=n"
+if %buildvvenc% GTR 2 GOTO vvenc
+if %deleteINI%==1 echo.vvenc=^%buildvvenc%>>%ini%
+
+:vvdec
+if %vvdecINI%==0 (
+    echo -------------------------------------------------------------------------------
+    echo -------------------------------------------------------------------------------
+    echo.
+    echo. Build vvdec? [Fraunhoferhhi Versatile Video Decoder]
+    echo. 1 = Yes
+    echo. 2 = No
+    echo.
+    echo -------------------------------------------------------------------------------
+    echo -------------------------------------------------------------------------------
+    set /P buildvvdec="Build vvdec: "
+) else set buildvvdec=%vvdecINI%
+
+if "%buildvvdec%"=="" GOTO vvdec
+if %buildvvdec%==1 set "vvdec=y"
+if %buildvvdec%==2 set "vvdec=n"
+if %buildvvdec% GTR 2 GOTO vvdec
+if %deleteINI%==1 echo.vvdec=^%buildvvdec%>>%ini%
+
 :svtav1
 if %svtav1INI%==0 (
     echo -------------------------------------------------------------------------------
@@ -1708,9 +1748,10 @@ set compileArgs=--cpuCount=%cpuCount% --build32=%build32% --build64=%build64% ^
 --mpv=%mpv% --license=%license2%  --stripping=%stripFile% --packing=%packFile% --rtmpdump=%rtmpdump% ^
 --logging=%logging% --bmx=%bmx% --standalone=%standalone% --aom=%aom% --faac=%faac% --exhale=%exhale% ^
 --ffmbc=%ffmbc% --curl=%curl% --cyanrip=%cyanrip% --rav1e=%rav1e% --ripgrep=%ripgrep% --dav1d=%dav1d% ^
---vvc=%vvc% --uvg266=%uvg266% --jq=%jq% --jo=%jo% --dssim=%dssim% --avs2=%avs2% --timeStamp=%timeStamp% ^
---noMintty=%noMintty% --ccache=%ccache% --svthevc=%svthevc% --svtav1=%svtav1% --svtvp9=%svtvp9% --xvc=%xvc% ^
---vlc=%vlc% --libavif=%libavif% --jpegxl=%jpegxl% --autouploadlogs=%autouploadlogs%
+--vvc=%vvc% --uvg266=%uvg266% --vvenc=%vvenc% --vvdec=%vvdec% --jq=%jq% --jo=%jo% --dssim=%dssim% ^
+--avs2=%avs2% --timeStamp=%timeStamp% --noMintty=%noMintty% --ccache=%ccache% --svthevc=%svthevc% ^
+--svtav1=%svtav1% --svtvp9=%svtvp9% --xvc=%xvc% --vlc=%vlc% --libavif=%libavif% --jpegxl=%jpegxl% ^ 
+--autouploadlogs=%autouploadlogs%
     set "noMintty=%noMintty%"
     if %build64%==yes ( set "MSYSTEM=MINGW64" ) else set "MSYSTEM=MINGW32"
     set "MSYS2_PATH_TYPE=inherit"