From patchwork Tue Oct 3 13:14:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Petrov X-Patchwork-Id: 44113 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1204:b0:15d:8365:d4b8 with SMTP id v4csp2046495pzf; Tue, 3 Oct 2023 06:15:09 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHvB1l39+AJdi6KJeVt5GGgHGW0QrUF1dkUeEthxxKnwHzkW7OmzZ18G/Sz1y0Qn5dwI4I6 X-Received: by 2002:a05:6402:1b1b:b0:522:2ce0:d80a with SMTP id by27-20020a0564021b1b00b005222ce0d80amr12255555edb.35.1696338909113; Tue, 03 Oct 2023 06:15:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696338909; cv=none; d=google.com; s=arc-20160816; b=ViwFYkviMV2z+Ns9BB7Y8c+Uj3Zi3o3ZJBSA6buI58mrR281x+1QKlgERdUjkDuA5J Ry4PeHQhoJ7HPgITVthdnLxSR/sDBKPmGMt0M+tVUhJ183punYoNeq9Tp9RmqHG9NvLQ PkbqasOZLceLKbNBZmslQeCw/7gs/y+37NWN3MnZT4CUZUm9yV7lszAgEjFf8W5uZlGa hIgaUe5RUAJMKgmlyy6aZByeGZKvH5t3b6q7vZgFfg96iDkuQiGfVIYBN/8+JhIG7mqU qqu8hl5p7u4kCzE/CTVTJMV0QBd8X8X+ErlFakpA+IceM2juEDvLEqTv6/rwLgNiDzKK 1C9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject:to :message-id:date:from:mime-version:dkim-signature:delivered-to; bh=RS6REl+QYcv3eAhQKDrEHsdSPOC2kgnWnQDusw+oN7Y=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=zbffepqHTFKbyapxqvBKrkoZGVNX5PRPrOPpIrabecRemntXUk8lB0lkeZVLK6qSg/ OzULxzrlVxDJctZ9KQIUjRMC+/PNyFynGAKWCwh4phI5A7nqlIKAhoISmTBG+kDk+QDR JEag4gm4MXtOEaWGQjl3UWWYezBAoUE1P0ZKlZgHkZ7OVdbbu6SmIgxnAXJTosNa89Sc YQJsI2pRyTxXQoOGbcvvq5ekSeYbay/3nsbz9EtYX1yzynzbIuaoajZNqcYhdxRE/NMQ ZfZOO5tikS/wZ1eU78NCxigV0RPo9uvKWcTGdqilmQgKamPPZx4dEoue2JdLfPf84JrV iblw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=gJs8wh2o; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id e18-20020a056402089200b005363066ce13si595774edy.455.2023.10.03.06.15.08; Tue, 03 Oct 2023 06:15:09 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=gJs8wh2o; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2082E68CC8B; Tue, 3 Oct 2023 16:15:06 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id ABD9468CB5D for ; Tue, 3 Oct 2023 16:14:59 +0300 (EEST) Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-1c434c33ec0so6406145ad.3 for ; Tue, 03 Oct 2023 06:14:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696338898; x=1696943698; darn=ffmpeg.org; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=fRcEqN+Hxaj/QAuAKM/3vQBEilM/62AO7z2T7a67Dn4=; b=gJs8wh2oBK2MHzXmNJtrG82ji3fKuzT4DVVJoQru30jeGe5dFqlP5CRKpcoGbTHRxQ KP5P84kzcO4xRl2NhDIDDuxnbefLzCPf+qo3J34MDnSiLppUOg5YOmu1NyfcVlyxa5d5 oNjZFv/9LGy/IojPa25rNjghlzY2X080TcPKpb4DsGbaHy7xL/Sig9VB4vk71XgfDi+h jT2N+FoK53xsXAX+fcWYQhEz/iTk/0O6Yxu6UqjXl8t43SY0nyXtSP2Dfg3fZ+UcCNwA 0NiJO56WuYseDSPjU16hwlfjZI+avvU1GHgqmBFro0GnmarX9wlTwATJigHKIpJOvrVD 4Ieg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696338898; x=1696943698; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=fRcEqN+Hxaj/QAuAKM/3vQBEilM/62AO7z2T7a67Dn4=; b=rCnai+Xcu4pUmR0Q/RjEHhcNo83mxriUPb4EDw0cUm3SNqeV/4DzjiYlWWgyy61UFm Zkj7XYVvRgsiI0ZNOY+hEWnG7qwqQs6TYsg6z2gNpUYNWxAw+AzCZVw60nQfHFwX3kRO otB60HjrfU9ZK8r0R+aDL5IDtkyARP0hlFKRdKAuHNL9G5DVTr64MH8wepKLwVtNV7AD VLi/Blnq4Nhb66mdXfpgLwWFwQ/WtJW6p4OHN8ATCtJ8acAjKKTLz3Bn8QfRgfCoX/u3 5yMJ/dXxG3bIDD97Op7zNKqPAqB5ZZFIP3ZIEiYvIUBSpRkk5KMCRABR0cr1Q9W4f1sV I/VA== X-Gm-Message-State: AOJu0YzrcBnpU8ZeduGbeomtt/1RYetgHflAZqxkvCB+78pUEcn3WFRq 5+drhQJwgQwyGIIusU0Iqp5w1dFta4ODJ+Bc2VOcw0w3aw0= X-Received: by 2002:a17:90b:4a84:b0:271:addf:3c96 with SMTP id lp4-20020a17090b4a8400b00271addf3c96mr3297796pjb.46.1696338897585; Tue, 03 Oct 2023 06:14:57 -0700 (PDT) MIME-Version: 1.0 From: Vladimir Petrov Date: Tue, 3 Oct 2023 16:14:46 +0300 Message-ID: To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH 2/2] avfilter/vf_decimate: Add compatibility option X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: RqGRAMA4ZGzm Adds compatibility with the old behaviour. Added a new option 'compat'. When set to 'true', no metrics recalculation will be done when marking a new frame to be dropped. In case of scene change detection, the last one per batch will be prioritized, instead of the best one. In mixed mode, checking for interlaced frames will be omited. From bdd5688d3c2811923895e31c886dd805e44c2ac6 Mon Sep 17 00:00:00 2001 From: Vladimir Petrov Date: Sat, 23 Sep 2023 17:41:58 +0300 Subject: [PATCH 2/2] avfilter/vf_decimate: Add compatibility option Adds compatibility with the old behaviour. Added a new option 'compat'. When set to 'true', no metrics recalculation will be done when marking a new frame to be dropped. In case of scene change detection, the last one per batch will be prioritized, instead of the best one. In mixed mode, checking for interlaced frames will be omited. Signed-off-by: Vladimir Petrov --- doc/filters.texi | 9 +++++++++ libavfilter/vf_decimate.c | 14 +++++++++----- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/doc/filters.texi b/doc/filters.texi index eef76d71b0..5954299713 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -11441,6 +11441,15 @@ Set whether or not chroma is considered in the metric calculations. Default is Set whether or not the input only partially contains content to be decimated. Default is @code{false}. If enabled video output stream will be in variable frame rate. + +@item compat +Set compatibility with the old behaviour. When set to @code{true}, no metrics +recalculation will be done when marking a new frame to be dropped. In case of +scene change detection, the last one per batch will be prioritized, instead of +the best one. In mixed mode, checking for interlaced frames will be omited. +In order to get smoother motion and more accurate scene change detection, +please set this to @code{false}. +Default is @code{true}. @end table @section deconvolve diff --git a/libavfilter/vf_decimate.c b/libavfilter/vf_decimate.c index 67896eaa0d..5ab953f985 100644 --- a/libavfilter/vf_decimate.c +++ b/libavfilter/vf_decimate.c @@ -70,6 +70,7 @@ typedef struct DecimateContext { int ppsrc; int chroma; int mixed; + int compat; } DecimateContext; #define OFFSET(x) offsetof(DecimateContext, x) @@ -86,6 +87,7 @@ static const AVOption decimate_options[] = { { "ppsrc", "mark main input as a pre-processed input and activate clean source input stream", OFFSET(ppsrc), AV_OPT_TYPE_BOOL, {.i64=0}, 0, 1, FLAGS }, { "chroma", "set whether or not chroma is considered in the metric calculations", OFFSET(chroma), AV_OPT_TYPE_BOOL, {.i64=1}, 0, 1, FLAGS }, { "mixed", "set whether or not the input only partially contains content to be decimated", OFFSET(mixed), AV_OPT_TYPE_BOOL, {.i64=0}, 0, 1, FLAGS }, + { "compat", "set compatibility with old behaviour", OFFSET(compat), AV_OPT_TYPE_BOOL, {.i64=1}, 0, 1, FLAGS }, { NULL } }; @@ -243,7 +245,7 @@ static int best_sc_idx(const DecimateContext* const dm) if (0 <= ret) { for (i = ret + 1; dm->cycle > i && dm->queue[i].frame; i++) { - if (!dm->queue[i].drop && dm->queue[i].totdiff > dm->queue[ret].totdiff) + if (!dm->queue[i].drop && dm->queue[i].totdiff > (dm->compat ? dm->scthresh : dm->queue[ret].totdiff)) ret = i; } } @@ -266,7 +268,7 @@ static void update_frame_metrics(DecimateContext *dm, const int idx_p, const int if (!f1) { dm->queue[idx_nxt].maxbdiff = INT64_MAX; dm->queue[idx_nxt].totdiff = INT64_MAX; - } else if (dm->mixed && ((AV_FRAME_FLAG_INTERLACED & f1->flags) || (f2 && (AV_FRAME_FLAG_INTERLACED & f2->flags)))) { + } else if (!dm->compat && dm->mixed && ((AV_FRAME_FLAG_INTERLACED & f1->flags) || (f2 && (AV_FRAME_FLAG_INTERLACED & f2->flags)))) { dm->queue[idx_nxt].maxbdiff = INT64_MAX - 1; dm->queue[idx_nxt].totdiff = 0; } else if (f2) { @@ -346,13 +348,14 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) } else { idx_prv = prev_frame_idx(dm, idx_drop); idx_nxt = next_frame_idx(dm, idx_drop); - update_frame_metrics(dm, idx_prv, idx_nxt, idx_drop); + if (!dm->compat) + update_frame_metrics(dm, idx_prv, idx_nxt, idx_drop); mark_drop_frame(dm, idx_drop, drop_case); } } } av_frame_free(&dm->last); - idx_prv = prev_frame_idx(dm, dm->cycle); + idx_prv = dm->compat ? (dm->cycle - 1) : prev_frame_idx(dm, dm->cycle); if (0 <= idx_prv && dm->queue[idx_prv].frame) dm->last = av_frame_clone(dm->queue[idx_prv].frame); } else { @@ -367,7 +370,8 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) } else { idx_prv = prev_frame_idx(dm, idx_drop); idx_nxt = next_frame_idx(dm, idx_drop); - update_frame_metrics(dm, idx_prv, idx_nxt, idx_drop); + if (!dm->compat) + update_frame_metrics(dm, idx_prv, idx_nxt, idx_drop); mark_drop_frame(dm, idx_drop, 4); } } -- 2.39.2