From patchwork Thu May 14 10:44:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 19681 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 5766444990A for ; Thu, 14 May 2020 13:44:36 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4035C689AE3; Thu, 14 May 2020 13:44:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f195.google.com (mail-pf1-f195.google.com [209.85.210.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AD68F680658 for ; Thu, 14 May 2020 13:44:27 +0300 (EEST) Received: by mail-pf1-f195.google.com with SMTP id d184so1153957pfd.4 for ; Thu, 14 May 2020 03:44:27 -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=dyZBuwXWI14LxHUdTUly14317ddPHo3/xRghV6DImtM=; b=XaqOOV5nqwmxvflU2Sx9ysY6PJ8bFhnMndCLbMoaAdzFFiRRARUu8LfbDSReJNX2f8 UYaRzDJrfpUj8HlacHWW9ksLeSOQ3Rjd4442w8lG4Cr6j4hkBe9ZZK5ugW2nNtBeBnIa CSMvD8D7szIMwqdtbCSD3A0XTMjnMdmJpFRCMy55SD9k/H9bz6GAKFyWw26o0zkbTK3K 1bGjMDoaHfzkWEGMoUpL031f2ANiODbBoCrSkIOOLvLyKa6j6nczu6obvOkp5PHrr7ss UojjejodGFbOVxGrBQu1I0kiaroFTzIY0KUB7SYpSHebLnLhZkoDBbn+D6Xpvd/PwFIx Hdsw== 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=dyZBuwXWI14LxHUdTUly14317ddPHo3/xRghV6DImtM=; b=Q8kNGTo00BlF14dq3CRaOWuhemPfW4qI268VjD4ywwZVgSI7DvL/4+5gLcOSc0JPqp OHwK7v/IT2oQNWaTa9EEq2fbCE1jNgjFO47Us9TcyD0Qv2wVGqL6gDgBJFV8uSZJEqtv aH42XreurXICQXlEKSlOqAK1RnOGW8clm5KMPvXCyrV6gqJea+/APScud50EGkBSU3UY yPp5ZilP611elD+cb42dVR+Du+FKmgWPT1Mu2gj7t1njoodbnUUtUHaXF+BeMndYpCBp UavOvgb/1EPy88cdczpKr42+pXPeylushNg5e/TApOOBx00AOSi98drb0/SJgtb+voBV mm4g== X-Gm-Message-State: AOAM531Gsbkac7gBlsk2EziJ8CeAMCt3NEYK8d+Pf3If9yEnYvc1CpLj jMzaVVc5rj7MRQNpYVtyRNiBgREJ X-Google-Smtp-Source: ABdhPJzMQVjTGZ5F/5UgcUigcD5GXEuFAf1IzQDHehvlbcq4ioI4oykGdjr/dbf+NdpM9cCpTbYy3g== X-Received: by 2002:a63:5717:: with SMTP id l23mr3371839pgb.217.1589453065708; Thu, 14 May 2020 03:44:25 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id bj6sm13227367pjb.47.2020.05.14.03.44.24 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 May 2020 03:44:25 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 14 May 2020 18:44:12 +0800 Message-Id: <1589453053-8013-3-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 3/4] avfilter/vf_minterpolate: 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_minterpolate.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/libavfilter/vf_minterpolate.c b/libavfilter/vf_minterpolate.c index b0bb238..db3d7d4 100644 --- a/libavfilter/vf_minterpolate.c +++ b/libavfilter/vf_minterpolate.c @@ -832,11 +832,19 @@ static int detect_scene_change(MIContext *mi_ctx) ptrdiff_t linesize2 = mi_ctx->frames[2].avf->linesize[0]; if (mi_ctx->scd_method == SCD_METHOD_FDIFF) { - double ret = 0, mafd, diff; + double ret = 0, mafd = HUGE_VAL, diff; uint64_t sad; - mi_ctx->sad(p1, linesize1, p2, linesize2, me_ctx->width, me_ctx->height, &sad); - emms_c(); - mafd = (double) sad / (me_ctx->height * me_ctx->width * 3); + AVDictionaryEntry *e_mafd = NULL; + char *tail = NULL; + + e_mafd = av_dict_get(mi_ctx->frames[2].avf->metadata, "lavfi.scd.mafd", NULL, AV_DICT_MATCH_CASE); + if (e_mafd) + mafd = strtod(e_mafd->value, &tail); + if (*tail || mafd == HUGE_VAL) { + mi_ctx->sad(p1, linesize1, p2, linesize2, me_ctx->width, me_ctx->height, &sad); + emms_c(); + mafd = (double) sad / (me_ctx->height * me_ctx->width * 3); + } diff = fabs(mafd - mi_ctx->prev_mafd); ret = av_clipf(FFMIN(mafd, diff), 0, 100.0); mi_ctx->prev_mafd = mafd;