From patchwork Tue Aug 7 22:37:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kyle Swanson X-Patchwork-Id: 9933 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:104:0:0:0:0:0 with SMTP id c4-v6csp151793jad; Tue, 7 Aug 2018 16:03:06 -0700 (PDT) X-Google-Smtp-Source: AA+uWPxLRHIgN58oth1Cdlbnokmop3BZD8eGeg8tz7BZjxc/dBpwlZQMiExo3tqkSp7TQf6JuS0w X-Received: by 2002:adf:a197:: with SMTP id u23-v6mr271019wru.50.1533682986036; Tue, 07 Aug 2018 16:03:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533682986; cv=none; d=google.com; s=arc-20160816; b=otEYBVGQNiaxdIxtwMNqQdiMkdZGn/Yx5LvZXY0LOlftK8JEwBIXvIMkL2X/eIVH9O hdhLmRRRlxMC6geqUwvh8kPskl/jJfgEJlUB4CNrDdyacTEgJPYyb7MghzlNglZl3145 WuJtlr/SugmlcHfF8sYRzIimyqpwAxyzkFla95m0DQJB0b/t0/h/3Nmm5A5u5tRnoX86 UKMOUG7k9zrsjsmb1Hu+xyUThICxxST4SOaQjNNXRKhjuSu2D2JxsDhGKevuuoWdxlUi jrGjGb9SHcz+7O5HcpPkXghM3i41uW7QnPhjnmEI6bHcyZQyE7yqtPKMJwhIKra9l3R1 siSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=XOawP2JsYWLQ0/B9MwxCgjGpoeP3Lr6zbo4MzeRPvSM=; b=mZWqzSJu5vZOjJXwjSkJlTcJ1f03igKO5pKPtszO7LgEAiQR968+6l+i/kOnSfTeuW IqAM7ecx8ojAleKjl3bzKZs0eDaM6SLHf7G9GNCGxuZP+/S0+msoGA+N9j35VL4qCATi QQXLU2AKRHdsXomlF7LRm5HrhZrT+Wu7Sd1RCO9iBRexQlmbUTsY1Sta0MW6WkeBQARP xkb6VKLodPp9S761X7EFeUVpmHIxTJv9yFmXDfD139G8mn7yzVzW2kl3kthQMst4psMq ziL2RLM3h0N+98/dH3G5LAWcltFgpXN0CpNM3fsJgv9YiYrbTd0ax4XibqYhTmPkGrqA 8Vwg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@ylo-ph.20150623.gappssmtp.com header.s=20150623 header.b=zYUTRgvo; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id h1-v6si1821730wrw.378.2018.08.07.16.03.05; Tue, 07 Aug 2018 16:03:05 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@ylo-ph.20150623.gappssmtp.com header.s=20150623 header.b=zYUTRgvo; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A821768A1DE; Wed, 8 Aug 2018 02:02:43 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f196.google.com (mail-pf1-f196.google.com [209.85.210.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 008A9689F41 for ; Wed, 8 Aug 2018 02:02:41 +0300 (EEST) Received: by mail-pf1-f196.google.com with SMTP id d4-v6so157335pfn.0 for ; Tue, 07 Aug 2018 16:03:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ylo-ph.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=G8GixLX0c4PKts29I14IYfkAaa6A1cHYsKWGf47Nrxw=; b=zYUTRgvoFNUZrhr9OF3AlbHoirtW8eWvhQ0zTil+YpaE16sS04ndy2rXKeDGeZMzGj yjzgN0NyM/26WEap1aQn3i/YSlnZsSXhCJPmyneNJEG67Ovit4NoDRFF4pWLl0qy1KHn db6GvzdmFK6Xwjli7CxkrG1xIG3ahc61OCcq7NofInsBh+QdRK7NYNMtdS6HZ3rACqgK LQ06heDvKO6YlQHo7GBBG5ozTsTYGhbCcOTXi4lYTPRRj7aGA3RPFxOyaad1yVmGEjHP A+Gfjumgqlz5uSpnsIWgS0IWPY3g9tsWiHJwANfD1tDfp1AM8BRme3RaRNZJmi04E/0U rrpQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=G8GixLX0c4PKts29I14IYfkAaa6A1cHYsKWGf47Nrxw=; b=i7esF0c5Rpf1cbncPtSCzBOU4gf+U8dbhydj8EyH0VwFaLnQvCiJcskRUYV5+lFQRg fHiKwzWrpgzOYPF+F5fkgkYOng0s689J1jqQVXiNArNlX8l/rXku/jtdv2uof345nQ90 bpcu2R2AOIjdUr1SmycbIwV6Jn41mPSmTKflv6oP2lLRPHOCnxo2Kl89zUgw9aBKoje5 NwdT116/2eJ60PQ3wwKfA5j269ikt/dsjX4FCdslfiq7XB5PWtoVQ0tqpNBQvyKCGlE9 4HTiLXfHi7B+lofeGstxX6/pef/f6Dz1kH3YNGqiZ6Ba7Xp6Acm6S3aStfrqNLzTCq5+ XDVA== X-Gm-Message-State: AOUpUlFLorvjYTscIwdbrL/0Ptt2gvte8G3z3BEfkJV8PveiRmMU40Xf /rHB7sD0jej/BRX8WyqkbVOVCo4LtNU= X-Received: by 2002:a62:4fd9:: with SMTP id f86-v6mr269136pfj.110.1533681469348; Tue, 07 Aug 2018 15:37:49 -0700 (PDT) Received: from nfml-kswansonY8H.netflix.com ([2607:fb10:7021:1::3d8f]) by smtp.gmail.com with ESMTPSA id y86-v6sm4117868pfk.84.2018.08.07.15.37.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 07 Aug 2018 15:37:48 -0700 (PDT) From: Kyle Swanson To: ffmpeg-devel@ffmpeg.org Date: Tue, 7 Aug 2018 15:37:42 -0700 Message-Id: <20180807223742.96627-1-k@ylo.ph> X-Mailer: git-send-email 2.18.0 Subject: [FFmpeg-devel] [PATCH] lavfi/vf_libvmaf: update to use libvmaf v1.3.9 X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Kyle Swanson MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Kyle Swanson Signed-off-by: Kyle Swanson --- configure | 2 +- libavfilter/vf_libvmaf.c | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 15a58935de..e718c1531c 100755 --- a/configure +++ b/configure @@ -6089,7 +6089,7 @@ enabled libtwolame && require libtwolame twolame.h twolame_init -ltwolame die "ERROR: libtwolame must be installed and version must be >= 0.3.10"; } 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 libvmaf && require_pkg_config libvmaf "libvmaf >= 0.6.2" libvmaf.h compute_vmaf +enabled libvmaf && require_pkg_config libvmaf "libvmaf >= 1.3.9" libvmaf.h compute_vmaf 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 diff --git a/libavfilter/vf_libvmaf.c b/libavfilter/vf_libvmaf.c index 5d47a74375..249e50c720 100644 --- a/libavfilter/vf_libvmaf.c +++ b/libavfilter/vf_libvmaf.c @@ -62,6 +62,9 @@ typedef struct LIBVMAFContext { int ssim; int ms_ssim; char *pool; + int n_threads; + int n_subsample; + int enable_conf_interval; int error; } LIBVMAFContext; @@ -78,6 +81,9 @@ static const AVOption libvmaf_options[] = { {"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}, {"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}, { NULL } }; @@ -166,7 +172,8 @@ static void compute_vmaf_score(LIBVMAFContext *s) read_frame, s, s->model_path, s->log_path, s->log_fmt, 0, 0, s->enable_transform, s->phone_model, s->psnr, s->ssim, - s->ms_ssim, s->pool); + s->ms_ssim, s->pool, + s->n_threads, s->n_subsample, s->enable_conf_interval); } static void *call_vmaf(void *ctx)