From patchwork Thu Nov 30 00:23:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cosmin Stejerean X-Patchwork-Id: 44844 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a301:b0:181:818d:5e7f with SMTP id x1csp20802pzk; Wed, 29 Nov 2023 16:23:55 -0800 (PST) X-Google-Smtp-Source: AGHT+IH+dZw+OUSh7EnFLurWAIVBy9iag5lmxKm4DlGrki4pwkLjA9GEFEKfNkYQaVoxYBIjXmrw X-Received: by 2002:a50:fb10:0:b0:544:978f:bdd9 with SMTP id d16-20020a50fb10000000b00544978fbdd9mr16077732edq.12.1701303835152; Wed, 29 Nov 2023 16:23:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701303835; cv=none; d=google.com; s=arc-20160816; b=Nnt9TXKMs3+PRa7eWL2scQWqObk+rKfXy2s5KVTaV422FNgW9p6kava3jkAwYaVs5f 3P5QjjW6mUi2ALGMaXuIrleHnUiMDYLFvKDYBlJAucJ7KDZblW7i+2n0kZeGMjy+9d54 O/OuccvPtxF/8Xr1DHOaINzwRwWCgDz9yz/KLnqZEa0zIU45FCbzzY0zi784oQIVCOq8 O5YpE6iaf5aKLmZv7dwtXYMAiMY8h8yc0xLPj8ocs28vzfaCMJajZFpTYa9esmI33oey ZvfHdERSNuTbdbKBr2OtCv0O1bODt7rHwV9wgeNUo9yPJu0gNjZmOH/t+ISv6g1PPVbr e4Ig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to:from :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:feedback-id:message-id:thread-topic :thread-index:references:in-reply-to:mime-version:date:to :delivered-to; bh=USPvajYWIX4C9fgU3BLMC3TerYnoS0Ho0zXDn8Si078=; fh=CBS/D0cB4KwqFBY8d8UQ4TY1w6HZ9TulitLE+VqI2+k=; b=S3NQh3fb6HXncROaZXnpUd5209EkrZEO3lGGBwEvHFYmSxIYy9x1V29P15Bj2QChoe B9kqx+Lz8Arn9GWUE4/iRUHn7kZceKBNnd8fc7RUZg15d6EBtako3x1SiHazgf0WBzKU N3jFcu7c3H7+7iZW0fU6BHm+NZom+Q5EueB+wtMTJbxpEcjojrlKQokvLy/8pI51qcii 9CkwttWVML0H3dWfaAlOwKk7Denrnhjov6I5C0yIPe23xeMoTeZQFDRqTrYlNM9f9qb7 ANb6g3P+0bsAou+Afve+hGDrEPjkcDgp0OPSwwHUKOSbN4rslse2j3AzPSQDrw4IK2HZ 0e9w== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id b17-20020a056402351100b0054b94206a7csi3153782edd.290.2023.11.29.16.23.54; Wed, 29 Nov 2023 16:23:55 -0800 (PST) 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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8F14A68D063; Thu, 30 Nov 2023 02:23:35 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from a27-237.smtp-out.us-west-2.amazonses.com (a27-237.smtp-out.us-west-2.amazonses.com [54.240.27.237]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0DC7168D05E for ; Thu, 30 Nov 2023 02:23:28 +0200 (EET) To: =?utf-8?q?ffmpeg-devel=40ffmpeg=2Eorg?= Date: Thu, 30 Nov 2023 00:23:26 +0000 Mime-Version: 1.0 In-Reply-To: <20231130002316.73504-1-cosmin@cosmin.at> References: <20231130002316.73504-1-cosmin@cosmin.at> <20231130002316.73504-2-cosmin@cosmin.at> X-Mailer: Amazon WorkMail Thread-Index: AQHaIyNrRPKJ9BURSnGRNaEm4d8hOwAAADrc Thread-Topic: [PATCH v2 1/3] avfilter/vf_bwdif: consider chroma subsampling when enforcing minimum dimensions X-Original-Mailer: git-send-email 2.42.1 X-Wm-Sent-Timestamp: 1701303805 Message-ID: <0101018c1d9beab2-9b0cc1e6-c7e1-4e20-af1c-2b5bac4822f2-000000@us-west-2.amazonses.com> Feedback-ID: 1.us-west-2.An468LAV0jCjQDrDLvlZjeAthld7qrhZr+vow8irkvU=:AmazonSES X-SES-Outgoing: 2023.11.30-54.240.27.237 Subject: [FFmpeg-devel] [PATCH v2 1/3] avfilter/vf_bwdif: consider chroma subsampling when enforcing minimum dimensions 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: , X-Patchwork-Original-From: Cosmin Stejerean via ffmpeg-devel From: Cosmin Stejerean Reply-To: FFmpeg development discussions and patches Cc: =?utf-8?q?Cosmin_Stejerean?= Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: rE2LUeQuiaCr From: Cosmin Stejerean Fixes #10688 Signed-off-by: Cosmin Stejerean Signed-off-by: Cosmin Stejerean > --- libavfilter/vf_bwdif.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/libavfilter/vf_bwdif.c b/libavfilter/vf_bwdif.c index 137cd5ef13..80aa85a48b 100644 --- a/libavfilter/vf_bwdif.c +++ b/libavfilter/vf_bwdif.c @@ -191,12 +191,19 @@ static int config_props(AVFilterLink *link) return ret; } - if (link->w < 3 || link->h < 4) { - av_log(ctx, AV_LOG_ERROR, "Video of less than 3 columns or 4 lines is not supported\n"); + const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(link->format); + + int h = link->h; + int w = link->w; + int h_chroma = AV_CEIL_RSHIFT(h, desc->log2_chroma_h); + int w_chroma = AV_CEIL_RSHIFT(w, desc->log2_chroma_w); + + if (w < 3 || w_chroma < 3 || h < 4 || h_chroma < 4) { + av_log(ctx, AV_LOG_ERROR, "Video with planes less than 3 columns or 4 lines is not supported\n"); return AVERROR(EINVAL); } - yadif->csp = av_pix_fmt_desc_get(link->format); + yadif->csp = desc; yadif->filter = filter; ff_bwdif_init_filter_line(&s->dsp, yadif->csp->comp[0].depth);