Attachment #231123 for bug #261302




# Created by: Martin Matuska <mm@FreeBSD.org>

PORTNAME=	ffmpeg
PORTVERSION=	5.0
PORTREVISION=	3
PORTEPOCH=	1
CATEGORIES=	multimedia audio net
MASTER_SITES=	https://ffmpeg.org/releases/

OPTIONS_DEFINE=	ALSA AMR_NB AMR_WB AOM ARIBB24 ASM ASS BS2B CACA CDIO \
		CODEC2 DAV1D DAVS2 DC1394 DEBUG DOCS DRM FDK_AAC FLITE \
		FONTCONFIG FREETYPE FREI0R FRIBIDI GLSLANG GME GSM ICONV ILBC \
		JACK KLVANC KVAZAAR LADSPA LAME LENSFUN LIBBLURAY LIBPLACEBO LIBRSVG2 \
		LIBXML2 LTO LV2 MFX MODPLUG MYSOFA OPENAL OPENCL OPENGL \
		OPENH264 OPENJPEG OPENMPT OPENVINO OPTIMIZED_CFLAGS OPUS POCKETSPHINX \
		PULSEAUDIO RAV1E RABBITMQ RIST RTCPU RUBBERBAND SDL SHADERC SMB SNAPPY \
		SNDIO SOXR SPEEX SRT SSH SVTAV1 SVTHEVC SVTVP9 TENSORFLOW \
		TESSERACT THEORA TWOLAME UAVS3D V4L VAAPI VAPOURSYNTH VDPAU VIDSTAB \
		VMAF VO_AMRWBENC VORBIS VPX VULKAN WEBP X264 X265 \
		XAVS2 XCB XVID XVIDEO ZIMG ZMQ ZVBI

OPTIONS_DEFAULT=	AOM ASM ASS DAV1D DRM FONTCONFIG FREETYPE FREI0R GMP \
			GNUTLS ICONV LAME LIBPLACEBO LIBXML2 OPTIMIZED_CFLAGS OPUS RTCPU \
			THEORA V4L VAAPI VDPAU VMAF VORBIS VPX VULKAN X264 X265 XCB XVID

# i386 is too register-starved for LTO (PR257124)
OPTIONS_EXCLUDE_i386=	LTO

RUBBERBAND_DESC=Time-stretching and pitch-shifting with librubberband
RTCPU_DESC=	Detect CPU capabilities at runtime
RTMP_DESC=	RTMP(T)E protocol support
SHADERC_DESC=	GLSL->SPIRV compilation via libshaderc
SRT_DESC=	Haivision SRT protocol via libsrt
SVTAV1_DESC=	AV1 encoding via SVT-AV1
SVTHEVC_DESC=	HEVC encoding via SVT-HEVC
SVTVP9_DESC=	VP9 encoding via SVT-VP9
LIBPLACEBO_DESC=GPU filters from libplacebo
LIBRTMP_DESC=	${RTMP_DESC} via librtmp
TENSORFLOW_DESC=TensorFlow as a DNN module backend for DNN based filters like sr
TESSERACT_DESC=	Optical Character Recognition via Tesseract

LIBBLURAY_LIB_DEPENDS=	libbluray.so:multimedia/libbluray
LIBBLURAY_CONFIGURE_ENABLE=	libbluray

# libplacebo
LIBPLACEBO_LIB_DEPENDS=	libplacebo.so:graphics/libplacebo
LIBPLACEBO_CONFIGURE_ENABLE=	libplacebo

# librsvg
LIBRSVG2_USES=			gnome
LIBRSVG2_USE=			GNOME=cairo,librsvg2

SDL_USE=		SDL=sdl2
SDL_CONFIGURE_ENABLE=	sdl2

# shaderc
SHADERC_LIB_DEPENDS=	libshaderc_shared.so:graphics/shaderc
SHADERC_CONFIGURE_ENABLE=	libshaderc
SHADERC_PREVENTS=	GLSLANG

# smbclient
SMB_USES=		samba:lib
SMB_CONFIGURE_ENABLE=	libsmbclient

VULKAN_BUILD_DEPENDS=	vulkan-headers>0:graphics/vulkan-headers
VULKAN_LIB_DEPENDS=	libvulkan.so:graphics/vulkan-loader
VULKAN_CONFIGURE_ENABLE=	vulkan
VULKAN_IMPLIES=		${"${PORT_OPTIONS:MGLSLANG}":?GLSLANG:SHADERC}

# webp
WEBP_LIB_DEPENDS=	libwebp.so:graphics/webp

		--enable-shared \
		--enable-pic \
		--enable-gpl \
		--enable-avresample \
		--cc="${CC}" \
		--cxx="${CXX}"


Lines 1-6 Link Here

(-)b/multimedia/ffmpeg/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1635171801	1	TIMESTAMP = 1642185942
2	SHA256 (ffmpeg-4.4.1.tar.xz) = eadbad9e9ab30b25f5520fbfde99fae4a92a1ae3c0257a8d68569a4651e30e02	2	SHA256 (ffmpeg-5.0.tar.xz) = 51e919f7d205062c0fd4fae6243a84850391115104ccf1efc451733bc0ac7298
3	SIZE (ffmpeg-4.4.1.tar.xz) = 9557516	3	SIZE (ffmpeg-5.0.tar.xz) = 9811480
4	SHA256 (0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch) = 376ea23e9d876390fbca936c80cb437bb9daa6232ff65df0ea91673e18b739ff	4	SHA256 (0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch) = 376ea23e9d876390fbca936c80cb437bb9daa6232ff65df0ea91673e18b739ff
5	SIZE (0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch) = 24259	5	SIZE (0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch) = 24259
6	SHA256 (0002-doc-Add-libsvt_hevc-encoder-docs.patch) = d16589efc4be2602a9f436e9938cfee0cc7b5ccd7a4a6b41c0c9a59ae0859fda	6	SHA256 (0002-doc-Add-libsvt_hevc-encoder-docs.patch) = d16589efc4be2602a9f436e9938cfee0cc7b5ccd7a4a6b41c0c9a59ae0859fda




