From patchwork Tue Sep 20 01:29:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38064 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp1614499pzh; Mon, 19 Sep 2022 18:30:00 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4eKKJjvvcfPom/BMdIoo8DkpXx0BlBCBl2H8N8bt3TB7gEb6aOy3ppcEWSUpS5F87bNu3c X-Received: by 2002:a05:6402:d0b:b0:443:df38:9df with SMTP id eb11-20020a0564020d0b00b00443df3809dfmr17662641edb.9.1663637400583; Mon, 19 Sep 2022 18:30:00 -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 x99-20020a50baec000000b004543cc9a998si247585ede.76.2022.09.19.18.29.59; Mon, 19 Sep 2022 18:30:00 -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=QdIyplj6; 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 30D4468BA9B; Tue, 20 Sep 2022 04:29:56 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073082.outbound.protection.outlook.com [40.92.73.82]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B46E868B423 for ; Tue, 20 Sep 2022 04:29:49 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Z26ES3NXfMM42zG6YdWWb/o8/KPSJtjqqjqfgaMM3zXR2Z7Rfa5qni4mZDHvUsnWY2rDl/mSNYdi32CpJ2+iLHL3lPLQ13225kJmGcGq6ihzhdbsyoFIPwcw3JzNyhIqMBDh1nQO0tF0/vr/xgcQ1r8mJZTle2PfurkHxdnaMhSv8AoAUPfZHPN+n+gqQ69+NQCNWR89pxvwvHVSAew4uE2aYEt8gXOhYfOt0XpfHf/Y4U4iCUWqbkzBPeUFj0n+lUbQZ4t/eF1z+es/BfesoSz31KcwpQc7p2DueaiuyjZUxmRfnggEPIPsM8WPcuHhTYdndAUJ72gt/2lA2hGNMw== 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=g4dUoKrbHNOWcvPsFjbItQ7HGLgchzv3mgBDKZg/EXs=; b=WZUrbLwf79Tb7VZS5LE2lcWzP6FZg3m2M3kZ1bm7z774DB4Yk6bJKclJN9f/GATHcK7/021L3e89tmiGXg/1P7fqZbbU54R32+eBhAcnMjG+o0jJ6bTdAl9egrvogsRUp7vYkswoIdGjv5/+0H8ob3GjfN2q1RiPxqc8nNxISW68oSDITigSLyz1bufRw8PxaQA6f73Ltr8K64Wn/NyZs3pOscQOaw3A9csDyGXoWNdiPyVenswGaTFmJdxevSxcwmg0XG5JZCu6IUmmdl9kAFxhcmXZwdKVjz1J71uRVckyP9hDcSIQC2fREPPi/vgdmf2XoMKmS5mhcGK7vgO7CQ== 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=g4dUoKrbHNOWcvPsFjbItQ7HGLgchzv3mgBDKZg/EXs=; b=QdIyplj65FAXvaucz37+qCW3IpYfbp0LsuX6Sxq9+yhgCVJYQvAlHqsnBf9+iFqI+E9BjH+W/Owimmg7MbvfswnPKxGuOtpfIGBT/dBgxM8dooj3JtDAJbUZzuLBlJ73RydzuPB8FF6B2hqdh6pA3yiG2y+5CAZZ2xMoF/JmEe/dsCml3I+h5mkEQzBnBxUAxmCH8AtmRpcP6CEnVJ65JEsQduCpYqZEvjEzzj9ybtVf6iTIU/0OM2VPF7h7ZUqDzUnPm02MDLWyIurhCSiwhcbX2xydBHJXVMoYx6dyUH2x57f4LQNZ0UKZW4TxPniiQo+J787A9m9huzFqTQ+lRA== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AS4P250MB0415.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:4c2::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5632.15; Tue, 20 Sep 2022 01:29:47 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::f3f2:4362:56:4785]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::f3f2:4362:56:4785%8]) with mapi id 15.20.5632.019; Tue, 20 Sep 2022 01:29:46 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 20 Sep 2022 03:29:40 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [B6BPIFUdn9Fauldw6o08IPgXSSud1BP8UAu2QobNiNM=] X-ClientProxiedBy: ZR2P278CA0016.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:46::10) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20220920012942.3758820-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AS4P250MB0415:EE_ X-MS-Office365-Filtering-Correlation-Id: efe9578c-0dfe-4c04-b576-08da9aa79a69 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9Xmo/MW52haCYmaqkn6Dq/0uZNIzjh3sZJo9BHOkFrFemQD3uMfKyfiKFYVtlVOuBj9sLa8hHYb8vPYWvIfldcTHX6Z66vpMgodpZB/610P7NVPIPT2u5QdsN1FemdYFxxt2Num1KhCz1a8Jmze1hEUtpmj6sO78w3391YekuHqA9Bk7VBrhxBkLfc5MTmkLg3A3pLYOQXllniotyOM0EGsjgzFh2+6uBHSkkcstwJNsPxC+WgNMSkhla0O840IBQ0GmWQfe5JFBS2xno3XZGELiBPZ8vh31YsPXu3smc4BLp3H17rS376UV7uGArFSfbbf0nhbkArpHCC0eJVRhtHQtwjJIUbG0blOHn2/AfedvbRTi8F0ufUlNumaHg4ULAqXaA/EckU0uM/39yxQOjju7h9nYXp+KtzGqFKEaLSzh2uoulCLKNmfq1UV1+/jqwqGV5++/ngvHcJAUVM4jPMRx8mLQn1GYaEI7EZ58RFmj+2OfDoywKvS1WuKX8Y7/AWNxRpdkxdcmDTyUyb1FZFYUy52ijr97b8uGZJOhyWNo1BnGDM42eG7m7E+JB4b/Djhfi8UuIUgewc0ygEieWdOaZcMs3KaH7CtK79ymDO/XSJdxdszAUeMJerzh7aw1hvkbf+MOk8IVt0ef8Ih90pl5sbC6llq5jMjOsMm3xM2xDhpISoVNrOl8N0YYYNnMnECeBf49xX1HJtrEBGQjqlnDkR80T1ZirKpdG0aF/7qUct+fCxJZEWlHTNaYOgFmakW0= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: MXP5Rpt3SoXEWyHeBnjZOiNpTU5ZxzWnIULJhEs5EcHI/kdMqZdSGdGPQ06FfbXwtgxvA2Ju/HgJ+XTg9ftg7bzkvdJ/MBLeX7pe1JdslJcDhQ26PAeDyaYR8+5O8uZkGY3SBhx/ClustbmjJyIxeJiFNcfMSzG5kXGuW+7Ap+6NmiBXwhdJmQszZorr2UVxr/L1//uKY2UaV6fPUtTxb3Vqj4/ABClo+4DG3/qPvUsjAM8rzBzzw/Egk4UqT2LLp9BCUQZfVj8WREmVD4ydXOZtMHrps38alPL3FupJkOc+SjPkQFIQfm1cOThMY0F8sQ69QF8AfqmnNvI4FiuNWBy2yoE1SRw4rEFKzAjSMLDrBJ3aH36JCXyUBL+k/y9F3yP2K1bCM2fGIHTGVkXn5kljw4qbzdVTZkvzOE89Kd5OpCrJ3FFbRpw/DZcT4oBQPmmgbzzwHBbUEu/HGbuOLBvB1g5q4Q/BG3b8v2iBPNkNgN7kvkRK4QF9Tq+txC8o20TTdCIyUujsaCHp/1xCleZrs26Qy8xIgDgoH1C+Kxf0e4NU8niSlcKIhSSM6VDOkypwop7W+X+daszIg7lKwyFcWAI9yjGYb0HVlUN3aclWiqXyhOz6aW7/oxg0p44eLWOXs3oNjvOwOTSInUGOSw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: HgBY/eNze3JVuFDJgJwt6iLzTlYBfd5EBPijmA0eu0CsD4HxOJlAB4JyKIuRtvZdWG1yxyolI3jK9ZtKbRtuleiI7QHyzRpLqsRB7ixer0jYxRQjyy1sjwZoEp6r587UHKNMuba2Cvb2YBNx3Xnv+2P12KJP+y1i/zESAoqL/Qn9vRDTg8QFRg7pt2FHm6OXYEAGYzjCpo2ovrQVRsXRFaFBm1MOIerRvv4ucjN0qmGqV3v0FtiDkyUXwjueJzk2wd7vif0Jjdo0+gLMZT2c+9s7/Rzl/vS8lgDXAAebLib0zpDvg8i7JgE8eED0mINQ7f2EL3L7voEzPYXbKnqy1Ns8ILXrTu3Sq7FIDySQmpQq/E94VK1arCzbKVEge3iyz3DByeoe4NI8W6510VSlI5D/vUmGorq173vUMaYWp4mdnc4OtDTwp+Njctkb0IO1K7YC54aTXIAx7XLpSDGIlFi846uo8ZtxGZwmj4cZsftqPRK/ncLmKbAFN2NfEjl4ZyurGQn24CL+GrjXtb3t/kO4aKcbCazHeHlI9ABTHI6Qoc2YPg/LKqa0N/d+x+3V8euXyvZK/bZUIMCK0TAdokHK68w8YBo6j5kvVWnQQIhpO/wu1NQG8SdOzXNcFnHR1XDztNwr2jlW0RGLYl0qbdSykYk+DVwXURz/7MIcK0JOQKYcmUiYbaka91LOFNHFNos0BqTM+4WXHtk09l4+D/qyx73kbyaVBhOTkr3jFz9o72MLdeEFaLc99l0y+U6sGWdIWv3LMHQiOqj5WCGBRaN6red71BeO6ZKx7wLw3nmEB/wuQBZpqVsX6iCKLRGxjE+jvFLjHF9xwJY0A30XZfpjB5GLUS0RcUTFP5PVodkJoDGQg2EZMJttA2X16bXnHZOcIiwMxt0oV8oQdoA9ydwQiYgfjrkB+R3kj6EpMOinsQ6uuDSofxa5UGRnV/TVxHSq6aa28R4WqBuEr3pQfMVUNXxEVkT3S2AQ0VGcZnBOk24G+PFwhm2Mdh1PsXiDNZ40YuvBcvO8OQkaSq/yOZVjs9GuFKo2NGPxCzoXncbyouZGxIYIT+RYeaxOPwGarOEgraIZPhjrtclMnY+QwAl4U0Nqwm/GnVodEn6+hyAeifEccxd5XNwTMyNKpj9XPJG9MB0pNdcEtQoccpUUSqp4tohYFerk1eVoBabVyjTatZWIzy/k7jysAFU9b7EOHJ0PfD5GtnTjsKPYceh4vXN5G5rSh+MOvtglNaZmouPknOmuOAn4Cbph2hGRKVui0RmSiwWppflE0+f1hfar5tNWP9g90qKmWYf1ptc3kDP1x/kfpv8WOVFCIPz8KLuI X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: efe9578c-0dfe-4c04-b576-08da9aa79a69 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Sep 2022 01:29:46.9056 (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: AS4P250MB0415 Subject: [FFmpeg-devel] [PATCH 1/3] avcodec/cavsdsp: Remove unused function parameter 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: SbzoZIRoxJmM Signed-off-by: Andreas Rheinhardt --- libavcodec/cavs.c | 2 +- libavcodec/cavsdsp.c | 7 +++---- libavcodec/cavsdsp.h | 6 +++--- libavcodec/x86/cavsdsp.c | 7 +++---- 4 files changed, 10 insertions(+), 12 deletions(-) diff --git a/libavcodec/cavs.c b/libavcodec/cavs.c index 87bbe26f98..cba0a06e89 100644 --- a/libavcodec/cavs.c +++ b/libavcodec/cavs.c @@ -797,7 +797,7 @@ av_cold int ff_cavs_init(AVCodecContext *avctx) ff_h264chroma_init(&h->h264chroma, 8); ff_idctdsp_init(&h->idsp, avctx); ff_videodsp_init(&h->vdsp, 8); - ff_cavsdsp_init(&h->cdsp, avctx); + ff_cavsdsp_init(&h->cdsp); ff_init_scantable_permutation(h->idsp.idct_permutation, h->cdsp.idct_perm); ff_init_scantable(h->idsp.idct_permutation, &h->scantable, ff_zigzag_direct); diff --git a/libavcodec/cavsdsp.c b/libavcodec/cavsdsp.c index b096de452c..af46eaf8d2 100644 --- a/libavcodec/cavsdsp.c +++ b/libavcodec/cavsdsp.c @@ -22,8 +22,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include - #include "idctdsp.h" #include "mathops.h" #include "cavsdsp.h" @@ -548,7 +546,8 @@ CAVS_MC(avg_, 16) #define put_cavs_qpel16_mc00_c ff_put_pixels16x16_c #define avg_cavs_qpel16_mc00_c ff_avg_pixels16x16_c -av_cold void ff_cavsdsp_init(CAVSDSPContext* c, AVCodecContext *avctx) { +av_cold void ff_cavsdsp_init(CAVSDSPContext* c) +{ #define dspfunc(PFX, IDX, NUM) \ c->PFX ## _pixels_tab[IDX][ 0] = PFX ## NUM ## _mc00_c; \ c->PFX ## _pixels_tab[IDX][ 1] = PFX ## NUM ## _mc10_c; \ @@ -578,6 +577,6 @@ av_cold void ff_cavsdsp_init(CAVSDSPContext* c, AVCodecContext *avctx) { c->idct_perm = FF_IDCT_PERM_NONE; #if ARCH_X86 - ff_cavsdsp_init_x86(c, avctx); + ff_cavsdsp_init_x86(c); #endif } diff --git a/libavcodec/cavsdsp.h b/libavcodec/cavsdsp.h index 9ccaa0addd..2cd9298963 100644 --- a/libavcodec/cavsdsp.h +++ b/libavcodec/cavsdsp.h @@ -22,9 +22,9 @@ #ifndef AVCODEC_CAVSDSP_H #define AVCODEC_CAVSDSP_H +#include #include -#include "avcodec.h" #include "qpeldsp.h" typedef struct CAVSDSPContext { @@ -38,7 +38,7 @@ typedef struct CAVSDSPContext { int idct_perm; } CAVSDSPContext; -void ff_cavsdsp_init(CAVSDSPContext* c, AVCodecContext *avctx); -void ff_cavsdsp_init_x86(CAVSDSPContext* c, AVCodecContext *avctx); +void ff_cavsdsp_init(CAVSDSPContext* c); +void ff_cavsdsp_init_x86(CAVSDSPContext* c); #endif /* AVCODEC_CAVSDSP_H */ diff --git a/libavcodec/x86/cavsdsp.c b/libavcodec/x86/cavsdsp.c index 7ceb51a23c..4ad977a034 100644 --- a/libavcodec/x86/cavsdsp.c +++ b/libavcodec/x86/cavsdsp.c @@ -345,8 +345,7 @@ static void avg_cavs_qpel16_mc00_sse2(uint8_t *dst, const uint8_t *src, } #endif -static av_cold void cavsdsp_init_mmx(CAVSDSPContext *c, - AVCodecContext *avctx) +static av_cold void cavsdsp_init_mmx(CAVSDSPContext *c) { #if HAVE_MMX_EXTERNAL c->put_cavs_qpel_pixels_tab[1][0] = put_cavs_qpel8_mc00_mmx; @@ -369,12 +368,12 @@ CAVS_MC(avg_, 8, mmxext) CAVS_MC(avg_, 16, mmxext) #endif /* HAVE_MMXEXT_INLINE */ -av_cold void ff_cavsdsp_init_x86(CAVSDSPContext *c, AVCodecContext *avctx) +av_cold void ff_cavsdsp_init_x86(CAVSDSPContext *c) { av_unused int cpu_flags = av_get_cpu_flags(); if (X86_MMX(cpu_flags)) - cavsdsp_init_mmx(c, avctx); + cavsdsp_init_mmx(c); #if HAVE_MMXEXT_INLINE if (INLINE_MMXEXT(cpu_flags)) {