From patchwork Tue Jul 26 22:08:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 37000 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1649:b0:8b:613a:194d with SMTP id no9csp234427pzb; Wed, 27 Jul 2022 02:36:19 -0700 (PDT) X-Google-Smtp-Source: AGRyM1stwG/ztKeHP2lyuJGxD5WF51SibebFVq5LalUrLUYHZUjGPctYiH+XHfiFgK4hqY9piChZ X-Received: by 2002:a17:907:1b1c:b0:72f:9aac:ee41 with SMTP id mp28-20020a1709071b1c00b0072f9aacee41mr16978851ejc.56.1658914579224; Wed, 27 Jul 2022 02:36:19 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id m8-20020a056402430800b0043c34ba1918si6262051edc.24.2022.07.27.02.36.18; Wed, 27 Jul 2022 02:36:19 -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=@outlook.com header.s=selector1 header.b=gSOi6Mjq; arc=fail (body hash mismatch); 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=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8874E68B9F1; Wed, 27 Jul 2022 12:31:29 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2020.outbound.protection.outlook.com [40.92.90.20]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6D11E68B898 for ; Wed, 27 Jul 2022 12:31:06 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NX2VmZnsd9AtMbZka/iXlzdXl3eFdPImOSAbo8akY0MEso08f929d1n2umnKFsb36Osqy5X3PNxUvLkxFWuPV6MBGykyKHpAGOXM1LIKil9xSO9DLBwm/RIA6Z/rivfN/W/9n3Fu6P+m6HhVihUtB9G89p7/6/W1JRwbADg/aWc6YTRV2nfWsTfI/FGZcbr3/ZtI21lOKZBQI3cvocUdP/st9RIJBZn+uvDlAav0zUDHVtMVh//Mx0kMxJXwsCeJsReOb5tucgIJ3fn3t+O/UORIfUow6Dl2N8yPGsy+/kvLY3iNM1byh0RHrezBge1eGKfhtEj1o+IiE2Q0FbK7Bg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=a2KL3aEPposz3iD25Hwez8L1opaX7B+7VYyVJ16IwFw=; b=cd5HmexsRyzQLj9tR8D+QQkdwEulwcbb/j7EBtkVVGMEdpVwuWzrHUGDKOQzwV0ZWahI86/pKrEK4zw8KBBL9YQmzXTAWZSjGI3Bd9btOlLsAeXuiWCRPQ3dUNUFJJ+BcA1g/bzVP8Lq6HRyR1U7GT8ppuzlnKKDuTZ0+Ezys3cbmS5qAJ7KJqi2+n+pLDZNtjLei6c23l0t/p3KhWVSIKHUhA0ELF0nDBN3rQzRC9uPvNZ+bcEeOXn8Cyz9DWANbbQ3HV36cCBU2WjtXUO1ZUVTPwWnLrnLr0iEsHmOQy8bsvSkFfYMmXVTg2o9dHrabw2KjtCmvmSkjE/+Pt80DA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=a2KL3aEPposz3iD25Hwez8L1opaX7B+7VYyVJ16IwFw=; b=gSOi6MjqZ3h+2ktTWZoS+mYQDhzwWmIqUKkPBSJ5qZNS1ct0SQqSW0/yKYbt9u4qex3Y+06QeKzx4Vm+jKsutxFpX5SrKf+Ep9oGen5nN6HcOsKiy/HUiZeqADHysXJ15pA6NqZnUw79qRkQecOgLWzs/OuUIOr66W6zT4iUfQoGBpoRjOZxri7UM762np/O4espag/G/IJsqHYiHgo9T2yEPsAZrEA9BI+Rd841/6socuS/GMpyFXo0Fh/6ReBew8CgoXyj+REgaW0msOh9NxMafUZiCVue1Lw4JXBGFiiVQDHxAlnTHNiVUJR1O3fwKwPFf9RXL81kV4Bn/sp7vg== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by DB9PR01MB9174.eurprd01.prod.exchangelabs.com (2603:10a6:10:366::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5458.25; Tue, 26 Jul 2022 22:09:48 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46%11]) with mapi id 15.20.5458.025; Tue, 26 Jul 2022 22:09:48 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 27 Jul 2022 00:08:08 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [f3C9AxmDRkBRfXQfrfKNyDyCuJIeE0uA] X-ClientProxiedBy: FR3P281CA0157.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a2::13) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220726220814.695563-32-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 450dc676-b849-4254-63b9-08da6f538df7 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVFHiteK4sjkXoIVF2tzJUYZCowG7PjIQxg2Nh/FtJcYvqr20cMWWaFYkQSVWp9ygAthmlCb3Lyy6ND8G8c0nViG5J7ZhOMQxsG4EYzKDAOxDDXBd+NO0JoDkGmZcPXY8d6eTkk+++L7//d1Cm0e8tvjBVGChyrx0sJhcKrxK27y6a6dUfQLSWZOEc3tVQcYbrSSjaTbwzIdCq5JRN/nasHngtVX0ja7m93s7Znvd9BUnOaKtJ6rtqyHXUzfs3Iqgr8R8hztse7/CzHsXqzty8I19dWjMcD7LghtMBwSOweFOabApB0ss8x24h8YNUILKyBD51cR5Q0CjpIQu9DxaUPBkeYjQ0dISQvwA3OpbPq54QJO/XS6j+VcogouAwpNeKK7S4s873ZIl0wKSvMZBsU+Ua+nVXKB9cEMJnPdBaW26dK8On4ZL6BwEuSOq2Xz5X+2apKPSuQCrktgdFLiI1zr00gKjoJy3TEC+c2iHkhZM/T9+Ktc7qv9iM8NejOfgSchZwvdEoUy7YENd4YXxFPQpkg9kKS8QPivBl49Lihjdy5MzwDab9WwzRvAVwkN9p9fanCtNZFscFnwF1cVGhiIzLoxd8yMiVbq2rN1hXTLIxwV1rFJF8C3G47g4qWSnLKZ+eUXvzIGMeXVdwo/5w4gVSSzPDl0+6aI6gx/m0kJ++ACis1Gw7jyqFQR+9/17hiyyBOBe9nWx3V5L1z99Ivcl6BvYcqre0= X-MS-TrafficTypeDiagnostic: DB9PR01MB9174:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: EAivfFyL9gmzoKKsTdfF8ohhDkDO5Im39KY4dq/fHZk52zP9MsOGvmXSWh3x9wZzNZHlP88x6zMXrL2kL3aVZ763TdNLvwASrdKew/yY7jWSTeoRjfAAgh3wwuP/coVZjQXu+P0W5FpdMDk7cvUio4PJm2QQ7PgCWIyBS4Os5ZkuZnFR+XUkY1/XfMnW6wDwXcVn5m/8oDluXpWvHufEOXB97YOx655fdsdzzmkduV49daGcBN4hZh5mjiMfZtghzDhQIxiIC3UvOawn/tuevm9Dl1a2Ow1M1twASGagq2XMs2RLSqwz/T243iAd1sugO86gDs4H0dvVNHrxp4ajlkDK484bpZJmkN2a+uSmOjOMT3Saay7WtBEU8c/JrSzkFfYPuPVhyKB0vqltEsf4YZ3dM6+Ohb0+vTWDAHBQm92b/qdLdpjUSSh9SBEixMEFWMy1MHlMACA8V5kuBz40ucPJ87/4gzwhPd9vU0ec41ZMyABvpqAQK347km3axAzRGhXTJOYiUz44+HGxoBmY0ayGxRtcYVXJYp/vjDGapsohR5N6498I3k+MrRaza9SApysRz58P7Y2MnNDv7ORvQJdxLShVkk58YsO2tvgrIRdGRzwhoojGA/nkwvysIvqndpkU7FTV+jGvCYoq4+zFsw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: YkrVDa1N/6eZELsZ1b+74rw6BHoPH1kW48Da69kSGRp3xqDoDfLHNUZz5BwSVxjUzzbB8GwfVcbEOGimq537T4tSvLe+p0SacFHWZzleEvOVtyQJHjgpkZUR/BhCT7VJ/Kj5R6JJ+dg//FOipuBAqkrWKG+WkY/bgCAhyE+CUYpfkORWHGJtkCJHq0UaypUzqtszPCZ/HGIxFw+dKFMrYIhHLrugtUWz3LbdlHzN8C1RMVYRFlOl4ZU8HyqKZvtKdslU/bNBWfk8YrV9+icAJZbA5hL8OCp6vtuo5uwln0hnCsM9yA/OC22Ld2CpMLtiowePTt0GK5Y4LRDw4BHRSWe/iTFmD51ejfVSC1REZFqF0Y4cEWUnke6GVAotW+LJG1gHn5kJoeUubxU7St8PGLUz/nc1ZkqbLOS03vU150Gx+x4ejGSCmBuPDWYfVi+DZPMxxbPyfVRu30UiRkgRhaJ5S6+1imP1C5odyilZVWwlOwxymFnGxTb1zus+Yf8m/F9AyInsLPUCewv3O5HM8kSzTlIIrh8YcSwNmSmdQnVh8rGPIBm7AGjbWRevS58sF1iVPIptUnSLc2iMnRDR7pQ43wCgO/7vs5opZKRGJ6L7TFOYHy+sKgd7Tkiz1hw6YZa+yqRqcI50t/98X4HPf4iDHUXhgAPNVNV91l4GMxnhr08g54L67OVXfOvDEvjEJfaXvUoxf2LVNe3GT8P67UYCR9cMIMS2+w6HB9rORmJJCOk4DlXUATHB+f1IgNNwZZ/AaZFuUnkmgDlfeJqo/6oieG/8/WmvzBPSjh78FPWhKtPPcNkCIBK460bjrIaSS7LZKwF6mBnvmthh0h5vV+Emh6WzKauHwJbBuXScI6nH7TKdpWB5kaQin7xa7OZ2oBES5T/kii5iD2+ogFEyF6gcqiGuMYaMDedmqSmR47o7kwnNUxJcC2MAvKAq9LkbZ/Yrk6z+9cc/dHWH9Rq9cmBBtJVU5FbFMpRlN5eAOh++q7eK9MthNHNTUvYeU0QFYO4VgnqtogwsOIFYq4jTEbjt/0xM5NNmMY0WKNGhdkEff7/vYd8zkYeZA4ZOmg0zMvPcqnQ0PpgpAageeiktzjic9+7oCztTWR2hWoFuj60wvGTsQv2KeNv29pqc5uII4wA6CV/OvzbU/n87FbXh/mcliQB3VsrS62dhm60ShnZ8LfjoNeUnyzbMSbB7O2u36gYfMndYye/wVbzabKEm+h0n15DVlSiQjiTy/JnbkHvKyRyvzh0IeBSNzfDSSHyECiZm4+EuVsnzfU1ERAARYJ6xh+7RqkBy9u/L4+KcID8= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 450dc676-b849-4254-63b9-08da6f538df7 X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jul 2022 22:09:48.3302 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR01MB9174 Subject: [FFmpeg-devel] [PATCH 33/39] avcodec/cfhdencdsp: Constify input pointers 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: w+zFxzFW6tTj Signed-off-by: Andreas Rheinhardt --- libavcodec/cfhdencdsp.c | 6 +++--- libavcodec/cfhdencdsp.h | 4 ++-- libavcodec/x86/cfhdencdsp_init.c | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libavcodec/cfhdencdsp.c b/libavcodec/cfhdencdsp.c index 3a35522d69..a122bcaf19 100644 --- a/libavcodec/cfhdencdsp.c +++ b/libavcodec/cfhdencdsp.c @@ -23,7 +23,7 @@ #include "cfhdencdsp.h" -static av_always_inline void filter(int16_t *input, ptrdiff_t in_stride, +static av_always_inline void filter(const int16_t *input, ptrdiff_t in_stride, int16_t *low, ptrdiff_t low_stride, int16_t *high, ptrdiff_t high_stride, int len) @@ -46,7 +46,7 @@ static av_always_inline void filter(int16_t *input, ptrdiff_t in_stride, 1 * input[((len-2)-3)*in_stride] + 1 * input[((len-2)-4)*in_stride] + 4) >> 3); } -static void horiz_filter(int16_t *input, int16_t *low, int16_t *high, +static void horiz_filter(const int16_t *input, int16_t *low, int16_t *high, ptrdiff_t in_stride, ptrdiff_t low_stride, ptrdiff_t high_stride, int width, int height) @@ -59,7 +59,7 @@ static void horiz_filter(int16_t *input, int16_t *low, int16_t *high, } } -static void vert_filter(int16_t *input, int16_t *low, int16_t *high, +static void vert_filter(const int16_t *input, int16_t *low, int16_t *high, ptrdiff_t in_stride, ptrdiff_t low_stride, ptrdiff_t high_stride, int width, int height) diff --git a/libavcodec/cfhdencdsp.h b/libavcodec/cfhdencdsp.h index b3aac8d0a7..d234b93797 100644 --- a/libavcodec/cfhdencdsp.h +++ b/libavcodec/cfhdencdsp.h @@ -23,12 +23,12 @@ #include typedef struct CFHDEncDSPContext { - void (*horiz_filter)(int16_t *input, int16_t *low, int16_t *high, + void (*horiz_filter)(const int16_t *input, int16_t *low, int16_t *high, ptrdiff_t in_stride, ptrdiff_t low_stride, ptrdiff_t high_stride, int width, int height); - void (*vert_filter)(int16_t *input, int16_t *low, int16_t *high, + void (*vert_filter)(const int16_t *input, int16_t *low, int16_t *high, ptrdiff_t in_stride, ptrdiff_t low_stride, ptrdiff_t high_stride, int width, int height); diff --git a/libavcodec/x86/cfhdencdsp_init.c b/libavcodec/x86/cfhdencdsp_init.c index 1e3586e08c..5cea39a80a 100644 --- a/libavcodec/x86/cfhdencdsp_init.c +++ b/libavcodec/x86/cfhdencdsp_init.c @@ -27,11 +27,11 @@ #include "libavutil/x86/cpu.h" #include "libavcodec/cfhdencdsp.h" -void ff_cfhdenc_horiz_filter_sse2(int16_t *input, int16_t *low, int16_t *high, +void ff_cfhdenc_horiz_filter_sse2(const int16_t *input, int16_t *low, int16_t *high, ptrdiff_t in_stride, ptrdiff_t low_stride, ptrdiff_t high_stride, int width, int height); -void ff_cfhdenc_vert_filter_sse2(int16_t *input, int16_t *low, int16_t *high, +void ff_cfhdenc_vert_filter_sse2(const int16_t *input, int16_t *low, int16_t *high, ptrdiff_t in_stride, ptrdiff_t low_stride, ptrdiff_t high_stride, int width, int height);