From patchwork Tue Oct 8 09:08:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 15559 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id B7A1B44A919 for ; Tue, 8 Oct 2019 12:08:21 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9CF3F687FE7; Tue, 8 Oct 2019 12:08:21 +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 9AE3C687F39 for ; Tue, 8 Oct 2019 12:08:15 +0300 (EEST) Received: by mail-pf1-f196.google.com with SMTP id q21so10392460pfn.11 for ; Tue, 08 Oct 2019 02:08:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=tep8FtER7GrZgtROjumkbJzJyYf5XWRainKevOyS84M=; b=PTQYjZCkOoGJhPG9yhdmIL8BDKlBj09EeAXtmnS0HYKbpphU2JCK+KYJXNTedsx09j 39zW8bzB1+frxAv+cwmqG7Cv57KzkDaOgnzfamLkWuYAzVDSKs+x66t0vpaJI2pxhG6N 0RcU0/uUYqzl2xsZikWtlqCwDEDQRBk9D737vi6Y7rdYI2UPToKxS3Ah15FIEvghU+30 Rerlcz3Y1JLNEBaKM4nwcZA4/gTIm47pPwXKQmZdeLoCV2Lf0QLgHgflcVbuvUaa5t8w xQqvvXIh5zrfFwO6NVja8AoKOOBOJJ7N2QZXLeheL2TvlLcyrX9U1neaLLdpKcOd2JEa 0g7A== 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:in-reply-to :references; bh=tep8FtER7GrZgtROjumkbJzJyYf5XWRainKevOyS84M=; b=mA/Pfsh+bdhelPtDXS+fJJLte0nb+jLnVerAc2eu7ouxe86q/16lbGb95uDGfoxry3 PVCWviJ/URhfOqrJveio1j19x1Sct4YaAcSTeDshsCs9e1APvwFdVQHwdEG1M14NSbyY UTpIIN4XHuRIiHukVAQuLG8c/rQjQvahQ017gO/V31dwJORcem31ug2Aw1hFNe0SsGG0 akDqWAvU0KaJp1KL3TapQOzkPNBh4JAhKV/MOzqCSLZv/KkuJWyCaWuUCvLb+BjMR9Xg Syxa8uvBqlb/NwrbZrZuiPcZBFXiEp/1IxZZANaa2OM2dYl2SqPjCdENpoOtDHbPdN+U /WXg== X-Gm-Message-State: APjAAAXPE/k77oqDNu3/gG5JZjleyZt+djnGe0a/mkq0n78Zes6cEILH cHSqHXPggHsqPcOA9jHBxLQwJgln X-Google-Smtp-Source: APXvYqxYs2fGwE16W0XXPlGMU0DqmZm9z+bnyoTb2VwUeTlNR2uINQ0DrsktaOG93t2YoeVP+LGWhg== X-Received: by 2002:a63:d250:: with SMTP id t16mr7505334pgi.278.1570525693661; Tue, 08 Oct 2019 02:08:13 -0700 (PDT) Received: from vpn.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id l24sm17045699pff.151.2019.10.08.02.08.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 08 Oct 2019 02:08:13 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 8 Oct 2019 17:08:01 +0800 Message-Id: <20191008090803.20295-2-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20191008090803.20295-1-lance.lmwang@gmail.com> References: <20190929132515.4093-1-lance.lmwang@gmail.com> <20191008090803.20295-1-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v3 2/4] avfilter/vf_framerate: if metadata lavfi.scd.mafd exists, we'll use it first 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang Signed-off-by: Limin Wang --- libavfilter/vf_framerate.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/libavfilter/vf_framerate.c b/libavfilter/vf_framerate.c index 6c8d01c94b..8d16998457 100644 --- a/libavfilter/vf_framerate.c +++ b/libavfilter/vf_framerate.c @@ -71,13 +71,20 @@ static double get_scene_score(AVFilterContext *ctx, AVFrame *crnt, AVFrame *next if (crnt->height == next->height && crnt->width == next->width) { + AVDictionaryEntry *e_mafd = NULL; uint64_t sad; - double mafd, diff; + double mafd = HUGE_VAL, diff; + char *tail = NULL; ff_dlog(ctx, "get_scene_score() process\n"); - s->sad(crnt->data[0], crnt->linesize[0], next->data[0], next->linesize[0], crnt->width, crnt->height, &sad); - emms_c(); - mafd = (double)sad * 100.0 / (crnt->width * crnt->height) / (1 << s->bitdepth); + e_mafd = av_dict_get(next->metadata, "lavfi.scd.mafd", NULL, AV_DICT_MATCH_CASE); + if (e_mafd) + mafd = strtod(e_mafd->value, &tail); + if (*tail || mafd == HUGE_VAL) { + s->sad(crnt->data[0], crnt->linesize[0], next->data[0], next->linesize[0], crnt->width, crnt->height, &sad); + emms_c(); + mafd = (double)sad * 100.0 / (crnt->width * crnt->height) / (1 << s->bitdepth); + } diff = fabs(mafd - s->prev_mafd); ret = av_clipf(FFMIN(mafd, diff), 0, 100.0); s->prev_mafd = mafd;