From patchwork Tue Oct 8 11:01:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 15564 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 080B2448633 for ; Tue, 8 Oct 2019 14:01:52 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E4DA5688035; Tue, 8 Oct 2019 14:01:51 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f193.google.com (mail-pf1-f193.google.com [209.85.210.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 85DAC687FD4 for ; Tue, 8 Oct 2019 14:01:45 +0300 (EEST) Received: by mail-pf1-f193.google.com with SMTP id y5so10578624pfo.4 for ; Tue, 08 Oct 2019 04:01:45 -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=TrZwHqzxS2hWa6E7vcxoM3xg9SyRYQWREVuSOSLelsc=; b=YoAaG1mr5F+NQsAkHQ+pD9/fQXn0UpEg7on8uMAqpvjihYSIOW4Q5ccyOofFn3SL8b aDokgKj2pnHZObcEJ2LnYb3YOcgwuOXiAmaNaVLiWI2U4JU4ngp8Zfr0+uDjU6CDHUvZ 4KBdYIk6TmkDKGD3XuOIUOzZRCj5MtNOb4QsT0ZX7E6OxLgohys6GdLygB7+Hr2nAC6W kfQf8S7tArUTa8i8Eb9fjTa6lRWYTJyn8D1NWRB6ZUBhNNdQER+HSul58hvXcYejgtpz 8P0EYTCFsCka1rc9Y41XnY0pE+b8azPsV3j2pn21NRGwS+QTzXZ3IRR8cTsXNfyiK7lE 2q3w== 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=TrZwHqzxS2hWa6E7vcxoM3xg9SyRYQWREVuSOSLelsc=; b=fakV+SctUwWCF9u1E7dlxkaXVA+dsxOdQVt/L/pto7y3KqV7F2/jbd0+OxYRH6BwyB MndKLJnYYD9Xirg7zQYc5nTR0zAgh8njiar/rSfDN4nukI4nmgNpJl5d5/tkwl/A2pmV RPf+RjgQIfiNdPsWqOvJqT20DlOgr4pAWwfTjB4YTg7lSMHSYffgwGey76nQvAUfKO7U ub4HStD1Lx5FZdGxLHiMszqkGBLNqe93h4qCi4vtEarT260Q9O+w4IVKAV5xihzple4n Vu7jyMRh3tEpCBi2K+juju8G8DltdBhPVawaESpICWXuOP3rvTSZdMSOcnTaV6JExB2b SbMw== X-Gm-Message-State: APjAAAVI3MnOZZd//tcUATnSY3FbzGj8P20J8ofyX3ekbCmf60ebZvLJ 90eFa6WGK8QxrRAFHL2dWxSo0NHP X-Google-Smtp-Source: APXvYqy+iZS4LSAZkYL+YdkAvcw8HuBn4RoLGELSnFKgXqYdHTWe5IOGYntOdd1denEJ7SPDg/X+zQ== X-Received: by 2002:a62:7646:: with SMTP id r67mr38367067pfc.116.1570532503763; Tue, 08 Oct 2019 04:01:43 -0700 (PDT) Received: from vpn.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id e10sm21113851pfh.77.2019.10.08.04.01.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 08 Oct 2019 04:01:43 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 8 Oct 2019 19:01:31 +0800 Message-Id: <20191008110132.20806-3-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 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 b0bb238ade..db3d7d4ca3 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;