From patchwork Thu Feb 8 12:57:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 46109 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:a586:b0:19e:8a94:b663 with SMTP id gd6csp241726pzc; Thu, 8 Feb 2024 04:58:19 -0800 (PST) X-Google-Smtp-Source: AGHT+IE8UnAksEDQRb/qlpu4cw6TbKtfHmXWeRIIehk1cFTDU2bC60U3pfbE+BHuElC4jj74CoYC X-Received: by 2002:a05:6402:31f3:b0:55f:ff43:d534 with SMTP id dy19-20020a05640231f300b0055fff43d534mr7032596edb.22.1707397099279; Thu, 08 Feb 2024 04:58:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1707397099; cv=none; d=google.com; s=arc-20160816; b=oEru/9QC+gIj8QchhmGtmmeK/UIsEHj3ZxSJDxKEnwfu3ro6W8KVeNqGTuIduHFdWS hNj+G/FCtB/4iuVjjf6SNjDv4mkk+NagOEx8kt7vHr3dNRnuFFOOs3+r695OmjpaAL76 Vq+uGNIvlyPAL80qreoMbrwaV5la1UF7VPlNKhPS2/KfcZpWU6KMhxngx7C8Sp/BCmv2 QjUpcdH7UDEj4DmA0bPdzuD2kDQM/48yQvmFGrToqscNAHf/exoh3U3noAf3IgZ6YWNI L62dowwI7D2z4lWgRq5s7VTxJSGc6nRDsdJV4C3tddO9xDQMQ9vIVkIZJ/7FLvL3FufH HiYA== 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: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:dkim-signature:delivered-to; bh=sQw6vosq2UiyrRRTSxkY+vj93yH7G4pENyAlwtGkgho=; fh=D9q6LtFMmgafl0IMmtBZ9Yruc41pDTPwjrs1UJDu8MQ=; b=sLuek8GBbZNQWmmVIwAMUepIsc2PN1D+2tBKE0XPGCi3zOV5XbW2FqNy2Bd9gVN7SS TuZ/vBSXabwx00orRu77EftOoRjdt3C3ydEGlkIAq2AcU7Kh2TLd5Bz43YjXdhjyte9r e/fv9j2yzVvmm2FRztJQe/FxFPb7QgjkMTN4y3+EpgpvxamL9ljha2NXHz2CtmZJ1jjM PwGb7ZWDOyA97gH/uEsLX3rmyQTAomdz4juGMkdJNDum6PqKNp8YBu+bLveSvtzrzl3W tcb9AnNSJ0jW3+Kg/AGxJ2KdCXVimoVRgZEvRyGneqXBGIu5vRqkHbExWppZAIdj7PfS RrYA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=bKyfGvhd; 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 X-Forwarded-Encrypted: i=1; AJvYcCUnLcALdMzRTPwYepKMA6WfBj8DGWM9oDoHlfWbsKmwlEU0udB2PW9HYn94SX0Q8j2Ni4zjHBT6rarGxFXfkRfQDHw8LIli3fnLEwQDklmP9aevoPQSJvRVImEKcH3KjkMCnlnbIEROIdPLDtcQ8EcSde2TkXf2w1BhNObdDP4yziCHxvcAO9uKAQ0KxOM/tqBB17TtJ1uH6MGdOrEE9yTXUxUwuNy9nAZ//FFcf+/B49Ev9Kl4H0/RZNrrG5EQqraJy3HhNDm+ezX0079wrVzBqJOA9WycYuJJaiXf4JWnwW9pGj7Nlr/8Bq1nHoYuRwLlVedHtS3TfXPY6Iqsh8+aalHdsnX+MmzNOdGX0mYtQImh5IdldUOqspMuj5ZPx2K9LmbrEw+lqUC9QN1VmPOlfiGUjR9bJghGZmPKSKzJTar5KKHUX9hjvWmKK66YAW6SaAYaP6YN87yj/fYm2yrayK7ZUsDODYRwRwcfuHBaNgcJx69ertxeqEMq33kiHpoBPWvgLXsB7V6f8tOasRN5Jus7FxrSRLW55kli6MeCB/vm+lfckyrEEMLdk0Zwjfv+tSGLbJ9BXMIT3JSWsyBgJmqs0HbaZiyrPHagw7NLZhTpIFouezSC0HIvWrM1/f2vZQFi9dYeceMGcXgJLu09xan3FcmkxcMcvxqW1t4r12dVKAoAYPMqZMPQKlknZPgwJ8WxLb7HpwUWqTDKerPxGHtWIAlFU/XT5N+h2wVwiRofUhaotA4p+ox0m+FjRJY40ARWWS9lYHPZyktmMqkW5qsJZ6Ih3eAJ0AKTkMBN6+qBSEXfzGj2t3thtovUar0mpCh/zkkH4SzpZiE16iiPHbVlN2Y6IF/aXKTFOX1Z4GXf5It/xHSIbStn+o6DMOtyD/hBJzA1jDA63pymR9T/YB9LA/cfLi8Q+eKHjd2HHUR8Y30E46hJCEjS0NZGBOntH5 mBg2iV9q77he3LgjV115q3xbFSls+cN/skKukuwsJ/6WFf5FH1XihHjKFaVNSk7Xb5gpozqQ78hnKEvicgirDbJ3aqihwVuh4dz7oSzu8MWbM/ugPP0UxoYnkSZPTOKunRcTkfPrvXnwfJESeKk+U3khaUzgP+qzFZn4WHs961qfaBraeK7zOfjdQPO1m4jkjyXTILNzzuIHE+Os91P2OU7MAG2jpc/RtreNSG9EGrbSvwYjHl5EkmUKSSetk+AnjDxUwtyca4uTh8SXBFDaMiDEve1En2GYovTbmgHuHFgCjBZ0oLhnEBP+AsTc/VqO8hDeTHdq5+tSgePkxIiwMgec/ZalK2eeoxtA/JiRHE1RsZo99hu9Dl4Bpfl2GW8e9Swg+U5CNSsF3Li1RO3IlX8/dCvNfcRLEYY3hb6GMnm6mMsvfB5Tn4BC+Q6GBZq8ybBwPEL139i+YV1lsG1pdUVniJWW6bN53W0NVeAD0jTtr00HoZq4WMN+pYC1tFJUbTpK79g3FAMErMuYppoXNgsg1cgAodnVqNJdvRHamThz2g6qO6oYS9bUvozEUZy5TRKUzgyvKJMtK2iGoxV9PbQ4HBcKBbp/8kWSy0NjWz+9/ci0jewBSNj7MS6N3szQ5V Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id u23-20020a50c057000000b005610e7cc7e3si535667edd.262.2024.02.08.04.58.18; Thu, 08 Feb 2024 04:58:19 -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; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=bKyfGvhd; 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 9740B68D14F; Thu, 8 Feb 2024 14:58:07 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay3-d.mail.gandi.net (relay3-d.mail.gandi.net [217.70.183.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 87E7268CF9A for ; Thu, 8 Feb 2024 14:58:00 +0200 (EET) Received: by mail.gandi.net (Postfix) with ESMTPSA id D7AFF60003 for ; Thu, 8 Feb 2024 12:57:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1707397080; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:in-reply-to:in-reply-to:references:references; bh=S7J4whn41TX/SB/cx/AFcJ4+sXDvhe1LvGrmSWYPTNM=; b=bKyfGvhdw0SxQKbd9gwNd+RpzSGsvnOXtLpih7eCktmA9zVyV0FWC/0g2mbmUjt2S+1RWP DbP1Qjb3/i4Y50HCVgOrYfQQD2TH1++pbfVrVQlpZUPOWNbzAH3f1sRalUrsGb4MsWqHJv EYb5CNk6aj+DuPeZdZfqmKoV9JCocfyy4Kb+6zULu1SpyGkB0xWul1aRk1BlaEWmizLZvv dQN1p2lknh39HyzOTfQLAXR+Q2BY8KMNS87XcBgu5/8Wpys7Ym/8IN0/oFdzUVDTvzchzG qMzQbB3EegmnHfTPA6ynpDi/jLv7zP+8Ey02NLRTgQL4QZNKpuUMWO9RN+K8OA== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Thu, 8 Feb 2024 13:57:58 +0100 Message-Id: <20240208125758.29992-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20240208125758.29992-1-michael@niedermayer.cc> References: <20240208125758.29992-1-michael@niedermayer.cc> X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 2/2] avfilter/v360: Use AV_PIX_MAX_PLANES 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: UUiDHHXJneO/ Issue found through Coverity CID1457948 Signed-off-by: Michael Niedermayer --- libavfilter/v360.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/libavfilter/v360.h b/libavfilter/v360.h index 5d797ab828b..a984d470acc 100644 --- a/libavfilter/v360.h +++ b/libavfilter/v360.h @@ -160,14 +160,14 @@ typedef struct V360Context { int in_width, in_height; int out_width, out_height; - int pr_width[4], pr_height[4]; + int pr_width[AV_PIX_MAX_PLANES], pr_height[AV_PIX_MAX_PLANES]; - int in_offset_w[4], in_offset_h[4]; - int out_offset_w[4], out_offset_h[4]; + int in_offset_w[AV_PIX_MAX_PLANES], in_offset_h[AV_PIX_MAX_PLANES]; + int out_offset_w[AV_PIX_MAX_PLANES], out_offset_h[AV_PIX_MAX_PLANES]; - int planewidth[4], planeheight[4]; - int inplanewidth[4], inplaneheight[4]; - int uv_linesize[4]; + int planewidth[AV_PIX_MAX_PLANES], planeheight[AV_PIX_MAX_PLANES]; + int inplanewidth[AV_PIX_MAX_PLANES], inplaneheight[AV_PIX_MAX_PLANES]; + int uv_linesize[AV_PIX_MAX_PLANES]; int nb_planes; int nb_allocated; int elements; @@ -176,7 +176,7 @@ typedef struct V360Context { int nb_threads; SliceXYRemap *slice_remap; - unsigned map[4]; + unsigned map[AV_PIX_MAX_PLANES]; int (*in_transform)(const struct V360Context *s, const float *vec, int width, int height,