From patchwork Sun Sep 29 13:25:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 15386 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 8697844A58A for ; Sun, 29 Sep 2019 16:33:09 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 72EC76882DB; Sun, 29 Sep 2019 16:33:09 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f193.google.com (mail-pg1-f193.google.com [209.85.215.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DDB8C688260 for ; Sun, 29 Sep 2019 16:33:02 +0300 (EEST) Received: by mail-pg1-f193.google.com with SMTP id c17so5825695pgg.4 for ; Sun, 29 Sep 2019 06:33:02 -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=Nt6dsN487JGFkJPBToNCX5JjFTlFWIZg0Yz1eKkjjgao4CVUkdQgf6BK9LYABRkBPC ECRewPaUPhgyjLyz/hg6OeO044v2jSz9RGdRzwudV4ZRuWgjOSpwOODfxoO6Oke5bDG+ bPUVh1oWkqyWjPfFX634VoFXLWA9sWg3dmWhpjarxEP6xopfKLL1WrqGVCz1eFrwSCop GSnkZXuJW9YnpBal8/bOnoLsbbwo4TVPzP8Cebmg0QQKf07FQNffWEfuqphjFPxRPd1l xIoQ2kE/oJ8gWhmbxXNsO1LugEl4fYXYGFAtwad4F8c4ZIddEWC0RGeBaZ4qHPy4+KwR IQFA== 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=k/NxwV+ITSmHRaATUMr4+vxCGFlxoYsBwpj29d/mzVNQpi8Bkiu+D0COyCZNmuidSN +DdMXJXP7O0Ee6ZsTPiaDSGLFfgnskYxOwHlHl3hiTjUOlYMASwUjw4JWrekoJe9kEix kNIfBS0DfQyoMOUa6cs5l4sWhprww3JeFx58b2xoU9lW+LNusQo9zcSxywbxCKzfKeVV c1iFJLNX0tJO0QFGpiYN1CAINYwfvilmRf+jtMT5sHDhaZdO9EkFlesh4aN9K0egArf9 1Nm/PdO1LBT67Mi1KWwZBFjE3JSOnkvgrRgkomj4+3BmUDVFbTYLYeCyrnAcWl/36pEd cD6g== X-Gm-Message-State: APjAAAVgOZ6rljhj4/dg7PH3UImwRwvAeY5F4Neo96Ud9OSOKsl/i0HT /xhG38ag2/lofWknEXnkDqOzOZN2 X-Google-Smtp-Source: APXvYqxP0XCq3TrAbmIbYGZr7bKDnErxPyQNZO90+KSmVOCFNqeRXs6NphMMg2R7QwrWfrO3dUyeJg== X-Received: by 2002:a17:90a:28c5:: with SMTP id f63mr21294395pjd.67.1569763529616; Sun, 29 Sep 2019 06:25:29 -0700 (PDT) Received: from vpn.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id c8sm13406060pga.42.2019.09.29.06.25.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 29 Sep 2019 06:25:29 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Sun, 29 Sep 2019 21:25:14 +0800 Message-Id: <20190929132515.4093-3-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20190929132515.4093-1-lance.lmwang@gmail.com> References: <20190924113200.14115-1-lance.lmwang@gmail.com> <20190929132515.4093-1-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v2 3/3] 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;