From patchwork Sun Sep 29 13:25:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 15385 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 80B3D44974B for ; Sun, 29 Sep 2019 16:32:35 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 60F0B688150; Sun, 29 Sep 2019 16:32:35 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f194.google.com (mail-pg1-f194.google.com [209.85.215.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C3EBB687FE2 for ; Sun, 29 Sep 2019 16:32:28 +0300 (EEST) Received: by mail-pg1-f194.google.com with SMTP id i30so5841557pgl.0 for ; Sun, 29 Sep 2019 06:32:28 -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=EgTWAIPp6QaJUuAZ8Tsl17ibGbzb/Kf4dCAy782nWw8=; b=EJq+lw5kYqqFcELTIQUthhYGqdv7l9ck1pcbimmZsCLsTyHEDlCEBPgx9eW/bU9loz U0wH1l2UVapZwfbDjs3eFttb7qn2dQyfzQ5BmqvFrw1PqbNzUGWtC4K8S4JJMyz9NJkZ TVCWmLCLeEic1ck/IVQVV0tuMXeKrbE68gVrcA0LktQrkoLG+CbK6kmehKoD7lXl8smm pD2E1HZdtDybq2dfkBYLvEzZE34w3NTLyTn36Vimxr8b6flzbQe+NOmN+mn6Uffbejks m8Hvx3yHJDKXYjCrFUeEe0eU/baJANO82cY8SAJyM4+lPDWl7olNvNqHEw8QQ0BK5d9L staA== 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=EgTWAIPp6QaJUuAZ8Tsl17ibGbzb/Kf4dCAy782nWw8=; b=MNgT7E7/3WCxA4UVLutRHQL4Dycywb1BlW30vxqA+BILfhZ1ZIljlVNGT/7AYPXVIT w+PXCzbkBM8sWrpcDsfYpl/KLJPkLZauI0iqNMqTiS6mfI6Kpn8dI2/4BkLsKJ15vDvT /IMiL/qD73Or0EAC8aYTkhvKxaHarZVVsKXVfrkr7hgvkc2Y/f4KCPn2fhtsmYlTMU8V ryFN2AH3ppng8eIsqhRjmraW46R2CbtyKKBpG7RSIJ3FsyF6HXIhF1i2b9zhz8SuKQmd EGNwvnDBtzqxEbawX1cKuUPw/w/8zMB485yv7FZNBEQFAi2NzSiKhLfdTH04YTU9Z7LN eHTg== X-Gm-Message-State: APjAAAVVRO1biVrEFitwY0q3sQCC4UvEjxp5g/c6tTVPxZr8Mq/+E4u1 diDcGvy0ja3LN5I1/6olneWN9St0 X-Google-Smtp-Source: APXvYqwqTCOtlkvVd1j1r6p7r5rGiv7AHbgrIfd+CbPNGww4SG0urbEnRXNdiJHwD7zCjL5PydzoXA== X-Received: by 2002:aa7:955d:: with SMTP id w29mr15876366pfq.60.1569763526074; Sun, 29 Sep 2019 06:25:26 -0700 (PDT) Received: from vpn.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id c8sm13406060pga.42.2019.09.29.06.25.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 29 Sep 2019 06:25:25 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Sun, 29 Sep 2019 21:25:13 +0800 Message-Id: <20190929132515.4093-2-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20190929132515.4093-1-lance.lmwang@gmail.com> References: <20190924113200.14115-1-lance.lmwang@gmail.com> <20190929132515.4093-1-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v2 2/3] 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 06e463e4d7..d7ae1ae850 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;