From patchwork Tue Oct 8 15:28:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 15583 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 6E7A3447F20 for ; Tue, 8 Oct 2019 18:28:59 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4FF45688169; Tue, 8 Oct 2019 18:28:59 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f196.google.com (mail-pf1-f196.google.com [209.85.210.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 595FA688050 for ; Tue, 8 Oct 2019 18:28:52 +0300 (EEST) Received: by mail-pf1-f196.google.com with SMTP id q7so10952902pfh.8 for ; Tue, 08 Oct 2019 08:28:52 -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=EpstOVv5b1njbp14YJ20kwFI/3/xK0/JTBcpconzm2U=; b=Zev7PBT2I4qLiutmvK8M1ExOBgtiHWxDi5zvnuR4WLm6HUyXeN69kR3sBqr/Wg5rWO 0fsYCjzhWsmJUg0jVBZs980sSb7vviD+26dyOkEiTCnsJLb0HqUb1yzxU2GhsJUEYAH/ vaHJALU9TI1Sb7wjHnpV/R/7s7Wz3SbhL3c5rRokosoz73BB2cgxrsknDxUdPZKahKQa yda/0eCSGD0rfrbL4dfPmDh4vgCHUom6a+Q5vcMV9N+KDaCRhuRkiHCuZ2E4qhlzOCvq NqX2XCtUTbOgJ/D4DOD2XTAQ8Vh0axlEbswQ8aVx04adwIOhPrYgX/OSZjZnqNJm+ldO FpLQ== 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=EpstOVv5b1njbp14YJ20kwFI/3/xK0/JTBcpconzm2U=; b=Q7/gOlriT5ZWPKOrxe0lJ+jMVnSZW3n1v7nXGceoclgiLhIyZ2cx96EzRtIkHs5rEG kgRLYZ5CHLcuWDQsN7KESA9Xxlm0Cywa2jVMyjUUkS0RdvSWHTUjp137dgvQlCqNRVtV B96IJT2bSQw3ertb/nL8TbA23Sbmfoyt7skXyIVlh/zDMVT7HD+wA+g8FGEx4jXrvJ5h bNp8F4pf3VF/JfWY7wcHVtWIWkPh1mjmC1BVqGZ7FjhiWg4IO9WtvlWZn2rD3Bj5Ch9a 6q6NTv3qfhfgSTmCq1cq1aiIYyILyVvx/uwftl8BSDgyo1AsKBpax4jpsD65rKY440Ov B/4w== X-Gm-Message-State: APjAAAUbRwQaT+4BPSnJCTwOVMcRru4gJzVPjkmRMIEzZvOHKPVT7jRs u1gYMTRN5f8XBw4uKTTDdqhH3KiP X-Google-Smtp-Source: APXvYqxXhxu8jUCdpm+IvOm31ih/qiZg732a//gr3o2Yo44v5SCZ54pz9+Ov7hgNgDMscIgTcCh8OA== X-Received: by 2002:a62:e814:: with SMTP id c20mr40488484pfi.209.1570548530623; Tue, 08 Oct 2019 08:28:50 -0700 (PDT) Received: from vpn.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id 126sm7060768pgg.10.2019.10.08.08.28.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 08 Oct 2019 08:28:50 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 8 Oct 2019 23:28:38 +0800 Message-Id: <20191008152839.30375-3-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20191008152839.30375-1-lance.lmwang@gmail.com> References: <20190929132515.4093-1-lance.lmwang@gmail.com> <20191008152839.30375-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 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;