From patchwork Thu Nov 30 00:23:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cosmin Stejerean X-Patchwork-Id: 44843 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a301:b0:181:818d:5e7f with SMTP id x1csp20725pzk; Wed, 29 Nov 2023 16:23:46 -0800 (PST) X-Google-Smtp-Source: AGHT+IFIuHTtfUxBJcdOPIim5Wvrrh2y1TPl6iy1SlJ+VCzGVjBlWo9S9WqisPoJNWy0PsCeFGHk X-Received: by 2002:a05:6402:3455:b0:54b:179e:eb14 with SMTP id l21-20020a056402345500b0054b179eeb14mr11373503edc.27.1701303826043; Wed, 29 Nov 2023 16:23:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701303826; cv=none; d=google.com; s=arc-20160816; b=MS4W/68Kjd2Wn1ggeFwAg/ISWQvk2zV6iCc5h9+uw/xunSsDu2loRkeu/uQEgMLMpN kc4XYath76eVp3B2UamvmCDJd7O9AdqkG1V/FNGNK/UfSdGCXdhO71GIkGXibM7bWIV6 FcUXMZnkn046M05DrpwMLQeBsItIL6nFQLLgSaErISEIFf8htVHTaHKFNRPbN4jYJ/uQ 5x0dbSS9FnG1yT2mv+vM5Qok+gsyQzKxjovfrRblOVPUfTpOJIyGPScBzPGdbygb7d8X zBrVjEd6Xm0QApm0iRKmYvsFHcW+XYVar75wCtLuCc88ROiSJ6F7CvSrGj+l1PFdL7AY /Rhw== 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=O6jThroLb6PWha9/13HL6/l2NDKByCB+3ah18+6XCtE=; fh=CBS/D0cB4KwqFBY8d8UQ4TY1w6HZ9TulitLE+VqI2+k=; b=wPuZaY6HtCjerkdmh2eo+envWntMaAGSoHSOL76nOKTRGqNhjMUlxy8mVXVcu/fKvP zqmCT28MtC/n8tH171uhLUrMuiQBRYec72kKNSeSKpDyWWuV+kouGyofl3QPe9B5ev41 OF/mzrOYfAMk8emK5cPyPYTvbBPCWZqquZcMn8GUI87sZoczoAtcBtWKCibWy44bIlTB qQcu4HZ+xCf1KpVJO3Y4ZBrKw9Hwg7yt2//h51AFXT5RvDSn2CUI53GqMjwUifvKyIcW qzoBvEkPVuSV3+5rx3NhH/MWR4ttKnt2CbXYvdnwa5VitMtgXZmQeedyunATn26eF9gJ XPuQ== 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 z18-20020a05640240d200b0054b0b3ec8f9si1730334edb.103.2023.11.29.16.23.45; Wed, 29 Nov 2023 16:23:46 -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 736DC68D05C; Thu, 30 Nov 2023 02:23:33 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from a27-81.smtp-out.us-west-2.amazonses.com (a27-81.smtp-out.us-west-2.amazonses.com [54.240.27.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5105F68C7BB for ; Thu, 30 Nov 2023 02:23:25 +0200 (EET) To: =?utf-8?q?ffmpeg-devel=40ffmpeg=2Eorg?= Date: Thu, 30 Nov 2023 00:23:22 +0000 Mime-Version: 1.0 In-Reply-To: <20231130002316.73504-1-cosmin@cosmin.at> References: <20231130002316.73504-1-cosmin@cosmin.at> <20231130002316.73504-3-cosmin@cosmin.at> X-Mailer: Amazon WorkMail Thread-Index: AQHaIyNrRPKJ9BURSnGRNaEm4d8hOwAAAF4H Thread-Topic: [PATCH v2 2/3] avfilter/vf_bwdif_cuda: consider chroma subsampling when enforcing minimum dimensions X-Original-Mailer: git-send-email 2.42.1 X-Wm-Sent-Timestamp: 1701303801 Message-ID: <0101018c1d9bdaae-9d0e0673-0c35-4fe1-a981-98b365e78430-000000@us-west-2.amazonses.com> Feedback-ID: 1.us-west-2.An468LAV0jCjQDrDLvlZjeAthld7qrhZr+vow8irkvU=:AmazonSES X-SES-Outgoing: 2023.11.30-54.240.27.81 Subject: [FFmpeg-devel] [PATCH v2 2/3] avfilter/vf_bwdif_cuda: 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: gCqnRBgLqJQI From: Cosmin Stejerean Signed-off-by: Cosmin Stejerean --- libavfilter/vf_bwdif_cuda.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/libavfilter/vf_bwdif_cuda.c b/libavfilter/vf_bwdif_cuda.c index a5ecfbadb6..7d9bf861b7 100644 --- a/libavfilter/vf_bwdif_cuda.c +++ b/libavfilter/vf_bwdif_cuda.c @@ -296,13 +296,20 @@ static int config_output(AVFilterLink *link) link->frame_rate = av_mul_q(ctx->inputs[0]->frame_rate, (AVRational){2, 1}); - if (link->w < 3 || link->h < 3) { - av_log(ctx, AV_LOG_ERROR, "Video of less than 3 columns or lines is not supported\n"); + const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(output_frames->sw_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 < 3 || h_chroma < 3) { + av_log(ctx, AV_LOG_ERROR, "Video with planes less than 3 columns or lines is not supported\n"); ret = AVERROR(EINVAL); goto exit; } - y->csp = av_pix_fmt_desc_get(output_frames->sw_format); + y->csp = desc; y->filter = filter; ret = CHECK_CU(cu->cuCtxPushCurrent(s->hwctx->cuda_ctx));