From patchwork Fri Nov 19 13:52:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wu Jianhua X-Patchwork-Id: 31493 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp2413132iob; Fri, 19 Nov 2021 05:53:14 -0800 (PST) X-Google-Smtp-Source: ABdhPJxd49l2Cz95hiGWwzK4B+kf2rEmYD8dkTsPVHOdeK+zVIJxNWKv5/MHASQNS1LvS7yMevyx X-Received: by 2002:a17:906:9b96:: with SMTP id dd22mr7978780ejc.422.1637329994722; Fri, 19 Nov 2021 05:53:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1637329994; cv=none; d=google.com; s=arc-20160816; b=Uj5fshBXO2UgIdBR+Usd4wn0bbYIWOuU0f5JfNz4NMTY/9G+9nmCdTh///A/AqBKsL 2fmdEiEw2nzbqm4IUviKmdZhNScxYXn7nISgEyJj/iImrwh5DtF7Okdp8lZrROryaFy6 vti5yQzTXjAPP3Va6N6JwcqavhwQQOFzF/OAWEBeA/gDxZaQI8I7qg99G73M7SNwLEue dXNfBpka+RH/t+OFWY48CK5lEG6+fKkLxrt6RHkb+gTBrLTtXcF8uG97t5/IqLAP7kEJ Gw9SMb/pMLUF/6trRrF3SIBB26NvWGh/tBCoY++3nmtKMDTCZE/zzNs9whdHOrI8/BY9 Id5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to; bh=tMOwRYJd1fmAYeKJWhcKSrEY35LCjCGp7GmG11ApNsI=; b=ispkQGnsigBFW322aXrsVzM+xJewK8bsrhmP+VQaUgFl29HhdaeUhM4WLriKc7OhSK UGRr8UyJKTj0IMt+yp5oeUWVNXKKtmXx1fZ3drJHgnO9Nrq5a1Ex4aH25HqZqiey4k0C En6IdA/eIjf3MWcNyD8QFhwV5AgAJD1rAsh5n06pwc42t/OJxYNrgFet7rBVyC7bZjIm st+a3s4OxJnbP23G9vXQALfNRq4Ncm+5vkU/K3H+K4F6/S2QTQrbEmx84TrI46Ad4kpN ve/5BeOepCos5zMVqNicRg4BISrQArLW8tJrSC6+kYiiBbRdnI/IiKGHoFvyJpvQL2gH 7mww== 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id ht12si8321129ejc.207.2021.11.19.05.53.14; Fri, 19 Nov 2021 05:53:14 -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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B424968A750; Fri, 19 Nov 2021 15:53:04 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F22C468A1C3 for ; Fri, 19 Nov 2021 15:52:57 +0200 (EET) X-IronPort-AV: E=McAfee;i="6200,9189,10172"; a="231896449" X-IronPort-AV: E=Sophos;i="5.87,247,1631602800"; d="scan'208";a="231896449" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Nov 2021 05:52:55 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.87,247,1631602800"; d="scan'208";a="507905944" Received: from otc-skl-e5-server.sh.intel.com ([10.239.43.106]) by orsmga008.jf.intel.com with ESMTP; 19 Nov 2021 05:52:54 -0800 From: Wu Jianhua To: ffmpeg-devel@ffmpeg.org Date: Fri, 19 Nov 2021 21:52:39 +0800 Message-Id: <20211119135248.14518-2-jianhua.wu@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211119135248.14518-1-jianhua.wu@intel.com> References: <20211119135248.14518-1-jianhua.wu@intel.com> Subject: [FFmpeg-devel] [PATCH 02/11] avfilter/avgblur_vulkan: use FF_ARRAY_ELEMS instead of magic number 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 Cc: Wu Jianhua MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: Z89E6vuQuJ8g Signed-off-by: Wu Jianhua --- libavfilter/vf_avgblur_vulkan.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavfilter/vf_avgblur_vulkan.c b/libavfilter/vf_avgblur_vulkan.c index 93b59ebb7d..c733670764 100644 --- a/libavfilter/vf_avgblur_vulkan.c +++ b/libavfilter/vf_avgblur_vulkan.c @@ -116,7 +116,7 @@ static av_cold int init_filter(AVFilterContext *ctx, AVFrame *in) ff_vk_set_compute_shader_sizes(shd, (int [3]){ CGS, 1, 1 }); - RET(ff_vk_add_descriptor_set(vkctx, s->pl_hor, shd, desc_i, 2, 0)); + RET(ff_vk_add_descriptor_set(vkctx, s->pl_hor, shd, desc_i, FF_ARRAY_ELEMS(desc_i), 0)); GLSLF(0, #define FILTER_RADIUS (%i) ,s->size_x - 1); GLSLC(0, #define INC(x) (ivec2(x, 0)) ); @@ -161,7 +161,7 @@ static av_cold int init_filter(AVFilterContext *ctx, AVFrame *in) ff_vk_set_compute_shader_sizes(shd, (int [3]){ 1, CGS, 1 }); - RET(ff_vk_add_descriptor_set(vkctx, s->pl_ver, shd, desc_i, 2, 0)); + RET(ff_vk_add_descriptor_set(vkctx, s->pl_ver, shd, desc_i, FF_ARRAY_ELEMS(desc_i), 0)); GLSLF(0, #define FILTER_RADIUS (%i) ,s->size_y - 1); GLSLC(0, #define INC(x) (ivec2(0, x)) );