From patchwork Tue Oct 8 11:01:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 15563 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 32916448633 for ; Tue, 8 Oct 2019 14:01:50 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1A099687FF0; Tue, 8 Oct 2019 14:01:50 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f194.google.com (mail-pl1-f194.google.com [209.85.214.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D12D2688035 for ; Tue, 8 Oct 2019 14:01:42 +0300 (EEST) Received: by mail-pl1-f194.google.com with SMTP id f21so8288491plj.10 for ; Tue, 08 Oct 2019 04:01:42 -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=NiRzzu0RkNvaQKn6Du2Jk/ycYH4cTy7frBeOYydiH7w=; b=OusuOjz6bG2H8UELzYY4b1fDB3m0BF7805yPKnKeluwK1qjQE6F6JDJDMVnTsoYOWj vGYF90n8J4UCRRO13s2qnRZFMrOfjGvRdQ0Ypb+/uMg89ZUX3D1JGmdQo1THpSKlmmII pHlbuzql5BhrhNxl+1I1/jvZahPvR+tZukL0OhOb54XVJK3ZMZUK+I0BRsxy00ZEUlo8 Tk1wY1Anh+Jc5Rze9OpabUUOorDdTgGOekbjaR783B+Co2iBwTMsDzmmbqPdIL2OJ/1L Vu0/IAe3tE/Gv7QBEU9RocEdJJji32eAUQrEYAJXKGrmrWCkiHfSfF1/LK/Tf5+hI32l 36ng== 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=NiRzzu0RkNvaQKn6Du2Jk/ycYH4cTy7frBeOYydiH7w=; b=th5Dsb1VouNKFYfNmnN8DNLG/51ioRtCPFAdPeB7cm9Z6piPjflWTrpS7uN1KRaxY6 +QF0c/IcDvfaRenb8mqDTuNUIplhZ6yie2tHM0uN5knpgGr/EMf8mPA0yZn8vOQCVIVJ 8HUKb1oLm3MPW2DuyMUPD4B7bFdiIvetWT6OTj3/msBUx7BZkmfH4vWHrVCy1t9IT8lC 1q3qz1DJwrB9t5V06kpd4P9wjQ3H6TkWKRH5ZHNgUA0MNRJ4wgrRjN+WqzqNCSfd/GEU WrE2zwlIlE3ZBY6JwFk5UGwisXuM2hch5GAjRGxlVbVAIRoXm8H+uyF5kgI3hbAsiqz2 G2Sg== X-Gm-Message-State: APjAAAWQXS/NcXVW7PK25on9e1VOYOEZqChfl5/prg7IJBFi3N5K6fQd fbyP38bAl7E0ObYT+Rm4ivUxMLUx X-Google-Smtp-Source: APXvYqzZIEIDpntswrBa35mZ3Y4s7yLU67CI7a6BzgJmugBbAB0D/TFxEpEMXOSphQEeSzmg468cig== X-Received: by 2002:a17:902:a586:: with SMTP id az6mr35124843plb.12.1570532500871; Tue, 08 Oct 2019 04:01:40 -0700 (PDT) Received: from vpn.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id e10sm21113851pfh.77.2019.10.08.04.01.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 08 Oct 2019 04:01:40 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 8 Oct 2019 19:01:30 +0800 Message-Id: <20191008110132.20806-2-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20191008110132.20806-1-lance.lmwang@gmail.com> References: <20190929132515.4093-1-lance.lmwang@gmail.com> <20191008110132.20806-1-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v4 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 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;