From patchwork Tue Oct 8 09:08:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 15560 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 CCE5D44A919 for ; Tue, 8 Oct 2019 12:08:24 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B3137688169; Tue, 8 Oct 2019 12:08:24 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f195.google.com (mail-pg1-f195.google.com [209.85.215.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3C554688050 for ; Tue, 8 Oct 2019 12:08:18 +0300 (EEST) Received: by mail-pg1-f195.google.com with SMTP id e1so9913344pgj.6 for ; Tue, 08 Oct 2019 02:08:18 -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=+IkNNs4km4bp0h2jkxz0h/qUyRknt87/obT2QrAGJG4=; b=rMOIx5M31laEjYB0ec5+ft+XMUEjn6QOIHmj2m6hmr+hGn/rwsfg+rPIxVPUcU4+AL BhjEFpPiEwvbwpPqpTtCVewS7YmHgyvNEZmYCtDZ3xJjCToxBbqf/7odFiQW5ABD+Lwd D725ovMsFpYWz+2rUozn2vWcwMWqxVMvvhXdDlBmtGesmrHH1jhfk1MxGdCiyNzgzrAa FPzmSyBX4AwleKy7xRjNn7gTpMIkVCQglh/ijagy+DMvpkL6VYcoViY52vHuVG5Flndb uimafWYamiuQXXe8TRXYtI2Jr2JbQuXejBG13OndOv78q3YzujQT/0C/uPN46ksayPsz dVOw== 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=+IkNNs4km4bp0h2jkxz0h/qUyRknt87/obT2QrAGJG4=; b=Bv+hyyFK587TtgQhhplk+ty7bAxnGb3GgkDOtuWUPdGGx848fLAe/d80D3dW+YxBrG vMroA7q0zpZ2MUWh8xWzughuAjv08O6bWAFFJflpQmxoq6sSiy1v62nF3PAdwzSfDKQA prKAibPcTLuBekFvXal3QX1Nk+flWsPkH9TJq1FfLS0FqZ3uPUcInLJhR6sDy8KHsVkS N8M8qb9kbVhE2bcRNVm9E7paBs64O1M1BUJC43BqmgS1RiqRporKgsXMHjeO82DFfG8A lNeUBh6D7v8PuiEiZuZuQ9mW89K5TVwotMcUlnzc952MWUNGgTx3XVXNItVZFwZFcvnr redw== X-Gm-Message-State: APjAAAWukchTon0w5qoNqgkndFt+0LXLqP8t2mvzBpULA3jxmAP+Cy5o Q6124qy1T0I+aLgFTJFHq2Pm+o+P X-Google-Smtp-Source: APXvYqyCAQF7U9D1mgCP9oKt7hYGURuwyG3hVPWvfiqLEx94PS5R0uUXMhhWsfp+HOS7k74oIp64xA== X-Received: by 2002:a65:6411:: with SMTP id a17mr10775201pgv.135.1570525696411; Tue, 08 Oct 2019 02:08:16 -0700 (PDT) Received: from vpn.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id l24sm17045699pff.151.2019.10.08.02.08.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 08 Oct 2019 02:08:15 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 8 Oct 2019 17:08:02 +0800 Message-Id: <20191008090803.20295-3-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20191008090803.20295-1-lance.lmwang@gmail.com> References: <20190929132515.4093-1-lance.lmwang@gmail.com> <20191008090803.20295-1-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v3 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 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;