https://lists.ffmpeg.org/pipermail/ffmpeg-devel/2022-January/291606.html

--- configure.orig	2022-01-14 18:45:39 UTC
+++ configure
@@ -3747,7 +3747,7 @@ vaguedenoiser_filter_deps="gpl"
 vflip_vulkan_filter_deps="vulkan spirv_compiler"
 vidstabdetect_filter_deps="libvidstab"
 vidstabtransform_filter_deps="libvidstab"
-libvmaf_filter_deps="libvmaf pthreads"

 zmq_filter_deps="libzmq"
 zoompan_filter_deps="swscale"
 zscale_filter_deps="libzimg const_nan"
@@ -6615,7 +6615,7 @@ enabled libtwolame        && require libtwolame twolam
 enabled libuavs3d         && require_pkg_config libuavs3d "uavs3d >= 1.1.41" uavs3d.h uavs3d_decode
 enabled libv4l2           && require_pkg_config libv4l2 libv4l2 libv4l2.h v4l2_ioctl
 enabled libvidstab        && require_pkg_config libvidstab "vidstab >= 0.98" vid.stab/libvidstab.h vsMotionDetectInit

 enabled libvo_amrwbenc    && require libvo_amrwbenc vo-amrwbenc/enc_if.h E_IF_init -lvo-amrwbenc
 enabled libvorbis         && require_pkg_config libvorbis vorbis vorbis/codec.h vorbis_info_init &&
                              require_pkg_config libvorbisenc vorbisenc vorbis/vorbisenc.h vorbis_encode_init
--- doc/filters.texi.orig	2022-01-14 18:45:39 UTC
+++ doc/filters.texi
@@ -14666,68 +14666,39 @@ ffmpeg -i input.mov -vf lensfun=make=Canon:model="Cano
 
 @section libvmaf
 

+Calulate the VMAF (Video Multi-Method Assessment Fusion) score for a
+reference/distorted pair of input videos.
 
-The first input is the encoded video, and the second input is the reference video.
+The first input is the distorted video, and the second input is the reference video.
 
 The obtained VMAF score is printed through the logging system.
 
 It requires Netflix's vmaf library (libvmaf) as a pre-requisite.

 @end table
 
 This filter also supports the @ref{framesync} options.
@@ -14735,23 +14706,31 @@ This filter also supports the @ref{framesync} options.
 @subsection Examples
 @itemize
 @item

 @end example
 @end itemize
 
--- libavfilter/vf_libvmaf.c.orig	2022-01-14 18:45:40 UTC
+++ libavfilter/vf_libvmaf.c
@@ -24,8 +24,8 @@
  * Calculate the VMAF between two input videos.

 #include "libavutil/avstring.h"
 #include "libavutil/opt.h"
 #include "libavutil/pixdesc.h"
