From patchwork Thu May 14 10:44:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 19680 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 444A244990A for ; Thu, 14 May 2020 13:44:33 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3079C680658; Thu, 14 May 2020 13:44:33 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f196.google.com (mail-pg1-f196.google.com [209.85.215.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 067B6680647 for ; Thu, 14 May 2020 13:44:26 +0300 (EEST) Received: by mail-pg1-f196.google.com with SMTP id u35so1092676pgk.6 for ; Thu, 14 May 2020 03:44:25 -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=ZkNOVDA+Ineacvz3h9YpJFk9mSJ/pTWIbFcDluLnM+8=; b=LubXM3NREYTdmzKtkxatVNF+5BjlB79McMBsN7TFJHa1KaAkAl9xGEiV8rHnr7z+JI zJORhdxduSL/eTSIITV26m/X58GhyPhCJENbGK00pILfNMA2+kUHp/1cqGCp17TeWHZZ JO38y7W/vxWRw0AToh90fzS7qpAHke7gWEdHLEMwQVuTXtWKNq6QomBwO4U5rYrSdj4G tNuLfWNcqCgPll5MFNFJmNrg/DkgUfSJCCXdkGN9no7uIiKa/2SCyxm9Z12Wobd/AnAR l6B0nmm9Kzcce1g/1Y6Twr7B2SGBKJ1xlFkf7yWWCDRxo8wKTctdxCcg5FAnPn4BrFwn zltw== 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=ZkNOVDA+Ineacvz3h9YpJFk9mSJ/pTWIbFcDluLnM+8=; b=Z7f+8uUmCci4PHJVXAW2Qg2IwLgf4m1eTiu0nfANSF1gPOZxbsfb6bb0rVSdPLdWg3 DwSOiWz20OfyrOC+QbwHqOoDzqZJR0RdDgVZb4w3K3UJDO60wro17APSM7QcMCEgKpYP mKN90PXVH0aYnAy8RvrQRvDUGS3ENp9m1YCAPrvhRc/go64BCF8A7o0eDe+wqE3MXERn gyzEdo/GH4DvGcI9fRUQ4N0ntHioEAK6UwgVl+8L1+bWaFYJuf5mg4PHWhtTKM9uoazN fEPmL2C3vDYD/aHdtdgus/FMiyCUujFn+2PWFzuQY9oOL5sOZqyI+xbPeuGzv3qw/T+0 +0sg== X-Gm-Message-State: AOAM53368/ncR1cQdaJYD3Tv+HivsZoGMpW2xdsdnoGFTr1w64jYbmdu sKGr6Bzy+hPRyYnvvZVZM0Ykwkx6 X-Google-Smtp-Source: ABdhPJy5FPJ4zL11FOQqj1Tfv4eLuGJvKhJUbOHL/zY9ecqpfxeUPZaoUxREABXdANLhJ63QA7umVw== X-Received: by 2002:a63:f447:: with SMTP id p7mr3431488pgk.111.1589453064105; Thu, 14 May 2020 03:44:24 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id bj6sm13227367pjb.47.2020.05.14.03.44.22 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 May 2020 03:44:23 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 14 May 2020 18:44:11 +0800 Message-Id: <1589453053-8013-2-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1589453053-8013-1-git-send-email-lance.lmwang@gmail.com> References: <20190929132515.4093-1-lance.lmwang@gmail.com> <1589453053-8013-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v6 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 Reviewed-by: Paul B Mahol 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 6c8d01c..8d16998 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;