git: a841ed53e14d - main - multimedia/ffmpeg: enable VMAF by default

The branch main has been updated by jbeich:

URL: https://cgit.FreeBSD.org/ports/commit/?id=a841ed53e14d0c423fa796d19416d84ae79f3953

commit a841ed53e14d0c423fa796d19416d84ae79f3953
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2021-11-08 15:53:39 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2021-11-08 17:33:41 +0000

    multimedia/ffmpeg: enable VMAF by default
    
    $ pkg install av1an
    $ RUST_BACKTRACE=1 av1an --vmaf --target-quality 95 -i foo.y4m -o foo.mp4
    Scene detection
      [00:00:01] [######################################################################################] 100% 375/375 (213.31 fps, eta 0s)
    Queue: 2 Workers: 1 Passes: 2
    Params: --threads=8 --cpu-used=6 --end-usage=q --cq-level=30 --tile-columns=2 --tile-rows=1 --kf-max-dist=240 --kf-min-dist=12
    ⠁ [00:00:07] [------------------------------------------------------------------------------------------]   0% 0/375 (0.00 fps, eta 0s)
    thread '<unnamed>' panicked at 'VMAF calculation failed:
    Command: "ffmpeg" "-loglevel" "error" "-hide_banner" "-y" "-thread_queue_size" "1024" "-hide_banner" "-r" "60" "-i" ".9e6b01d/split/v_3500001.ivf" "-r" "60" "-i" "-" "-filter_complex" "[0:v]scale=1920x1080:flags=bicubic:force_original_aspect_ratio=decrease,setpts=PTS-STARTPTS[distorted];[1:v]select=not(mod(n\\,4)),setpts=0.2500*PTS,scale=1920x1080:flags=bicubic:force_original_aspect_ratio=decrease,setpts=PTS-STARTPTS[ref];[distorted][ref]libvmaf=log_fmt=\'json\':eof_action=endall:log_path=/tmp/.9e6b01d/split/00001.json:n_threads=0" "-f" "null" "-"
    Output: Output {
        status: ExitStatus(
            ExitStatus(
                256,
            ),
        ),
        stdout: "",
        stderr: "",
    }', av1an-core/src/vmaf.rs:286:3
    stack backtrace:
       0: rust_begin_unwind
       1: std::panicking::begin_panic_fmt
       2: av1an_core::vmaf::run_vmaf
       3: av1an_core::target_quality::TargetQuality::vmaf_probe
       4: av1an_core::target_quality::TargetQuality::per_shot_target_quality_routine
       5: av1an_core::broker::Broker::encode_chunk
       6: core::ops::function::FnOnce::call_once{{vtable.shim}}
    note: Some details are omitted, run with `RUST_BACKTRACE=full` for a verbose backtrace.
    thread '<unnamed>' panicked at 'called `Result::unwrap()` on an `Err` value: Any { .. }', av1an-core/src/broker.rs:53:35
    stack backtrace:
       0: rust_begin_unwind
       1: core::panicking::panic_fmt
       2: core::result::unwrap_failed
       3: <core::panic::unwind_safe::AssertUnwindSafe<F> as core::ops::function::FnOnce<()>>::call_once
       4: crossbeam_utils::thread::scope
       5: av1an_core::broker::Broker::encoding_loop
       6: core::ops::function::FnOnce::call_once{{vtable.shim}}
    note: Some details are omitted, run with `RUST_BACKTRACE=full` for a verbose backtrace.
    thread 'main' panicked at 'called `Result::unwrap()` on an `Err` value: Any { .. }', av1an-core/src/settings.rs:868:21
    stack backtrace:
       0: rust_begin_unwind
       1: core::panicking::panic_fmt
       2: core::result::unwrap_failed
       3: <core::panic::unwind_safe::AssertUnwindSafe<F> as core::ops::function::FnOnce<()>>::call_once
       4: crossbeam_utils::thread::scope
       5: av1an_core::settings::EncodeArgs::encode_file
       6: av1an_cli::run
    note: Some details are omitted, run with `RUST_BACKTRACE=full` for a verbose backtrace.
---
 multimedia/ffmpeg/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index ba4de1fc5fcd..2428c5f40f57 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	ffmpeg
 PORTVERSION=	4.4.1
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	multimedia audio net
 MASTER_SITES=	https://ffmpeg.org/releases/
@@ -48,7 +48,7 @@ OPTIONS_DEFINE=	ALSA AMR_NB AMR_WB AOM ARIBB24 ASM ASS BS2B CACA CDIO \
 
 OPTIONS_DEFAULT=	AOM ASM ASS DAV1D DRM FONTCONFIG FREETYPE FREI0R GMP \
 			GNUTLS ICONV LAME LIBXML2 OPTIMIZED_CFLAGS OPUS RTCPU \
-			THEORA V4L VAAPI VDPAU VORBIS VPX X264 X265 XCB XVID
+			THEORA V4L VAAPI VDPAU VMAF VORBIS VPX X264 X265 XCB XVID
 
 # i386 is too register-starved for LTO (PR257124)
 OPTIONS_EXCLUDE_i386=	LTO