@@ -39,23 +39,9 @@
 typedef struct LIBVMAFContext {
     const AVClass *class;
     FFFrameSync fs;

-    AVFrame *gmain;
-    AVFrame *gref;
-    int frame_set;
     char *model_path;
     char *log_path;
     char *log_fmt;
-    int disable_clip;
-    int disable_avx;
     int enable_transform;
     int phone_model;
     int psnr;
@@ -65,185 +51,483 @@ typedef struct LIBVMAFContext {
-    int ms_ssim;
-    char *pool;
     int n_threads;
     int n_subsample;
     int enable_conf_interval;
-    int error;
+    char *model_cfg;
+    char *feature_cfg;

-    {"psnr",  "Enables computing psnr along with vmaf.",                                OFFSET(psnr), AV_OPT_TYPE_BOOL, {.i64=0}, 0, 1, FLAGS},
-    {"ssim",  "Enables computing ssim along with vmaf.",                                OFFSET(ssim), AV_OPT_TYPE_BOOL, {.i64=0}, 0, 1, FLAGS},
-    {"ms_ssim",  "Enables computing ms-ssim along with vmaf.",                          OFFSET(ms_ssim), AV_OPT_TYPE_BOOL, {.i64=0}, 0, 1, FLAGS},
+    {"model_path",  "use model='path=...'.",                                            OFFSET(model_path), AV_OPT_TYPE_STRING, {.str=NULL}, 0, 1, FLAGS|AV_OPT_FLAG_DEPRECATED},
+    {"log_path",  "Set the file path to be used to write log.",                         OFFSET(log_path), AV_OPT_TYPE_STRING, {.str=NULL}, 0, 1, FLAGS},
+    {"log_fmt",  "Set the format of the log (csv, json, xml, or sub).",                 OFFSET(log_fmt), AV_OPT_TYPE_STRING, {.str="xml"}, 0, 1, FLAGS},
+    {"enable_transform",  "use model='enable_transform=true'.",                         OFFSET(enable_transform), AV_OPT_TYPE_BOOL, {.i64=0}, 0, 1, FLAGS|AV_OPT_FLAG_DEPRECATED},
+    {"phone_model",  "use model='enable_transform=true'.",                              OFFSET(phone_model), AV_OPT_TYPE_BOOL, {.i64=0}, 0, 1, FLAGS|AV_OPT_FLAG_DEPRECATED},
+    {"psnr",  "use feature='name=psnr'.",                                               OFFSET(psnr), AV_OPT_TYPE_BOOL, {.i64=0}, 0, 1, FLAGS|AV_OPT_FLAG_DEPRECATED},
+    {"ssim",  "use feature='name=ssim'.",                                               OFFSET(ssim), AV_OPT_TYPE_BOOL, {.i64=0}, 0, 1, FLAGS|AV_OPT_FLAG_DEPRECATED},
+    {"ms_ssim",  "use feature='name=ms_ssim'.",                                         OFFSET(ms_ssim), AV_OPT_TYPE_BOOL, {.i64=0}, 0, 1, FLAGS|AV_OPT_FLAG_DEPRECATED},
     {"pool",  "Set the pool method to be used for computing vmaf.",                     OFFSET(pool), AV_OPT_TYPE_STRING, {.str=NULL}, 0, 1, FLAGS},
     {"n_threads", "Set number of threads to be used when computing vmaf.",              OFFSET(n_threads), AV_OPT_TYPE_INT, {.i64=0}, 0, UINT_MAX, FLAGS},
     {"n_subsample", "Set interval for frame subsampling used when computing vmaf.",     OFFSET(n_subsample), AV_OPT_TYPE_INT, {.i64=1}, 1, UINT_MAX, FLAGS},
-    {"enable_conf_interval",  "Enables confidence interval.",                           OFFSET(enable_conf_interval), AV_OPT_TYPE_BOOL, {.i64=0}, 0, 1, FLAGS},
+    {"enable_conf_interval",  "Enables confidence interval.",                           OFFSET(enable_conf_interval), AV_OPT_TYPE_BOOL, {.i64=0}, 0, 1, FLAGS|AV_OPT_FLAG_DEPRECATED},
+    {"model",  "Set the model to be used for computing vmaf.",                          OFFSET(model_cfg), AV_OPT_TYPE_STRING, {.str="version=vmaf_v0.6.1"}, 0, 1, FLAGS},
+    {"feature",  "Set the feature to be used for computing vmaf.",                      OFFSET(feature_cfg), AV_OPT_TYPE_STRING, {.str=NULL}, 0, 1, FLAGS},
+    {"log_fmt",  "Set the format of the log (csv, json, xml, or sub).",                   OFFSET(log_fmt), AV_OPT_TYPE_STRING, {.str="xml"}, 0, 1, FLAGS},
+    {"n_threads", "Set number of threads to be used when computing vmaf.",                OFFSET(n_threads), AV_OPT_TYPE_INT, {.i64=0}, 0, UINT_MAX, FLAGS},
+    {"n_subsample", "Set interval for frame subsampling used when computing vmaf.",       OFFSET(n_subsample), AV_OPT_TYPE_INT, {.i64=1}, 1, UINT_MAX, FLAGS},
     { NULL }
 };
 

+{
+    int err = vmaf_picture_alloc(dst, pix_fmt_map(src->format), bpc,
+                                 src->width, src->height);
+    if (err)
+        return AVERROR(ENOMEM);
 
-static void compute_vmaf_score(LIBVMAFContext *s)
+    for (unsigned i = 0; i < 3; i++) {

-    char *format;
+    AVFilterContext *ctx = fs->parent;
+    LIBVMAFContext *s = ctx->priv;
+    VmafPicture pic_ref, pic_dist;
+    AVFrame *ref, *dist;
+    int err = 0;
 

+    if (ctx->is_disabled || !ref)
+        return ff_filter_frame(ctx->outputs[0], dist);
+
+    VmafPicture pic_ref;
+    err = copy_picture_data(ref, &pic_ref, s->bpc);
+    if (err) {
+        av_log(s, AV_LOG_ERROR, "problem during vmaf_picture_alloc.\n");

     }
 
-    format = (char *) s->desc->name;
+    VmafPicture pic_dist;
+    err = copy_picture_data(dist, &pic_dist, s->bpc);
+    if (err) {
+        av_log(s, AV_LOG_ERROR, "problem during vmaf_picture_alloc.\n");

-        pthread_mutex_lock(&s->lock);
-        pthread_cond_signal(&s->cond);
-        pthread_mutex_unlock(&s->lock);
+    AVDictionary **dict = NULL;
+    char *str_copy = NULL;
+    char *saveptr = NULL;
+    int err = 0;
+
+    if (!str)
+        return NULL;
+
+    *cnt = 1;
+    for (char *p = str; *p; p++) {

     }
-    pthread_exit(NULL);
+
+    dict = av_calloc(*cnt, sizeof(*dict));
+    if (!dict)
+        goto fail;
+
+    str_copy = av_strdup(str);
+    if (!str_copy)
+        goto fail;
+
+    char *saveptr = NULL;
+    for (unsigned i = 0; i < *cnt; i++) {
+        char *s = av_strtok(i == 0 ? str_copy : NULL, "|", &saveptr);
+        err = av_dict_parse_string(&dict[i], s, "=", ":", 0);
+        if (err)
+            goto fail;
+    }
+
+    av_free(str_copy);

+        }
+        av_free(dict);
+    }
+
+    av_free(str_copy);
+    *cnt = 0;
     return NULL;
 }

     LIBVMAFContext *s = ctx->priv;
-    AVFrame *master, *ref;
-    int ret;
+    AVDictionary **dict = NULL;
+    unsigned dict_cnt;
+    int err = 0;
 
-    ret = ff_framesync_dualinput_get(fs, &master, &ref);
-    if (ret < 0)
-        return ret;
-    if (!ref)
-        return ff_filter_frame(ctx->outputs[0], master);
+    if (!s->feature_cfg)
+        return 0;
 
-    pthread_mutex_lock(&s->lock);
+    dict = delimited_dict_parse(s->feature_cfg, &dict_cnt);
+    AVDictionary **dict = delimited_dict_parse(s->feature_cfg, &dict_cnt);
+    if (!dict) {
+        av_log(ctx, AV_LOG_ERROR,
+               "could not parse feature config: %s\n", s->feature_cfg);

+static int parse_models(AVFilterContext *ctx)
+{
+    LIBVMAFContext *s = ctx->priv;
+    AVDictionary **dict;
+    unsigned dict_cnt;
+    int err = 0;
+
+    if (!s->model_cfg) return 0;
+
+    dict_cnt = 0;
+    dict = delimited_dict_parse(s->model_cfg, &dict_cnt);
+    if (!dict) {
         av_log(ctx, AV_LOG_ERROR,
-               "libvmaf encountered an error, check log for details\n");

-    av_frame_ref(s->gmain, master);
+    s->model_cnt = dict_cnt;
+    s->model = av_calloc(s->model_cnt, sizeof(*s->model));
+    if (!s->model)
+        return AVERROR(ENOMEM);
 
-    s->frame_set = 1;
+    for (unsigned i = 0; i < dict_cnt; i++) {
+        VmafModelConfig model_cfg = { 0 };
+        AVDictionaryEntry *e = NULL;
+        char *version = NULL;
+        char  *path = NULL;
 
-    pthread_cond_signal(&s->cond);
-    pthread_mutex_unlock(&s->lock);

+            if (err) {
+                av_log(ctx, AV_LOG_ERROR,
+                       "could not load libvmaf model with path: %s\n",
+                       path);
+                goto exit;
+            }
+        }

+            goto exit;
+        }
+
+        e = NULL;
+        while (e = av_dict_get(dict[i], "", e, AV_DICT_IGNORE_SUFFIX)) {
+            VmafFeatureDictionary *feature_opts_dict = NULL;
+            char *feature_opt = NULL;
+
+            char *feature_name = av_strtok(e->key, ".", &feature_opt);
+            if (!feature_opt)
+                continue;
+
+            VmafFeatureDictionary *feature_opts_dict = NULL;
+            err = vmaf_feature_dictionary_set(&feature_opts_dict,
+                                              feature_opt, e->value);
+            if (err) {

+        return VMAF_LOG_LEVEL_INFO;
+    }
+}
+
+static int parse_deprecated_options(AVFilterContext *ctx)
+{
+    LIBVMAFContext *s = ctx->priv;
+    VmafModel *model = NULL;
+    VmafModelCollection *model_collection = NULL;
+    enum VmafModelFlags flags = VMAF_MODEL_FLAGS_DEFAULT;
+    int err = 0;
+
+    VmafModelConfig model_cfg = {
+        .name = "vmaf",
+        .flags = flags,
+    };
+
+    if (s->enable_transform || s->phone_model)
+        flags |= VMAF_MODEL_FLAG_ENABLE_TRANSFORM;
+
+    if (!s->model_path)
+        goto extra_metrics_only;
+
+    if (s->enable_conf_interval) {
+        err = vmaf_model_collection_load_from_path(&model, &model_collection,
+                                                   &model_cfg, s->model_path);
+        if (err) {
+            av_log(ctx, AV_LOG_ERROR,
+                   "problem loading model file: %s\n", s->model_path);
+            goto exit;
+        }
+
+        err = vmaf_use_features_from_model_collection(s->vmaf, model_collection);
+        if (err) {
+            av_log(ctx, AV_LOG_ERROR,
+                   "problem loading feature extractors from model file: %s\n",
+                   s->model_path);
+            goto exit;
+        }
+    } else {
+        err = vmaf_model_load_from_path(&model, &model_cfg, s->model_path);
+        if (err) {
+                av_log(ctx, AV_LOG_ERROR,
+                      "problem loading model file: %s\n", s->model_path);
+            goto exit;
+        }
+        err = vmaf_use_features_from_model(s->vmaf, model);
+        if (err) {
+            av_log(ctx, AV_LOG_ERROR,
+                   "problem loading feature extractors from model file: %s\n",
+                   s->model_path);
+            goto exit;
+        }
+    }
+
+extra_metrics_only:
+    if (s->psnr) {
+        VmafFeatureDictionary *d = NULL;
+        vmaf_feature_dictionary_set(&d, "enable_chroma", "false");
+
+        err = vmaf_use_feature(s->vmaf, "psnr", d);
+        if (err) {
+            av_log(ctx, AV_LOG_ERROR,
+                   "problem loading feature extractor: psnr\n");
+            goto exit;
+        }
+    }
+
+    if (s->ssim) {
+        err = vmaf_use_feature(s->vmaf, "float_ssim", NULL);
+        if (err) {
+            av_log(ctx, AV_LOG_ERROR,
+                   "problem loading feature extractor: ssim\n");
+            goto exit;
+        }
+    }
+
+    if (s->ms_ssim) {
+        err = vmaf_use_feature(s->vmaf, "float_ms_ssim", NULL);
+        if (err) {
+            av_log(ctx, AV_LOG_ERROR,
+                   "problem loading feature extractor: ms_ssim\n");
+            goto exit;
+        }
+    }
+
+exit:
+    return err;
+}
+
 static av_cold int init(AVFilterContext *ctx)
 {

 
-    s->error = 0;
+    err = vmaf_init(&s->vmaf, cfg);
+    if (err)
+        return AVERROR(EINVAL);
 
-    s->vmaf_thread_created = 0;
-    pthread_mutex_init(&s->lock, NULL);
-    pthread_cond_init (&s->cond, NULL);
+    err = parse_deprecated_options(ctx);
+    if (err)
+        return err;
 
+    err = parse_models(ctx);
+    if (err)
+        return err;
+
+    err = parse_features(ctx);
+    if (err)
+        return err;
+
     s->fs.on_event = do_vmaf;
     return 0;
 }
@@ -256,27 +540,32 @@ static const enum AVPixelFormat pix_fmts[] = {
 static int query_formats(AVFilterContext *ctx)
 {
     static const enum AVPixelFormat pix_fmts[] = {
-        AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV420P,
-        AV_PIX_FMT_YUV444P10LE, AV_PIX_FMT_YUV422P10LE, AV_PIX_FMT_YUV420P10LE,
+        AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV420P16LE,
+        AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV422P16LE,
+        AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUV444P16LE,
         AV_PIX_FMT_NONE
     };
 
@@ -262,33 +424,32 @@ static int query_formats(AVFilterContext *ctx)
     return ff_set_common_formats(ctx, fmts_list);
 }
 
-
 static int config_input_ref(AVFilterLink *inlink)
 {
-    AVFilterContext *ctx  = inlink->dst;
+    AVFilterContext *ctx = inlink->dst;
     LIBVMAFContext *s = ctx->priv;
-    int th;
+    const AVPixFmtDescriptor *desc;
+    int err = 0;
 
-    if (ctx->inputs[0]->w != ctx->inputs[1]->w ||
-        ctx->inputs[0]->h != ctx->inputs[1]->h) {
-        av_log(ctx, AV_LOG_ERROR, "Width and height of input videos must be same.\n");
-        return AVERROR(EINVAL);
+    int err = 0;
+
+    if (ctx->inputs[0]->w != ctx->inputs[1]->w) {
+        av_log(ctx, AV_LOG_ERROR, "input width must match.\n");
+        err |= AVERROR(EINVAL);
     }
+
+    if (ctx->inputs[0]->h != ctx->inputs[1]->h) {
+        av_log(ctx, AV_LOG_ERROR, "input height must match.\n");
+        err |= AVERROR(EINVAL);
+    }
+
     if (ctx->inputs[0]->format != ctx->inputs[1]->format) {
-        av_log(ctx, AV_LOG_ERROR, "Inputs must be of same pixel format.\n");
-        return AVERROR(EINVAL);
+        av_log(ctx, AV_LOG_ERROR, "input pix_fmt must match.\n");
+        err |= AVERROR(EINVAL);
     }
 
-    s->desc = av_pix_fmt_desc_get(inlink->format);
-    s->width = ctx->inputs[0]->w;
-    s->height = ctx->inputs[0]->h;
+    if (ctx->inputs[0]->h != ctx->inputs[1]->h) {
+        av_log(ctx, AV_LOG_ERROR, "input height must match.\n");
+        err |= AVERROR(EINVAL);
+    }
 
-    th = pthread_create(&s->vmaf_thread, NULL, call_vmaf, (void *) s);
-    if (th) {
-        av_log(ctx, AV_LOG_ERROR, "Thread creation failed.\n");
-        return AVERROR(EINVAL);
+    if (ctx->inputs[0]->format != ctx->inputs[1]->format) {
+        av_log(ctx, AV_LOG_ERROR, "input pix_fmt must match.\n");
+        err |= AVERROR(EINVAL);
     }
-    s->vmaf_thread_created = 1;
+    const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(inlink->format);
+    s->bpc = desc->comp[0].depth;
 
+    if (err)
+        return err;
+
+    desc = av_pix_fmt_desc_get(inlink->format);
+    s->bpc = desc->comp[0].depth;
+
     return 0;
 }
 
@@ -307,28 +596,76 @@ static int activate(AVFilterContext *ctx)
     return ff_framesync_activate(&s->fs);
 }
 

+
+    return VMAF_OUTPUT_FORMAT_XML;
+}
+
+static enum VmafPoolingMethod pool_method_map(const char *pool_method)
+{
+    if (av_stristr(pool_method, "min"))
+        return VMAF_POOL_METHOD_MIN;
+    if (av_stristr(pool_method, "mean"))
+        return VMAF_POOL_METHOD_MEAN;
+    if (av_stristr(pool_method, "harmonic_mean"))
+        return VMAF_POOL_METHOD_HARMONIC_MEAN;
+
+    return VMAF_POOL_METHOD_MEAN;
+}
+
 static av_cold void uninit(AVFilterContext *ctx)
 {
     LIBVMAFContext *s = ctx->priv;
 
+    int err = 0;
 
     ff_framesync_uninit(&s->fs);
 
-    pthread_mutex_lock(&s->lock);
-    s->eof = 1;
-    pthread_cond_signal(&s->cond);
-    pthread_mutex_unlock(&s->lock);
+    if (!s->frame_cnt)
+        goto clean_up;
 
-    if (s->vmaf_thread_created)
-    {

-    av_frame_free(&s->gmain);
+    for (unsigned i = 0; i < s->model_cnt; i++) {
+        double vmaf_score;
+        err = vmaf_score_pooled(s->vmaf, s->model[i], pool_method_map(s->pool),
+                                &vmaf_score, 0, s->frame_cnt - 1);
+        if (err) {
+            av_log(ctx, AV_LOG_ERROR,

 }
 
 static const AVFilterPad libvmaf_inputs[] = {
     {
         .name         = "main",
         .type         = AVMEDIA_TYPE_VIDEO,
-    },{
+    },
+    {
         .name         = "reference",
         .type         = AVMEDIA_TYPE_VIDEO,
         .config_props = config_input_ref,




include/libavcodec/codec_id.h
include/libavcodec/codec_par.h
include/libavcodec/d3d11va.h
include/libavcodec/defs.h
include/libavcodec/dirac.h
include/libavcodec/dv_profile.h
include/libavcodec/dxva2.h

include/libavcodec/mediacodec.h
include/libavcodec/packet.h
include/libavcodec/qsv.h
include/libavcodec/vaapi.h
include/libavcodec/vdpau.h
include/libavcodec/version.h
include/libavcodec/videotoolbox.h

include/libavformat/avformat.h
include/libavformat/avio.h
include/libavformat/version.h
include/libavresample/avresample.h
include/libavresample/version.h
include/libavutil/adler32.h
include/libavutil/aes.h
include/libavutil/aes_ctr.h

include/libavutil/cpu.h
include/libavutil/crc.h
include/libavutil/des.h
include/libavutil/detection_bbox.h
include/libavutil/dict.h
include/libavutil/display.h
include/libavutil/dovi_meta.h

include/libswscale/swscale.h
include/libswscale/version.h
lib/libavcodec.so
lib/libavcodec.so.59
lib/libavcodec.so.59.18.100
lib/libavdevice.so
lib/libavdevice.so.59
lib/libavdevice.so.59.4.100
lib/libavfilter.so
lib/libavfilter.so.8
lib/libavfilter.so.8.24.100
lib/libavformat.so
lib/libavformat.so.59
lib/libavformat.so.59.16.100
lib/libavresample.so
lib/libavresample.so.4
lib/libavresample.so.4.0.0
lib/libavutil.so
lib/libavutil.so.57
lib/libavutil.so.57.17.100
lib/libpostproc.so
lib/libpostproc.so.56
lib/libpostproc.so.56.3.100
lib/libswresample.so
lib/libswresample.so.4
lib/libswresample.so.4.3.100
lib/libswscale.so
lib/libswscale.so.6
lib/libswscale.so.6.4.100
libdata/pkgconfig/libavcodec.pc
libdata/pkgconfig/libavdevice.pc
libdata/pkgconfig/libavfilter.pc
libdata/pkgconfig/libavformat.pc
libdata/pkgconfig/libavresample.pc
libdata/pkgconfig/libavutil.pc
libdata/pkgconfig/libpostproc.pc
libdata/pkgconfig/libswresample.pc

Return to bug 261302

Lines 1-8 Link Here

(-)b/multimedia/ffmpeg/Makefile (-8 / +17 lines)
1	# Created by: Martin Matuska <mm@FreeBSD.org>	1	# Created by: Martin Matuska <mm@FreeBSD.org>
2		2
3	PORTNAME= ffmpeg	3	PORTNAME= ffmpeg
4	PORTVERSION= 4.4.1	4	PORTVERSION= 5.0
5	PORTREVISION= 3
6	PORTEPOCH= 1	5	PORTEPOCH= 1
7	CATEGORIES= multimedia audio net	6	CATEGORIES= multimedia audio net
8	MASTER_SITES= https://ffmpeg.org/releases/	7	MASTER_SITES= https://ffmpeg.org/releases/
Lines 37-54 PORTSCOUT= limit:^4\. Link Here
37	OPTIONS_DEFINE= ALSA AMR_NB AMR_WB AOM ARIBB24 ASM ASS BS2B CACA CDIO \	36	OPTIONS_DEFINE= ALSA AMR_NB AMR_WB AOM ARIBB24 ASM ASS BS2B CACA CDIO \
38	CODEC2 DAV1D DAVS2 DC1394 DEBUG DOCS DRM FDK_AAC FLITE \	37	CODEC2 DAV1D DAVS2 DC1394 DEBUG DOCS DRM FDK_AAC FLITE \
39	FONTCONFIG FREETYPE FREI0R FRIBIDI GLSLANG GME GSM ICONV ILBC \	38	FONTCONFIG FREETYPE FREI0R FRIBIDI GLSLANG GME GSM ICONV ILBC \
40	JACK KLVANC KVAZAAR LADSPA LAME LENSFUN LIBBLURAY LIBRSVG2 \	39	JACK KLVANC KVAZAAR LADSPA LAME LENSFUN LIBBLURAY LIBPLACEBO LIBRSVG2 \
41	LIBXML2 LTO LV2 MFX MODPLUG MYSOFA OPENAL OPENCL OPENGL \	40	LIBXML2 LTO LV2 MFX MODPLUG MYSOFA OPENAL OPENCL OPENGL \
42	OPENH264 OPENJPEG OPENMPT OPENVINO OPTIMIZED_CFLAGS OPUS POCKETSPHINX \	41	OPENH264 OPENJPEG OPENMPT OPENVINO OPTIMIZED_CFLAGS OPUS POCKETSPHINX \
43	PULSEAUDIO RAV1E RABBITMQ RIST RTCPU RUBBERBAND SDL SMB SNAPPY \	42	PULSEAUDIO RAV1E RABBITMQ RIST RTCPU RUBBERBAND SDL SHADERC SMB SNAPPY \
44	SNDIO SOXR SPEEX SRT SSH SVTAV1 SVTHEVC SVTVP9 TENSORFLOW \	43	SNDIO SOXR SPEEX SRT SSH SVTAV1 SVTHEVC SVTVP9 TENSORFLOW \
45	TESSERACT THEORA TWOLAME UAVS3D V4L VAAPI VAPOURSYNTH VDPAU VIDSTAB \	44	TESSERACT THEORA TWOLAME UAVS3D V4L VAAPI VAPOURSYNTH VDPAU VIDSTAB \
46	VMAF VO_AMRWBENC VORBIS VPX VULKAN WEBP X264 X265 \	45	VMAF VO_AMRWBENC VORBIS VPX VULKAN WEBP X264 X265 \
47	XAVS2 XCB XVID XVIDEO ZIMG ZMQ ZVBI	46	XAVS2 XCB XVID XVIDEO ZIMG ZMQ ZVBI
48		47
49	OPTIONS_DEFAULT= AOM ASM ASS DAV1D DRM FONTCONFIG FREETYPE FREI0R GMP \	48	OPTIONS_DEFAULT= AOM ASM ASS DAV1D DRM FONTCONFIG FREETYPE FREI0R GMP \
50	GNUTLS ICONV LAME LIBXML2 OPTIMIZED_CFLAGS OPUS RTCPU \	49	GNUTLS ICONV LAME LIBPLACEBO LIBXML2 OPTIMIZED_CFLAGS OPUS RTCPU \
51	THEORA V4L VAAPI VDPAU VMAF VORBIS VPX X264 X265 XCB XVID	50	THEORA V4L VAAPI VDPAU VMAF VORBIS VPX VULKAN X264 X265 XCB XVID
52		51
53	# i386 is too register-starved for LTO (PR257124)	52	# i386 is too register-starved for LTO (PR257124)
54	OPTIONS_EXCLUDE_i386= LTO	53	OPTIONS_EXCLUDE_i386= LTO
Lines 127-136 RIST_DESC= Reliable Internet Stream Transport protocol via librist Link Here
127	RUBBERBAND_DESC=Time-stretching and pitch-shifting with librubberband	126	RUBBERBAND_DESC=Time-stretching and pitch-shifting with librubberband
128	RTCPU_DESC= Detect CPU capabilities at runtime	127	RTCPU_DESC= Detect CPU capabilities at runtime
129	RTMP_DESC= RTMP(T)E protocol support	128	RTMP_DESC= RTMP(T)E protocol support
		129	SHADERC_DESC= GLSL->SPIRV compilation via libshaderc
130	SRT_DESC= Haivision SRT protocol via libsrt	130	SRT_DESC= Haivision SRT protocol via libsrt
131	SVTAV1_DESC= AV1 encoding via SVT-AV1	131	SVTAV1_DESC= AV1 encoding via SVT-AV1
132	SVTHEVC_DESC= HEVC encoding via SVT-HEVC	132	SVTHEVC_DESC= HEVC encoding via SVT-HEVC
133	SVTVP9_DESC= VP9 encoding via SVT-VP9	133	SVTVP9_DESC= VP9 encoding via SVT-VP9
		134	LIBPLACEBO_DESC=GPU filters from libplacebo
134	LIBRTMP_DESC= ${RTMP_DESC} via librtmp	135	LIBRTMP_DESC= ${RTMP_DESC} via librtmp
135	TENSORFLOW_DESC=TensorFlow as a DNN module backend for DNN based filters like sr	136	TENSORFLOW_DESC=TensorFlow as a DNN module backend for DNN based filters like sr
136	TESSERACT_DESC= Optical Character Recognition via Tesseract	137	TESSERACT_DESC= Optical Character Recognition via Tesseract
Lines 310-315 LENSFUN_CONFIGURE_ENABLE= liblensfun Link Here
310	LIBBLURAY_LIB_DEPENDS= libbluray.so:multimedia/libbluray	311	LIBBLURAY_LIB_DEPENDS= libbluray.so:multimedia/libbluray
311	LIBBLURAY_CONFIGURE_ENABLE= libbluray	312	LIBBLURAY_CONFIGURE_ENABLE= libbluray
312		313
		314	# libplacebo
		315	LIBPLACEBO_LIB_DEPENDS= libplacebo.so:graphics/libplacebo
		316	LIBPLACEBO_CONFIGURE_ENABLE= libplacebo
		317
313	# librsvg	318	# librsvg
314	LIBRSVG2_USES= gnome	319	LIBRSVG2_USES= gnome
315	LIBRSVG2_USE= GNOME=cairo,librsvg2	320	LIBRSVG2_USE= GNOME=cairo,librsvg2
Lines 429-434 SDL_USES= sdl Link Here
429	SDL_USE= SDL=sdl2	434	SDL_USE= SDL=sdl2
430	SDL_CONFIGURE_ENABLE= sdl2	435	SDL_CONFIGURE_ENABLE= sdl2
431		436
		437	# shaderc
		438	SHADERC_LIB_DEPENDS= libshaderc_shared.so:graphics/shaderc
		439	SHADERC_CONFIGURE_ENABLE= libshaderc
		440	SHADERC_PREVENTS= GLSLANG
		441
432	# smbclient	442	# smbclient
433	SMB_USES= samba:lib	443	SMB_USES= samba:lib
434	SMB_CONFIGURE_ENABLE= libsmbclient	444	SMB_CONFIGURE_ENABLE= libsmbclient
Lines 540-546 VPX_CONFIGURE_ENABLE= libvpx Link Here
540	VULKAN_BUILD_DEPENDS= vulkan-headers>0:graphics/vulkan-headers	550	VULKAN_BUILD_DEPENDS= vulkan-headers>0:graphics/vulkan-headers
541	VULKAN_LIB_DEPENDS= libvulkan.so:graphics/vulkan-loader	551	VULKAN_LIB_DEPENDS= libvulkan.so:graphics/vulkan-loader
542	VULKAN_CONFIGURE_ENABLE= vulkan	552	VULKAN_CONFIGURE_ENABLE= vulkan
543	VULKAN_IMPLIES= GLSLANG	553	VULKAN_IMPLIES= ${"${PORT_OPTIONS:MGLSLANG}":?GLSLANG:SHADERC}
544		554
545	# webp	555	# webp
546	WEBP_LIB_DEPENDS= libwebp.so:graphics/webp	556	WEBP_LIB_DEPENDS= libwebp.so:graphics/webp
Lines 613-619 CONFIGURE_ARGS+=--prefix="${PREFIX}" \ Link Here
613	--enable-shared \	623	--enable-shared \
614	--enable-pic \	624	--enable-pic \
615	--enable-gpl \	625	--enable-gpl \
616	--enable-avresample \
617	--cc="${CC}" \	626	--cc="${CC}" \
618	--cxx="${CXX}"	627	--cxx="${CXX}"
619		628

Lines 12-17 include/libavcodec/codec_desc.h Link Here

(-)b/multimedia/ffmpeg/pkg-plist (-23 / +18 lines)
12	include/libavcodec/codec_id.h	12	include/libavcodec/codec_id.h
13	include/libavcodec/codec_par.h	13	include/libavcodec/codec_par.h
14	include/libavcodec/d3d11va.h	14	include/libavcodec/d3d11va.h
		15	include/libavcodec/defs.h
15	include/libavcodec/dirac.h	16	include/libavcodec/dirac.h
16	include/libavcodec/dv_profile.h	17	include/libavcodec/dv_profile.h
17	include/libavcodec/dxva2.h	18	include/libavcodec/dxva2.h
Lines 19-25 include/libavcodec/jni.h Link Here
19	include/libavcodec/mediacodec.h	20	include/libavcodec/mediacodec.h
20	include/libavcodec/packet.h	21	include/libavcodec/packet.h
21	include/libavcodec/qsv.h	22	include/libavcodec/qsv.h
22	include/libavcodec/vaapi.h
23	include/libavcodec/vdpau.h	23	include/libavcodec/vdpau.h
24	include/libavcodec/version.h	24	include/libavcodec/version.h
25	include/libavcodec/videotoolbox.h	25	include/libavcodec/videotoolbox.h
Lines 34-41 include/libavfilter/version.h Link Here
34	include/libavformat/avformat.h	34	include/libavformat/avformat.h
35	include/libavformat/avio.h	35	include/libavformat/avio.h
36	include/libavformat/version.h	36	include/libavformat/version.h
37	include/libavresample/avresample.h
38	include/libavresample/version.h
39	include/libavutil/adler32.h	37	include/libavutil/adler32.h
40	include/libavutil/aes.h	38	include/libavutil/aes.h
41	include/libavutil/aes_ctr.h	39	include/libavutil/aes_ctr.h
Lines 57-62 include/libavutil/common.h Link Here
57	include/libavutil/cpu.h	55	include/libavutil/cpu.h
58	include/libavutil/crc.h	56	include/libavutil/crc.h
59	include/libavutil/des.h	57	include/libavutil/des.h
		58	include/libavutil/detection_bbox.h
60	include/libavutil/dict.h	59	include/libavutil/dict.h
61	include/libavutil/display.h	60	include/libavutil/display.h
62	include/libavutil/dovi_meta.h	61	include/libavutil/dovi_meta.h
Lines 130-166 include/libswresample/version.h Link Here
130	include/libswscale/swscale.h	129	include/libswscale/swscale.h
131	include/libswscale/version.h	130	include/libswscale/version.h
132	lib/libavcodec.so	131	lib/libavcodec.so
133	lib/libavcodec.so.58	132	lib/libavcodec.so.59
134	lib/libavcodec.so.58.134.100	133	lib/libavcodec.so.59.18.100
135	lib/libavdevice.so	134	lib/libavdevice.so
136	lib/libavdevice.so.58	135	lib/libavdevice.so.59
137	lib/libavdevice.so.58.13.100	136	lib/libavdevice.so.59.4.100
138	lib/libavfilter.so	137	lib/libavfilter.so
139	lib/libavfilter.so.7	138	lib/libavfilter.so.8
140	lib/libavfilter.so.7.110.100	139	lib/libavfilter.so.8.24.100
141	lib/libavformat.so	140	lib/libavformat.so
142	lib/libavformat.so.58	141	lib/libavformat.so.59
143	lib/libavformat.so.58.76.100	142	lib/libavformat.so.59.16.100
144	lib/libavresample.so
145	lib/libavresample.so.4
146	lib/libavresample.so.4.0.0
147	lib/libavutil.so	143	lib/libavutil.so
148	lib/libavutil.so.56	144	lib/libavutil.so.57
149	lib/libavutil.so.56.70.100	145	lib/libavutil.so.57.17.100
150	lib/libpostproc.so	146	lib/libpostproc.so
151	lib/libpostproc.so.55	147	lib/libpostproc.so.56
152	lib/libpostproc.so.55.9.100	148	lib/libpostproc.so.56.3.100
153	lib/libswresample.so	149	lib/libswresample.so
154	lib/libswresample.so.3	150	lib/libswresample.so.4
155	lib/libswresample.so.3.9.100	151	lib/libswresample.so.4.3.100
156	lib/libswscale.so	152	lib/libswscale.so
157	lib/libswscale.so.5	153	lib/libswscale.so.6
158	lib/libswscale.so.5.9.100	154	lib/libswscale.so.6.4.100
159	libdata/pkgconfig/libavcodec.pc	155	libdata/pkgconfig/libavcodec.pc
160	libdata/pkgconfig/libavdevice.pc	156	libdata/pkgconfig/libavdevice.pc
161	libdata/pkgconfig/libavfilter.pc	157	libdata/pkgconfig/libavfilter.pc
162	libdata/pkgconfig/libavformat.pc	158	libdata/pkgconfig/libavformat.pc
163	libdata/pkgconfig/libavresample.pc
164	libdata/pkgconfig/libavutil.pc	159	libdata/pkgconfig/libavutil.pc
165	libdata/pkgconfig/libpostproc.pc	160	libdata/pkgconfig/libpostproc.pc
166	libdata/pkgconfig/libswresample.pc	161	libdata/pkgconfig/libswresample.pc