From patchwork Fri Aug 6 18:39:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29319 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6c0f:0:0:0:0:0 with SMTP id a15csp767033ioh; Fri, 6 Aug 2021 11:45:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxsLmTGHRXHwRCqHbZm4VSBb2FptQvxJc6MXMEdO1S7Uzdp5Z1ww1Lme9zPirlM74I6cpSw X-Received: by 2002:a17:907:9546:: with SMTP id ex6mr11091186ejc.441.1628275523120; Fri, 06 Aug 2021 11:45:23 -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 p7si10021244edq.323.2021.08.06.11.45.22; Fri, 06 Aug 2021 11:45:23 -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=QakszUAj; 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 6F28968081B; Fri, 6 Aug 2021 21:45:18 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-oln040092069052.outbound.protection.outlook.com [40.92.69.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A44D168081B for ; Fri, 6 Aug 2021 21:45:11 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HlINHK00KLwOdHea/v129nvQbqi6FmBR+Gmzb+oeM7HYKqocQrMUUV1XM64eq+o3Xok2JWeCiYlBhZX+rc/v2SiQV1cOBfjH6paiTs8Nv0f4fNr6bjCidTYD7S7Yj4nxx474llhLURPg/EFT4nthKzzZcsFFaimxfFVa+SgD8BXzvi2KOxUER76Heyd9ptp8CeJ/v9NsWkdVcOr2x2qHj98PxKuzbrDLplqhJahGDLbyDD1+r4XYljD2YMqrTxa+VzV/znJYV3dfWQcGmkwfkZVnZTQWlduAynRgEurJIRHyHYKkoQR1ihiNhzstqPSUSnQFBdaZZes1h+Kl5fXENg== 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-SenderADCheck; bh=CuUzVee5gxCWL4bLg7j6jKVoyqnYNlNQ6EGS4QrHJE8=; b=O639XYwQ0xlWHJN6BI7IqTVUtJUxNUfWWKg4zgRyoGAzWO85gBt5VC0Tdszc4ye1ruxHltwDKhl/h6PLIH5zGMPWsvfG8OGlvPWp6hm7DBD1Ws3Gky+ILowMdQ8dFf+5srOB2IpnOj0vwBsJNQA5sGUQw9cyw+3tuermhJGYNe5M0Lc2gI2YtQSJ/0WQILYlGOWlLGxF8ToUGAo40cbgyLRokzuDikC/77nXcXcVxdkTRi4RB6QmT0vL2UhiVNXrVVVASUIQV1vVkSj7+AYDW5s8iv+QZ8K4PzDkna+zP9HqpoydTuZ5Iy6XvH5Xy1sAsKsjhnlgLtgS/pPa26SwJw== 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=CuUzVee5gxCWL4bLg7j6jKVoyqnYNlNQ6EGS4QrHJE8=; b=QakszUAjeIhrMQmMFSgFnMGR6mov9bmAWb/j8x0Xg+P1a5f39gqJlM22K3y2W5qGdhWU2ivjbzJruuGKYjau9ZwauemIdTorZ0wjGcpIAXc73a2jYnnalBt0WGLNJ33wO2lphAAe2VNg13t8SLGx7MbihXwYVVMJoDkIm5NDadorppVJWQbN2LoAnATTqr22u7HeAPiN9ZxOVQvzRLKE8XnH771ZElqoHdQj451U4CIQ+PHcnEoeS35FiHX4GP5RNzP5hGjaar9Y2snp5Chq0YNXjeqcMb2tIu3G6qbaFgz6fKJUx/12zH/yLq0nqTUiv8WQtrIDj4Mm0Y1AsYn0Nw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB4294.eurprd03.prod.outlook.com (2603:10a6:20b:4::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4394.15; Fri, 6 Aug 2021 18:45:09 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::c9b2:14f8:d555:6f2d]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::c9b2:14f8:d555:6f2d%8]) with mapi id 15.20.4373.028; Fri, 6 Aug 2021 18:45:09 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 6 Aug 2021 20:39:27 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [M5++eDnj466Ksy9nD+KTmekfVCLeVsqR] X-ClientProxiedBy: AM8P251CA0020.EURP251.PROD.OUTLOOK.COM (2603:10a6:20b:21b::25) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210806183927.3092619-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.95.102) by AM8P251CA0020.EURP251.PROD.OUTLOOK.COM (2603:10a6:20b:21b::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4394.15 via Frontend Transport; Fri, 6 Aug 2021 18:45:09 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3767b1e6-b3f9-4a85-55b3-08d9590a511b X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNW/RTKLcra1Z37wLCpJrZLyVNvKRlZrsHil4REVb6PguD/DF2cEjO59dSr0YYqJnrX3ZVgpyfjUkm8I5CGI8hPuoynik8eYNT71cTiVFqT5jvTBrzs/dPq8yDiHTeg8BoFrngMGYU+EIi1lhJtWZU03GDalslJeXK0fOBSQe6QUZtRISLEK37CyQsVL+A4Yz/w1oTS7ihz8iUC4itZQeQ7GSpL9A3qDrXMdq2mVA2klRsWpHfTYjv6IuOdo1QHuxtaYJ7CjHj+u4XSNVDzNxLoX4+gHrsl3csiMat6piI22+GhMmnchWkgLsP6xgvZ7FS6p5CAfCgNQxWgyLGrN8hBMkbr9T31PLlpsm3VbN9mP2sUHMlF7LQo4V1cr/bgWdAOTaqmVfKO9TmuPuUDayamlRg8TavWUqzCy7nV+rWJ9PEqdO0/lj7iaZhOFef8A0a9HBRwSYWOlu+VNYhnOroiC8rZZKN4Q5G2UTiUTuBw1vCiU2dUisva2ys2GFqj2atv1w9VZHSsRVgKoFUFlfsaeJ8Yp1U/8iEWtAW7fIUs66e2obgtvv9fA1EEslPK+zcil/FcB3YgdYoTtw3I76xlgrUK7DYcsmsVnFSqx4/hzoprPNlbaQa0DzZcI/w8lZpgrJRWKUhnaID1Grchw/U5fYrzMcIMYdpLB1X9B20z6sPw28++V5WUBPM8NxeTht76QISYJ5Y618ergEJYsiuvd+l9WKdQ5M5o= X-MS-TrafficTypeDiagnostic: AM6PR03MB4294: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: C3/LL0w1JsKB8ZC7cgME3R8HbKLkCgjoojY8i33kmQp96FtqWEIf+xhRqFyYFH9pJ9MvVzqfGUi/oCRIZn5oW9E19a5tMYSqRgK500eniUMBA4qhEg3D9I7c3N4KlHjiwF7ffGi82H2uM+qpSt7XtCHoZ//tWUEnCzmavBVRlegPCBxaYyUA4+dt/Mpvue7GdgbDjOE/wW08YxIZWT01kaaZUP+IxC78rSJ26xaapjpxrhiSisy1iNS60e9Yz00qWLCw9sX882JtsIDBuhyoO8mwQC7rEe3l1aSjXxSIcYJcNvT7VXa6IorQK1X6/d2NkGqncg800GLiPwFX4KS5ic7XTElOLGlovRqJnWIcCcALnLCKwi+/4Jav9ZETPP9/II4XNWqbR7gcFkYWauCnP+z/GlcVQ5ReoflTzaaQQJGne0Nh5A9/Es+Oic43xMBh X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: RJJAW18wUEHYHloK4JUKON+dxcCiyK+Fer7drp55Yks+prkMnoMgfz0BKpijQyyumZ/tYeMzTPdjEjgqdl1bTFidTLjFRwCR5A+xonC/nD5vmjTZxQ9naKbf5g4rRO5ZW+5/EUNDascnAyqFTQ09Hw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3767b1e6-b3f9-4a85-55b3-08d9590a511b X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Aug 2021 18:45:09.7236 (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: AM6PR03MB4294 Subject: [FFmpeg-devel] [PATCH 5/5] avcodec/h264dsp, h264idct: Fix lengths of array parameters 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: Oih3awmOkx6s Fixes many -Warray-parameter warnings from GCC 11. Signed-off-by: Andreas Rheinhardt --- If someone has a good name for a macro for "5 * 8" in this context, I'll use it. libavcodec/aarch64/h264dsp_init_aarch64.c | 8 ++++---- libavcodec/arm/h264dsp_init_arm.c | 8 ++++---- libavcodec/h264dsp.h | 6 +++--- libavcodec/h264idct.h | 10 +++++----- libavcodec/h264idct_template.c | 15 ++++++++++++--- libavcodec/mips/h264dsp_mips.h | 12 ++++++------ libavcodec/mips/h264dsp_mmi.c | 7 ++++--- libavcodec/mips/h264idct_msa.c | 6 +++--- libavcodec/ppc/h264dsp.c | 6 +++--- libavcodec/x86/h264dsp_init.c | 4 ++-- 10 files changed, 46 insertions(+), 36 deletions(-) diff --git a/libavcodec/aarch64/h264dsp_init_aarch64.c b/libavcodec/aarch64/h264dsp_init_aarch64.c index d5baccf235..cbaf8d31eb 100644 --- a/libavcodec/aarch64/h264dsp_init_aarch64.c +++ b/libavcodec/aarch64/h264dsp_init_aarch64.c @@ -69,19 +69,19 @@ void ff_h264_idct_add_neon(uint8_t *dst, int16_t *block, int stride); void ff_h264_idct_dc_add_neon(uint8_t *dst, int16_t *block, int stride); void ff_h264_idct_add16_neon(uint8_t *dst, const int *block_offset, int16_t *block, int stride, - const uint8_t nnzc[6*8]); + const uint8_t nnzc[5 * 8]); void ff_h264_idct_add16intra_neon(uint8_t *dst, const int *block_offset, int16_t *block, int stride, - const uint8_t nnzc[6*8]); + const uint8_t nnzc[5 * 8]); void ff_h264_idct_add8_neon(uint8_t **dest, const int *block_offset, int16_t *block, int stride, - const uint8_t nnzc[6*8]); + const uint8_t nnzc[15 * 8]); void ff_h264_idct8_add_neon(uint8_t *dst, int16_t *block, int stride); void ff_h264_idct8_dc_add_neon(uint8_t *dst, int16_t *block, int stride); void ff_h264_idct8_add4_neon(uint8_t *dst, const int *block_offset, int16_t *block, int stride, - const uint8_t nnzc[6*8]); + const uint8_t nnzc[5 * 8]); av_cold void ff_h264dsp_init_aarch64(H264DSPContext *c, const int bit_depth, const int chroma_format_idc) diff --git a/libavcodec/arm/h264dsp_init_arm.c b/libavcodec/arm/h264dsp_init_arm.c index 54e1e38c93..13d499fda2 100644 --- a/libavcodec/arm/h264dsp_init_arm.c +++ b/libavcodec/arm/h264dsp_init_arm.c @@ -57,19 +57,19 @@ void ff_h264_idct_add_neon(uint8_t *dst, int16_t *block, int stride); void ff_h264_idct_dc_add_neon(uint8_t *dst, int16_t *block, int stride); void ff_h264_idct_add16_neon(uint8_t *dst, const int *block_offset, int16_t *block, int stride, - const uint8_t nnzc[6*8]); + const uint8_t nnzc[5 * 8]); void ff_h264_idct_add16intra_neon(uint8_t *dst, const int *block_offset, int16_t *block, int stride, - const uint8_t nnzc[6*8]); + const uint8_t nnzc[5 * 8]); void ff_h264_idct_add8_neon(uint8_t **dest, const int *block_offset, int16_t *block, int stride, - const uint8_t nnzc[6*8]); + const uint8_t nnzc[15 * 8]); void ff_h264_idct8_add_neon(uint8_t *dst, int16_t *block, int stride); void ff_h264_idct8_dc_add_neon(uint8_t *dst, int16_t *block, int stride); void ff_h264_idct8_add4_neon(uint8_t *dst, const int *block_offset, int16_t *block, int stride, - const uint8_t nnzc[6*8]); + const uint8_t nnzc[5 * 8]); static av_cold void h264dsp_init_neon(H264DSPContext *c, const int bit_depth, const int chroma_format_idc) diff --git a/libavcodec/h264dsp.h b/libavcodec/h264dsp.h index cbea3173c6..850d4471fd 100644 --- a/libavcodec/h264dsp.h +++ b/libavcodec/h264dsp.h @@ -89,16 +89,16 @@ typedef struct H264DSPContext { void (*h264_idct_add16)(uint8_t *dst /*align 16*/, const int *blockoffset, int16_t *block /*align 16*/, int stride, - const uint8_t nnzc[15 * 8]); + const uint8_t nnzc[5 * 8]); void (*h264_idct8_add4)(uint8_t *dst /*align 16*/, const int *blockoffset, int16_t *block /*align 16*/, int stride, - const uint8_t nnzc[15 * 8]); + const uint8_t nnzc[5 * 8]); void (*h264_idct_add8)(uint8_t **dst /*align 16*/, const int *blockoffset, int16_t *block /*align 16*/, int stride, const uint8_t nnzc[15 * 8]); void (*h264_idct_add16intra)(uint8_t *dst /*align 16*/, const int *blockoffset, int16_t *block /*align 16*/, - int stride, const uint8_t nnzc[15 * 8]); + int stride, const uint8_t nnzc[5 * 8]); void (*h264_luma_dc_dequant_idct)(int16_t *output, int16_t *input /*align 16*/, int qmul); void (*h264_chroma_dc_dequant_idct)(int16_t *block, int qmul); diff --git a/libavcodec/h264idct.h b/libavcodec/h264idct.h index 17e0051497..6f18df9e5f 100644 --- a/libavcodec/h264idct.h +++ b/libavcodec/h264idct.h @@ -26,11 +26,11 @@ void ff_h264_idct8_add_ ## depth ## _c(uint8_t *dst, int16_t *block, int stride) void ff_h264_idct_add_ ## depth ## _c(uint8_t *dst, int16_t *block, int stride);\ void ff_h264_idct8_dc_add_ ## depth ## _c(uint8_t *dst, int16_t *block, int stride);\ void ff_h264_idct_dc_add_ ## depth ## _c(uint8_t *dst, int16_t *block, int stride);\ -void ff_h264_idct_add16_ ## depth ## _c(uint8_t *dst, const int *blockoffset, int16_t *block, int stride, const uint8_t nnzc[6*8]);\ -void ff_h264_idct_add16intra_ ## depth ## _c(uint8_t *dst, const int *blockoffset, int16_t *block, int stride, const uint8_t nnzc[6*8]);\ -void ff_h264_idct8_add4_ ## depth ## _c(uint8_t *dst, const int *blockoffset, int16_t *block, int stride, const uint8_t nnzc[6*8]);\ -void ff_h264_idct_add8_422_ ## depth ## _c(uint8_t **dest, const int *blockoffset, int16_t *block, int stride, const uint8_t nnzc[6*8]);\ -void ff_h264_idct_add8_ ## depth ## _c(uint8_t **dest, const int *blockoffset, int16_t *block, int stride, const uint8_t nnzc[6*8]);\ +void ff_h264_idct_add16_ ## depth ## _c(uint8_t *dst, const int *blockoffset, int16_t *block, int stride, const uint8_t nnzc[5 * 8]);\ +void ff_h264_idct_add16intra_ ## depth ## _c(uint8_t *dst, const int *blockoffset, int16_t *block, int stride, const uint8_t nnzc[5 * 8]);\ +void ff_h264_idct8_add4_ ## depth ## _c(uint8_t *dst, const int *blockoffset, int16_t *block, int stride, const uint8_t nnzc[5 * 8]);\ +void ff_h264_idct_add8_422_ ## depth ## _c(uint8_t **dest, const int *blockoffset, int16_t *block, int stride, const uint8_t nnzc[15 * 8]);\ +void ff_h264_idct_add8_ ## depth ## _c(uint8_t **dest, const int *blockoffset, int16_t *block, int stride, const uint8_t nnzc[15 * 8]);\ void ff_h264_luma_dc_dequant_idct_ ## depth ## _c(int16_t *output, int16_t *input, int qmul);\ void ff_h264_chroma422_dc_dequant_idct_ ## depth ## _c(int16_t *block, int qmul);\ void ff_h264_chroma_dc_dequant_idct_ ## depth ## _c(int16_t *block, int qmul); diff --git a/libavcodec/h264idct_template.c b/libavcodec/h264idct_template.c index ce66ed3ab8..ec0b428c27 100644 --- a/libavcodec/h264idct_template.c +++ b/libavcodec/h264idct_template.c @@ -171,7 +171,10 @@ void FUNCC(ff_h264_idct8_dc_add)(uint8_t *_dst, int16_t *_block, int stride){ } } -void FUNCC(ff_h264_idct_add16)(uint8_t *dst, const int *block_offset, int16_t *block, int stride, const uint8_t nnzc[15*8]){ +void FUNCC(ff_h264_idct_add16)(uint8_t *dst, const int *block_offset, + int16_t *block, int stride, + const uint8_t nnzc[5 * 8]) +{ int i; for(i=0; i<16; i++){ int nnz = nnzc[ scan8[i] ]; @@ -182,7 +185,10 @@ void FUNCC(ff_h264_idct_add16)(uint8_t *dst, const int *block_offset, int16_t *b } } -void FUNCC(ff_h264_idct_add16intra)(uint8_t *dst, const int *block_offset, int16_t *block, int stride, const uint8_t nnzc[15*8]){ +void FUNCC(ff_h264_idct_add16intra)(uint8_t *dst, const int *block_offset, + int16_t *block, int stride, + const uint8_t nnzc[5 * 8]) +{ int i; for(i=0; i<16; i++){ if(nnzc[ scan8[i] ]) FUNCC(ff_h264_idct_add )(dst + block_offset[i], block + i*16*sizeof(pixel), stride); @@ -190,7 +196,10 @@ void FUNCC(ff_h264_idct_add16intra)(uint8_t *dst, const int *block_offset, int16 } } -void FUNCC(ff_h264_idct8_add4)(uint8_t *dst, const int *block_offset, int16_t *block, int stride, const uint8_t nnzc[15*8]){ +void FUNCC(ff_h264_idct8_add4)(uint8_t *dst, const int *block_offset, + int16_t *block, int stride, + const uint8_t nnzc[5 * 8]) +{ int i; for(i=0; i<16; i+=4){ int nnz = nnzc[ scan8[i] ]; diff --git a/libavcodec/mips/h264dsp_mips.h b/libavcodec/mips/h264dsp_mips.h index 5847ef36fe..93a201c66a 100644 --- a/libavcodec/mips/h264dsp_mips.h +++ b/libavcodec/mips/h264dsp_mips.h @@ -50,10 +50,10 @@ void ff_h264_deq_idct_luma_dc_msa(int16_t *dst, int16_t *src, int32_t de_q_val); void ff_h264_idct_add16_msa(uint8_t *dst, const int32_t *blk_offset, int16_t *block, int32_t stride, - const uint8_t nnzc[15 * 8]); + const uint8_t nnzc[5 * 8]); void ff_h264_idct_add16_intra_msa(uint8_t *dst, const int32_t *blk_offset, int16_t *block, int32_t dst_stride, - const uint8_t nnzc[15 * 8]); + const uint8_t nnzc[5 * 8]); void ff_h264_idct_add8_msa(uint8_t **dst, const int32_t *blk_offset, int16_t *block, int32_t dst_stride, const uint8_t nnzc[15 * 8]); @@ -65,7 +65,7 @@ void ff_h264_idct8_dc_addblk_msa(uint8_t *dst, int16_t *src, int32_t dst_stride); void ff_h264_idct8_add4_msa(uint8_t *dst, const int *blk_offset, int16_t *blk, int dst_stride, - const uint8_t nnzc[15 * 8]); + const uint8_t nnzc[5 * 8]); void ff_h264_h_lpf_luma_intra_msa(uint8_t *src, ptrdiff_t stride, int alpha, int beta); @@ -329,11 +329,11 @@ void ff_h264_idct8_add_8_mmi(uint8_t *dst, int16_t *block, int stride); void ff_h264_idct_dc_add_8_mmi(uint8_t *dst, int16_t *block, int stride); void ff_h264_idct8_dc_add_8_mmi(uint8_t *dst, int16_t *block, int stride); void ff_h264_idct_add16_8_mmi(uint8_t *dst, const int *block_offset, - int16_t *block, int stride, const uint8_t nnzc[15*8]); + int16_t *block, int stride, const uint8_t nnzc[5 * 8]); void ff_h264_idct_add16intra_8_mmi(uint8_t *dst, const int *block_offset, - int16_t *block, int stride, const uint8_t nnzc[15*8]); + int16_t *block, int stride, const uint8_t nnzc[5 * 8]); void ff_h264_idct8_add4_8_mmi(uint8_t *dst, const int *block_offset, - int16_t *block, int stride, const uint8_t nnzc[15*8]); + int16_t *block, int stride, const uint8_t nnzc[5 * 8]); void ff_h264_idct_add8_8_mmi(uint8_t **dest, const int *block_offset, int16_t *block, int stride, const uint8_t nnzc[15*8]); void ff_h264_idct_add8_422_8_mmi(uint8_t **dest, const int *block_offset, diff --git a/libavcodec/mips/h264dsp_mmi.c b/libavcodec/mips/h264dsp_mmi.c index b5ab07c863..dff3d331b1 100644 --- a/libavcodec/mips/h264dsp_mmi.c +++ b/libavcodec/mips/h264dsp_mmi.c @@ -766,7 +766,8 @@ void ff_h264_idct8_dc_add_8_mmi(uint8_t *dst, int16_t *block, int stride) } void ff_h264_idct_add16_8_mmi(uint8_t *dst, const int *block_offset, - int16_t *block, int stride, const uint8_t nnzc[15*8]) + int16_t *block, int stride, + const uint8_t nnzc[5 * 8]) { int i; for(i=0; i<16; i++){ @@ -783,7 +784,7 @@ void ff_h264_idct_add16_8_mmi(uint8_t *dst, const int *block_offset, } void ff_h264_idct_add16intra_8_mmi(uint8_t *dst, const int *block_offset, - int16_t *block, int stride, const uint8_t nnzc[15*8]) + int16_t *block, int stride, const uint8_t nnzc[5 * 8]) { int i; for(i=0; i<16; i++){ @@ -796,7 +797,7 @@ void ff_h264_idct_add16intra_8_mmi(uint8_t *dst, const int *block_offset, } void ff_h264_idct8_add4_8_mmi(uint8_t *dst, const int *block_offset, - int16_t *block, int stride, const uint8_t nnzc[15*8]) + int16_t *block, int stride, const uint8_t nnzc[5 * 8]) { int i; for(i=0; i<16; i+=4){ diff --git a/libavcodec/mips/h264idct_msa.c b/libavcodec/mips/h264idct_msa.c index fbf7795e27..1a20a3e30e 100644 --- a/libavcodec/mips/h264idct_msa.c +++ b/libavcodec/mips/h264idct_msa.c @@ -347,7 +347,7 @@ void ff_h264_idct8_dc_addblk_msa(uint8_t *dst, int16_t *src, void ff_h264_idct_add16_msa(uint8_t *dst, const int32_t *blk_offset, int16_t *block, int32_t dst_stride, - const uint8_t nzc[15 * 8]) + const uint8_t nzc[5 * 8]) { int32_t i; @@ -369,7 +369,7 @@ void ff_h264_idct_add16_msa(uint8_t *dst, void ff_h264_idct8_add4_msa(uint8_t *dst, const int32_t *blk_offset, int16_t *block, int32_t dst_stride, - const uint8_t nzc[15 * 8]) + const uint8_t nzc[5 * 8]) { int32_t cnt; @@ -448,7 +448,7 @@ void ff_h264_idct_add16_intra_msa(uint8_t *dst, const int32_t *blk_offset, int16_t *block, int32_t dst_stride, - const uint8_t nzc[15 * 8]) + const uint8_t nzc[5 * 8]) { int32_t i; diff --git a/libavcodec/ppc/h264dsp.c b/libavcodec/ppc/h264dsp.c index 779092fd76..c02733dda2 100644 --- a/libavcodec/ppc/h264dsp.c +++ b/libavcodec/ppc/h264dsp.c @@ -328,7 +328,7 @@ static void h264_idct8_dc_add_altivec(uint8_t *dst, int16_t *block, int stride) static void h264_idct_add16_altivec(uint8_t *dst, const int *block_offset, int16_t *block, int stride, - const uint8_t nnzc[15 * 8]) + const uint8_t nnzc[5 * 8]) { int i; for(i=0; i<16; i++){ @@ -342,7 +342,7 @@ static void h264_idct_add16_altivec(uint8_t *dst, const int *block_offset, static void h264_idct_add16intra_altivec(uint8_t *dst, const int *block_offset, int16_t *block, int stride, - const uint8_t nnzc[15 * 8]) + const uint8_t nnzc[5 * 8]) { int i; for(i=0; i<16; i++){ @@ -353,7 +353,7 @@ static void h264_idct_add16intra_altivec(uint8_t *dst, const int *block_offset, static void h264_idct8_add4_altivec(uint8_t *dst, const int *block_offset, int16_t *block, int stride, - const uint8_t nnzc[15 * 8]) + const uint8_t nnzc[5 * 8]) { int i; for(i=0; i<16; i+=4){ diff --git a/libavcodec/x86/h264dsp_init.c b/libavcodec/x86/h264dsp_init.c index 08eb7ead44..c9a96c7dca 100644 --- a/libavcodec/x86/h264dsp_init.c +++ b/libavcodec/x86/h264dsp_init.c @@ -52,7 +52,7 @@ IDCT_ADD_FUNC(8, 10, avx) #define IDCT_ADD_REP_FUNC(NUM, REP, DEPTH, OPT) \ void ff_h264_idct ## NUM ## _add ## REP ## _ ## DEPTH ## _ ## OPT \ (uint8_t *dst, const int *block_offset, \ - int16_t *block, int stride, const uint8_t nnzc[6 * 8]); + int16_t *block, int stride, const uint8_t nnzc[5 * 8]); IDCT_ADD_REP_FUNC(8, 4, 8, mmx) IDCT_ADD_REP_FUNC(8, 4, 8, mmxext) @@ -74,7 +74,7 @@ IDCT_ADD_REP_FUNC(, 16intra, 10, avx) #define IDCT_ADD_REP_FUNC2(NUM, REP, DEPTH, OPT) \ void ff_h264_idct ## NUM ## _add ## REP ## _ ## DEPTH ## _ ## OPT \ (uint8_t **dst, const int *block_offset, \ - int16_t *block, int stride, const uint8_t nnzc[6 * 8]); + int16_t *block, int stride, const uint8_t nnzc[15 * 8]); IDCT_ADD_REP_FUNC2(, 8, 8, mmx) IDCT_ADD_REP_FUNC2(, 8, 8, mmxext)