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)) { From patchwork Tue Sep 20 01:31:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38066 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp1615534pzh; Mon, 19 Sep 2022 18:32:04 -0700 (PDT) X-Google-Smtp-Source: AMsMyM437rXoYGj3r44TgB3N9KdVbMCk3pyo6qzvYXPyAWtzYLc+vp62bRddtvM4jzVWMi1r5/un X-Received: by 2002:a17:907:3d8e:b0:77b:fd55:affe with SMTP id he14-20020a1709073d8e00b0077bfd55affemr14607459ejc.498.1663637524442; Mon, 19 Sep 2022 18:32:04 -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 w14-20020a1709067c8e00b007316843d58bsi20479753ejo.925.2022.09.19.18.31.46; Mon, 19 Sep 2022 18:32:04 -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=DS80iQu2; 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 654D168BAC6; Tue, 20 Sep 2022 04:31:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-oln040092067072.outbound.protection.outlook.com [40.92.67.72]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 374B468B94F for ; Tue, 20 Sep 2022 04:31:37 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QIlJ8FCJrk+I8xyZ8UOiJGYhu0Vpmb8O3sHDggL5NEoSZoe3P7ebsjFWClCK1GLBR9LVLwT1oiVaxna6hPRQkDVq1QBp2epTt4874WUcVLYQyEC4fMzRfO5Dxje5kPtXyBDzXocJSgXJK7ETnYBKut5vB70Wbe19wiM09lubeTtl8Er7l3qg209IlMAt3CD/ztFrLCyMlfBKnyeKAzqBAS1Ovzy/I2tKuOnZmroQm4wO9kAHnsIvALONHOVbyHNI/UFnwrWrF8460yyEEKS8Pu+uAdWFG5ULdb9S9gYqYTTQeT9IM6cOIlrt0va+lT+jJ71165xrLAQ5W8uNCWDVPQ== 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=QUsjtesjXJlqtWqTZDmrgFGOv32ZDhHOO0MtiJL8eG4=; b=N9RnRDfa01jAlbRptXOQKqXJZd7/F2rXtjqJxQERHGVbWiUPd5SWkpLq3z/m4wbFjap/9s16wKiP14ukL7s+geEqoe+HKgtC/mQzkknOkz+GLC56XuFkE3+T6jFe/Eu6gf9slOiMSb394VCRHqX4FQncUnatmZNYNVUVN3iddqddYwoVRjw4HAolxNtZpdIqZpueeZ/s59uFYPxt61qFTCRkOy2MZbnWLVeH2MGTMF5sp63+Xw3MJFUTmSg2rH27TmqRd5pAVBtfnm+/pjOlDd0F+2oFVDUYeLo5uEyvc4GQvhFpd+SD8My9oZoByKJawDyYNGpqsWMQUVsA6ridvg== 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=QUsjtesjXJlqtWqTZDmrgFGOv32ZDhHOO0MtiJL8eG4=; b=DS80iQu2PBpsRkoclM+0M5KWnJK27++Zg5P3FJ323uuz5RLDosk9SyucvBr9XT2VBj8JOxJnZyBL23/aUnxKcNGxe5fJHBQW3g4IocpWOVRRimTp92/3GTzyV5i0O8Qlcc+zrmgqYLU9X3sDb6Ala9BX8F//gTZw0L3qxHH+actrdwKi+BO5Mdo+3mCJ0sOsw8DhfZTPhfHm98LY+SqBzwszXhtr/ZwGZke4oxmGQ328eSzi2VkS4SdZe857eA4y8m6P/qpDh9OkLoXQbmaPCnaCMPYP2amEpLdtmFEPRXYY6yocdUQQCHCo52KHYzQGnGTBwCEQcLxJcKBu9VE5Wg== 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:31:35 +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:31:35 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 20 Sep 2022 03:31:29 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [A6WqWGp9UgUNIsc4ilA2iNzY1X+ygjRmG4N8Y665UJc=] X-ClientProxiedBy: ZR2P278CA0001.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:50::9) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20220920013130.3759384-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: 72be7788-3be7-4d18-7b71-08da9aa7db2a X-MS-Exchange-SLBlob-MailProps: ZILSnhm0P3kyBfxgtFTZKWfNHcc7URYF0m9L4tNUm3RprvM9miKIfZ+Szz45qg5yj4oZ/b/d0uichUM3r0wLO9u7dE86g4rsbqMaa8mHNtu5gLl00zz9XemBxaUIh/E4Vw2fDE05zvUwtBDWemfrCwwF5AHVwBO6RlToCMraurgrZOqZSSdOGM/xeLVeoqgJdsVag5KvJfnR9IXf9ogIUGOS9al6flZvmpPe+v358Xhum2zpGcKPs8TYIjmOGjx2Q7c5NbbxHmSEg/tTasBqjhB3pcxZQBYh6UeWYPAx4lM1ox/EEm+QlHe41zKK9EXtFOpU4m1pwz5c0XWYAf1WNVSGXgymRqsA98fzvgH49X4v+ox/4Rm9E0FOh7D5MJjsG+regoa7WxNwmAuRtkMY0DO5PVTX7zQv7DmOMB+ham9ia+1ay3B/3sacW75zNlsIgutwD4N5zn6l9Afl9Oy6vMaumRLY+qt2akqq0CEQTthfBE+duGwwC4KmzOiDRW1++yQCle6fAEvygWljPJtMGy/F8VKlZjrNqOYh74EaoyxEDBQpIImPtnMSKDQViGKEdhT1Mm9HJzneeJQi92c/y0JTWvbo2vP3q96qjOhwgZFafzaHJJHEGH/zeYaZrdXAb/eDyAKOFhCEwLRd228Lol8bCokqUdxaOhJuzHH40uacH9DSWWOnoWbgRjtprNjPRt6j9A5WayAeFELx5omhOjFHCgFvqtWkGJQTgsvELm76iI5oIs6t02VHLJ5+1Pk0VVfHpIgwXjYa4RAZuPkQW7LHglJoyfJj X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: PoBpIH4ZpqVdHy3ocgo/CIZnmfbrb095TvIpSdQk5fPidtIL8+1488OQUg6jzo7m1KWb0jDGXodvI3GCN+UOF+U+6qrqG7MG8x0/EgQ6uSj0Z6lLhOv5hzZ9ExHe+nIhFCmCCSYt4L6TavLHQsMbGMxPt3luw6g5rl4xFo3GKXfPtFYlN54Fxu9sMaRXA2CohWvcRC8j1eHSvRp8m60x1uDXsXJk/1s5CSL07k//rsJV7vrITpC1yuIoEXmdhsNoQ01N2ofiWYBe8NXNrdN8nxFTsz39QZbBKO3vKH6/JAOkQvwMblELb0psj7PMctga9o4HdLTlVuWSuw6Kjm7u/wHNCrdp1yxAHlhR/Zhbogy09DSBeCd3hIwxXs7gtSio+fu8Vuk1srvilus9MlYdt8bSNi3+B+PuBaWsF4YDuEPEHQfOHN4gRkDglxiQE4oxtDz879jwPPSuwC8skmQeNG73GQOrktJR4Q9rKuLPC5CeeWm9GBb2CIxz4D2ul0w/Hq5JsNxbv1ABuP2o0S8Om9e6VFJAKtR6uVa8FNPTCEZ6m4pEpwjmlm6fC2ih4FW6lIsfKx4fyxlid6SBWRWkAdJGxbukzgutpan0XjQnlVTMb0S+5bd8M0wv30cqIWEYuVYDE6hUMH8YfYNIExY6pg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: GEf/WbDOXdPtR2RDUTTEPt/bvIB/ytJZ30fReGGorELw7sGBNaLiyIHSXL71iUfwL8eZ+dB26ulUQQdrQ+KD23wod1g5gILXYJkIcQjy6EnOeH7ZsxIHL1Jyu1O9U/eLL6YsZVn84oYrsPiqhJDF95/dMExjp0NiL0eudPEyujhbdJn/7RHoN7u8oCTCiVyDP8kDeZ3HirppfblfKQU31Z/5IL6XFSt4lWMxdLnjpJkfWu0/cHbNjzYy7xtF/qcSQQNCy0Q7yPhCzIBIDGZcuFvZ/6QkphWp66L9fFZgs2modeynRcSwdWObsn6nBPaLa4OH3Ek/cxh+0ZeMNfBcuDHYxx7TgeUaPRugvYqmYdaLMi7GBJyHZN8PifXVyc+SMNJdn6ObUUhEVTxMt80zJpvi9JFmCCnSCZNLlj7moh8wQkDGn6RHJN6GLvymIrAhZXFfSY7KdO7/9ORqsf/+7efAEa4jZ8b6Rzc5C6F62YrJhsqlU4bphEJka8/Hp1u++jYm/b0bP50HgW4+R5uip3NP778jJKVV7SwANMcFVMswaUoPJL5iLEFn3gq9BKuDNIEs0EkOSfRFkUaP5Lb/LPWZBmru5lLhijC9cqSWTICNFnLcLbgpJXAMw5b5eRM/X11xM7R/yWW/AkPb1z43IlUaSY1IIqld/Fv4Pi7zaWx+3qaPaduzSHA2fHx9huQ+zcVnHkEAfFKWPAYHDOzJ3AVLhBk6BCW8VQxH6M5IYb4dx1zRAO0a27e46qvsKyJrQ3cARSgxdABNH36WTAyK/YXY9NnampieMISOu5GH34q/VVq6jhuSZTEq+6BYetm3N4TLFB5HcRJCtC43bLPbaWslixH01IWz1fU0U7uRrc19HcWsXrV8K1qN+0t7ZVRqztBiaBqJGIpG7G0MIOGcHQTDahiRYDmZDNiPhDd+PReBd5+9vaHESgYXWOIE4obiRByntlAcQcH/Cp7SuDcFUJ+i0JuXQkVeZnm+1ZSvI9YSP7K3Acz4lc8R41gJ6cPJLaDKAetyImmgi9f9SbPhfd52L7jr/1lQIeP0vFm4OYWJeJILJmUaCtDSTvfh9npa5xZTEQFy/B0f1IfhuYDGYAvb93cRI+Kx4im3MDyHEDhY/E8ehOniH/Ks0KS9O6bZ3VuQWB5fNhIWU7HehAZH+EybvbWsTX2gEAJkSwbiGiaMsKA12cZ52xPDxfr2Wr53atrpEfpEihFAVhi0zbI91RI5ur5fH3lsXVa+k7oQ/fVYrM4qRtgAYHWE5yT2wAfPFQ+Eogb85P5r/OL5tgtnD+wHV240q4PMsRtxwAiWb4U= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 72be7788-3be7-4d18-7b71-08da9aa7db2a 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:31:35.5743 (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 2/3] avcodec/blockdsp: Remove unused AVCodecContext 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: +oyaa54gbpsm Possible since be95df12bb06b183c8d2aea3b0831fdf05466cf3. Signed-off-by: Andreas Rheinhardt --- libavcodec/4xm.c | 2 +- libavcodec/asvdec.c | 2 +- libavcodec/bink.c | 2 +- libavcodec/blockdsp.c | 5 ++--- libavcodec/blockdsp.h | 6 ++---- libavcodec/cavs.c | 2 +- libavcodec/dnxhddec.c | 2 +- libavcodec/dnxhdenc.c | 2 +- libavcodec/eamad.c | 2 +- libavcodec/eatqi.c | 2 +- libavcodec/g2meet.c | 2 +- libavcodec/intrax8.c | 2 +- libavcodec/jvdec.c | 2 +- libavcodec/mdec.c | 2 +- libavcodec/mimic.c | 2 +- libavcodec/mjpegdec.c | 2 +- libavcodec/mpegvideo.c | 2 +- libavcodec/mv30.c | 2 +- libavcodec/proresdec2.c | 2 +- libavcodec/speedhq.c | 2 +- libavcodec/vc1dec.c | 2 +- libavcodec/wmv2.c | 2 +- libavcodec/x86/blockdsp_init.c | 3 +-- tests/checkasm/blockdsp.c | 3 +-- 24 files changed, 26 insertions(+), 31 deletions(-) diff --git a/libavcodec/4xm.c b/libavcodec/4xm.c index 6015fe5299..5636fdef2d 100644 --- a/libavcodec/4xm.c +++ b/libavcodec/4xm.c @@ -1012,7 +1012,7 @@ static av_cold int decode_init(AVCodecContext *avctx) return AVERROR(ENOMEM); f->version = AV_RL32(avctx->extradata) >> 16; - ff_blockdsp_init(&f->bdsp, avctx); + ff_blockdsp_init(&f->bdsp); ff_bswapdsp_init(&f->bbdsp); f->avctx = avctx; diff --git a/libavcodec/asvdec.c b/libavcodec/asvdec.c index c8c50cc8d4..4ca370d1ec 100644 --- a/libavcodec/asvdec.c +++ b/libavcodec/asvdec.c @@ -292,7 +292,7 @@ static av_cold int decode_init(AVCodecContext *avctx) } ff_asv_common_init(avctx); - ff_blockdsp_init(&a->bdsp, avctx); + ff_blockdsp_init(&a->bdsp); ff_idctdsp_init(&a->idsp, avctx); ff_init_scantable(a->idsp.idct_permutation, &a->scantable, ff_asv_scantab); avctx->pix_fmt = AV_PIX_FMT_YUV420P; diff --git a/libavcodec/bink.c b/libavcodec/bink.c index e43ff1f4fa..e3971e557a 100644 --- a/libavcodec/bink.c +++ b/libavcodec/bink.c @@ -1384,7 +1384,7 @@ static av_cold int decode_init(AVCodecContext *avctx) avctx->pix_fmt = c->has_alpha ? AV_PIX_FMT_YUVA420P : AV_PIX_FMT_YUV420P; avctx->color_range = c->version == 'k' ? AVCOL_RANGE_JPEG : AVCOL_RANGE_MPEG; - ff_blockdsp_init(&c->bdsp, avctx); + ff_blockdsp_init(&c->bdsp); ff_hpeldsp_init(&hdsp, avctx->flags); c->put_pixels_tab = hdsp.put_pixels_tab[1][0]; ff_binkdsp_init(&c->binkdsp); diff --git a/libavcodec/blockdsp.c b/libavcodec/blockdsp.c index c8f85dd202..98f06c5d16 100644 --- a/libavcodec/blockdsp.c +++ b/libavcodec/blockdsp.c @@ -21,7 +21,6 @@ #include "config.h" #include "libavutil/attributes.h" -#include "avcodec.h" #include "blockdsp.h" static void clear_block_c(int16_t *block) @@ -56,7 +55,7 @@ static void fill_block8_c(uint8_t *block, uint8_t value, ptrdiff_t line_size, } } -av_cold void ff_blockdsp_init(BlockDSPContext *c, AVCodecContext *avctx) +av_cold void ff_blockdsp_init(BlockDSPContext *c) { c->clear_block = clear_block_c; c->clear_blocks = clear_blocks_c; @@ -71,7 +70,7 @@ av_cold void ff_blockdsp_init(BlockDSPContext *c, AVCodecContext *avctx) #elif ARCH_PPC ff_blockdsp_init_ppc(c); #elif ARCH_X86 - ff_blockdsp_init_x86(c, avctx); + ff_blockdsp_init_x86(c); #elif ARCH_MIPS ff_blockdsp_init_mips(c); #endif diff --git a/libavcodec/blockdsp.h b/libavcodec/blockdsp.h index 58eecffb07..d853adada2 100644 --- a/libavcodec/blockdsp.h +++ b/libavcodec/blockdsp.h @@ -22,8 +22,6 @@ #include #include -#include "avcodec.h" - /* add and put pixel (decoding) * Block sizes for op_pixels_func are 8x4,8x8 16x8 16x16. * h for op_pixels_func is limited to { width / 2, width }, @@ -38,12 +36,12 @@ typedef struct BlockDSPContext { op_fill_func fill_block_tab[2]; } BlockDSPContext; -void ff_blockdsp_init(BlockDSPContext *c, AVCodecContext *avctx); +void ff_blockdsp_init(BlockDSPContext *c); void ff_blockdsp_init_alpha(BlockDSPContext *c); void ff_blockdsp_init_arm(BlockDSPContext *c); void ff_blockdsp_init_ppc(BlockDSPContext *c); -void ff_blockdsp_init_x86(BlockDSPContext *c, AVCodecContext *avctx); +void ff_blockdsp_init_x86(BlockDSPContext *c); void ff_blockdsp_init_mips(BlockDSPContext *c); #endif /* AVCODEC_BLOCKDSP_H */ diff --git a/libavcodec/cavs.c b/libavcodec/cavs.c index cba0a06e89..6d54e8eae5 100644 --- a/libavcodec/cavs.c +++ b/libavcodec/cavs.c @@ -793,7 +793,7 @@ av_cold int ff_cavs_init(AVCodecContext *avctx) { AVSContext *h = avctx->priv_data; - ff_blockdsp_init(&h->bdsp, avctx); + ff_blockdsp_init(&h->bdsp); ff_h264chroma_init(&h->h264chroma, 8); ff_idctdsp_init(&h->idsp, avctx); ff_videodsp_init(&h->vdsp, 8); diff --git a/libavcodec/dnxhddec.c b/libavcodec/dnxhddec.c index 17b7179927..a44f95f044 100644 --- a/libavcodec/dnxhddec.c +++ b/libavcodec/dnxhddec.c @@ -273,7 +273,7 @@ static int dnxhd_decode_header(DNXHDContext *ctx, AVFrame *frame, ctx->avctx->bits_per_raw_sample = ctx->bit_depth = bitdepth; if (ctx->bit_depth != old_bit_depth) { - ff_blockdsp_init(&ctx->bdsp, ctx->avctx); + ff_blockdsp_init(&ctx->bdsp); ff_idctdsp_init(&ctx->idsp, ctx->avctx); ff_init_scantable(ctx->idsp.idct_permutation, &ctx->scantable, ff_zigzag_direct); diff --git a/libavcodec/dnxhdenc.c b/libavcodec/dnxhdenc.c index e1008ec776..b7dc54f86a 100644 --- a/libavcodec/dnxhdenc.c +++ b/libavcodec/dnxhdenc.c @@ -419,7 +419,7 @@ static av_cold int dnxhd_encode_init(AVCodecContext *avctx) avctx->bits_per_raw_sample = ctx->bit_depth; - ff_blockdsp_init(&ctx->bdsp, avctx); + ff_blockdsp_init(&ctx->bdsp); ff_fdctdsp_init(&ctx->m.fdsp, avctx); ff_mpv_idct_init(&ctx->m); ff_mpegvideoencdsp_init(&ctx->m.mpvencdsp, avctx); diff --git a/libavcodec/eamad.c b/libavcodec/eamad.c index 7ce2ce36c8..2a5aac912d 100644 --- a/libavcodec/eamad.c +++ b/libavcodec/eamad.c @@ -69,7 +69,7 @@ static av_cold int decode_init(AVCodecContext *avctx) MadContext *s = avctx->priv_data; s->avctx = avctx; avctx->pix_fmt = AV_PIX_FMT_YUV420P; - ff_blockdsp_init(&s->bdsp, avctx); + ff_blockdsp_init(&s->bdsp); ff_bswapdsp_init(&s->bbdsp); ff_idctdsp_init(&s->idsp, avctx); ff_init_scantable_permutation(s->idsp.idct_permutation, FF_IDCT_PERM_NONE); diff --git a/libavcodec/eatqi.c b/libavcodec/eatqi.c index 4799f75886..324e6f1ced 100644 --- a/libavcodec/eatqi.c +++ b/libavcodec/eatqi.c @@ -62,7 +62,7 @@ static av_cold int tqi_decode_init(AVCodecContext *avctx) { TqiContext *t = avctx->priv_data; - ff_blockdsp_init(&t->bdsp, avctx); + ff_blockdsp_init(&t->bdsp); ff_bswapdsp_init(&t->bsdsp); ff_idctdsp_init(&t->idsp, avctx); ff_init_scantable_permutation(t->idsp.idct_permutation, FF_IDCT_PERM_NONE); diff --git a/libavcodec/g2meet.c b/libavcodec/g2meet.c index 080544de8b..4367af3dc0 100644 --- a/libavcodec/g2meet.c +++ b/libavcodec/g2meet.c @@ -180,7 +180,7 @@ static av_cold int jpg_init(AVCodecContext *avctx, JPGContext *c) if (ret) return ret; - ff_blockdsp_init(&c->bdsp, avctx); + ff_blockdsp_init(&c->bdsp); ff_idctdsp_init(&c->idsp, avctx); ff_init_scantable(c->idsp.idct_permutation, &c->scantable, ff_zigzag_direct); diff --git a/libavcodec/intrax8.c b/libavcodec/intrax8.c index e82cb8680e..f88baf8daf 100644 --- a/libavcodec/intrax8.c +++ b/libavcodec/intrax8.c @@ -722,7 +722,7 @@ av_cold int ff_intrax8_common_init(AVCodecContext *avctx, ff_wmv1_scantable[3]); ff_intrax8dsp_init(&w->dsp); - ff_blockdsp_init(&w->bdsp, avctx); + ff_blockdsp_init(&w->bdsp); ff_thread_once(&init_static_once, x8_vlc_init); diff --git a/libavcodec/jvdec.c b/libavcodec/jvdec.c index dd7e4a93ef..e0287a9cb9 100644 --- a/libavcodec/jvdec.c +++ b/libavcodec/jvdec.c @@ -56,7 +56,7 @@ static av_cold int decode_init(AVCodecContext *avctx) return AVERROR(ENOMEM); avctx->pix_fmt = AV_PIX_FMT_PAL8; - ff_blockdsp_init(&s->bdsp, avctx); + ff_blockdsp_init(&s->bdsp); return 0; } diff --git a/libavcodec/mdec.c b/libavcodec/mdec.c index c8994f68ee..f27cf84122 100644 --- a/libavcodec/mdec.c +++ b/libavcodec/mdec.c @@ -219,7 +219,7 @@ static av_cold int decode_init(AVCodecContext *avctx) a->avctx = avctx; - ff_blockdsp_init(&a->bdsp, avctx); + ff_blockdsp_init(&a->bdsp); ff_bswapdsp_init(&a->bbdsp); ff_idctdsp_init(&a->idsp, avctx); ff_mpeg12_init_vlcs(); diff --git a/libavcodec/mimic.c b/libavcodec/mimic.c index 1d4f2b85c1..74eaa7d043 100644 --- a/libavcodec/mimic.c +++ b/libavcodec/mimic.c @@ -133,7 +133,7 @@ static av_cold int mimic_decode_init(AVCodecContext *avctx) ctx->prev_index = 0; ctx->cur_index = 15; - ff_blockdsp_init(&ctx->bdsp, avctx); + ff_blockdsp_init(&ctx->bdsp); ff_bswapdsp_init(&ctx->bbdsp); ff_hpeldsp_init(&ctx->hdsp, avctx->flags); ff_idctdsp_init(&ctx->idsp, avctx); diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index ca7e752f16..5b7a8b1e7c 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -134,7 +134,7 @@ av_cold int ff_mjpeg_decode_init(AVCodecContext *avctx) s->pkt = avctx->internal->in_pkt; s->avctx = avctx; - ff_blockdsp_init(&s->bdsp, avctx); + ff_blockdsp_init(&s->bdsp); ff_hpeldsp_init(&s->hdsp, avctx->flags); init_idct(avctx); s->buffer_size = 0; diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 86fe5e4022..d8c7bc687d 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -281,7 +281,7 @@ static void gray8(uint8_t *dst, const uint8_t *src, ptrdiff_t linesize, int h) /* init common dct for both encoder and decoder */ static av_cold int dct_init(MpegEncContext *s) { - ff_blockdsp_init(&s->bdsp, s->avctx); + ff_blockdsp_init(&s->bdsp); ff_h264chroma_init(&s->h264chroma, 8); //for lowres ff_hpeldsp_init(&s->hdsp, s->avctx->flags); ff_mpegvideodsp_init(&s->mdsp); diff --git a/libavcodec/mv30.c b/libavcodec/mv30.c index 03be4ddd9d..24b04400fd 100644 --- a/libavcodec/mv30.c +++ b/libavcodec/mv30.c @@ -670,7 +670,7 @@ static av_cold int decode_init(AVCodecContext *avctx) avctx->pix_fmt = AV_PIX_FMT_YUV420P; avctx->color_range = AVCOL_RANGE_JPEG; - ff_blockdsp_init(&s->bdsp, avctx); + ff_blockdsp_init(&s->bdsp); s->prev_frame = av_frame_alloc(); if (!s->prev_frame) diff --git a/libavcodec/proresdec2.c b/libavcodec/proresdec2.c index 5ec579b994..b0d7f8d5d5 100644 --- a/libavcodec/proresdec2.c +++ b/libavcodec/proresdec2.c @@ -177,7 +177,7 @@ static av_cold int decode_init(AVCodecContext *avctx) av_log(avctx, AV_LOG_DEBUG, "Auto bitdepth precision. Use 12b decoding based on codec tag.\n"); } - ff_blockdsp_init(&ctx->bdsp, avctx); + ff_blockdsp_init(&ctx->bdsp); ret = ff_proresdsp_init(&ctx->prodsp, avctx); if (ret < 0) { av_log(avctx, AV_LOG_ERROR, "Fail to init proresdsp for bits per raw sample %d\n", avctx->bits_per_raw_sample); diff --git a/libavcodec/speedhq.c b/libavcodec/speedhq.c index 4f0e417a82..11d3311794 100644 --- a/libavcodec/speedhq.c +++ b/libavcodec/speedhq.c @@ -665,7 +665,7 @@ static av_cold int speedhq_decode_init(AVCodecContext *avctx) if (ret) return AVERROR_UNKNOWN; - ff_blockdsp_init(&s->bdsp, avctx); + ff_blockdsp_init(&s->bdsp); ff_idctdsp_init(&s->idsp, avctx); ff_init_scantable(s->idsp.idct_permutation, &s->intra_scantable, ff_zigzag_direct); diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c index 9f32e82f9e..fa6b5cfd3c 100644 --- a/libavcodec/vc1dec.c +++ b/libavcodec/vc1dec.c @@ -540,7 +540,7 @@ static av_cold int vc1_decode_init(AVCodecContext *avctx) // That this is necessary might indicate a bug. ff_vc1_decode_end(avctx); - ff_blockdsp_init(&s->bdsp, avctx); + ff_blockdsp_init(&s->bdsp); ff_h264chroma_init(&v->h264chroma, 8); ff_qpeldsp_init(&s->qdsp); diff --git a/libavcodec/wmv2.c b/libavcodec/wmv2.c index 5fea009e12..07a5d14f90 100644 --- a/libavcodec/wmv2.c +++ b/libavcodec/wmv2.c @@ -29,7 +29,7 @@ av_cold void ff_wmv2_common_init(MpegEncContext *s) { WMV2Context *const w = s->private_ctx; - ff_blockdsp_init(&s->bdsp, s->avctx); + ff_blockdsp_init(&s->bdsp); ff_wmv2dsp_init(&w->wdsp); s->idsp.perm_type = w->wdsp.idct_perm; ff_init_scantable_permutation(s->idsp.idct_permutation, diff --git a/libavcodec/x86/blockdsp_init.c b/libavcodec/x86/blockdsp_init.c index b0ff9376d9..996124114f 100644 --- a/libavcodec/x86/blockdsp_init.c +++ b/libavcodec/x86/blockdsp_init.c @@ -29,8 +29,7 @@ void ff_clear_block_avx(int16_t *block); void ff_clear_blocks_sse(int16_t *blocks); void ff_clear_blocks_avx(int16_t *blocks); -av_cold void ff_blockdsp_init_x86(BlockDSPContext *c, - AVCodecContext *avctx) +av_cold void ff_blockdsp_init_x86(BlockDSPContext *c) { #if HAVE_X86ASM int cpu_flags = av_get_cpu_flags(); diff --git a/tests/checkasm/blockdsp.c b/tests/checkasm/blockdsp.c index 9e6ce9d7d1..99d79209e4 100644 --- a/tests/checkasm/blockdsp.c +++ b/tests/checkasm/blockdsp.c @@ -57,10 +57,9 @@ void checkasm_check_blockdsp(void) LOCAL_ALIGNED_32(uint16_t, buf0, [6 * 8 * 8]); LOCAL_ALIGNED_32(uint16_t, buf1, [6 * 8 * 8]); - AVCodecContext avctx = { 0 }; BlockDSPContext h; - ff_blockdsp_init(&h, &avctx); + ff_blockdsp_init(&h); check_clear(clear_block, 8 * 8); check_clear(clear_blocks, 8 * 8 * 6); From patchwork Tue Sep 20 01:31:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38065 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp1615537pzh; Mon, 19 Sep 2022 18:32:04 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5D72bWbNSN/eyr0koXhwMOrEIGPn+gPRkeQu0Yxh6gBIzdFZwfDxZ5XD442jJQb+UG0u1L X-Received: by 2002:a17:907:2c54:b0:77d:971f:be12 with SMTP id hf20-20020a1709072c5400b0077d971fbe12mr14486834ejc.560.1663637524602; Mon, 19 Sep 2022 18:32:04 -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 b8-20020a056402350800b004515d9b26d3si253349edd.406.2022.09.19.18.31.55; Mon, 19 Sep 2022 18:32:04 -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=ieU2seCq; 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 6CA1868BAEC; Tue, 20 Sep 2022 04:31:49 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-oln040092067072.outbound.protection.outlook.com [40.92.67.72]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 56DE768BA7C for ; Tue, 20 Sep 2022 04:31:42 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AMuxvY7tfwtAYAy2cW5UTeCJ7PASn+xCzfJB7Ifs5M/C5Ug/MfrlWekJJkmCJLV/EsSFrnHCeG0Tixpuklo8rjMvf6C3yseUtCGnySlOSr5zgkd7zOSh6NoMDaMDCnHBHwdHER8W+f4BpLSZxpxntI5+DS63VOyUeP2jmEkTn0ymAR3YP6cio2xKE+VTOiqXzfq5j1PLZqGu7MKzIwULTngQzC2L+/3c/35K1yxrJVi2MXTz/6wmPU4SZ2zJNbL/Cskz36AmfSnJzwu3kPYjXgMUAhyi/KrRkhGeS9Ufu2OYfFfebNBfCpr0/4wsT40xmtN/D9rc2CWNliJ0dLS72Q== 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=YyyYvK68HdzVQpR2ylvXoiwkaeG+PSjsfEhGfVCJSw8=; b=I3yEVT14DOsblhuaMnok9SstB97xD7l3gCJhhk1IPXhFfgAIuDzaK6CmPk+QJjKgxlcAiVuy7nn+Jiu0+bpc6G1xojvZsdKXANzGdw8ygV2MBCAQZgHaH+laOFzZbtOmXC3vRAdk3sfcI7nPtzq0lBkY6Lm+WUHvBFTMXEjj6ApRJXXbWA2Ich992+uLi4BKh0AvjsCWY4/sSIyOr67jRmzIcv9X2cGxzsfF3nYXd47BeSIEL/tPwffsXc5Yf5qntgIsb5UaHaJGTwxWcWFyY34YFGmFLWOXKnEftc4BAgAfqiyl6do8YktK4sjBgJfzKsyYfiGgACY+WTd4BZXPsQ== 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=YyyYvK68HdzVQpR2ylvXoiwkaeG+PSjsfEhGfVCJSw8=; b=ieU2seCqSkdJQAlJDmFHezJOThmFF3/6hBLbIo6gDyON8dHs/nBiyEBVvxl/vqWB5ewV2ItW6XUpPbrCuyNlaZlXlIcY/4LZx5P3hA6BSDs90fRf5JMfqp9CbKiTEMr5LwXEXaJ1g16Nys5UW/jN1f92uV84KtWGx2Y3WbAZQxLCNDXrCMcJcAFc95l6/e/LOexY4VGXG6Mp66YtYSC//7bd+FC1o4aOblI5B+hKWo7EBCted6WW3VgT0Td6i5vkCWFIB219MV/LY2PVMM/fZV1N1Gv00J2D6k3WYd/vh2JNnpVsYQNRycpMhpCLHqT6Pk/J0Jof5bj1fbq1nMoBUg== 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:31:38 +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:31:38 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 20 Sep 2022 03:31:30 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [OpCIPRiVyukqncmV/hdOAYgo+DOdoHS8vZjDUuUQzJY=] X-ClientProxiedBy: ZR2P278CA0001.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:50::9) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20220920013130.3759384-2-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: 45425301-8a08-4522-4283-08da9aa7dce1 X-MS-Exchange-SLBlob-MailProps: ZILSnhm0P3kyBfxgtFTZKWfNHcc7URYFZYOYnCgWNORgSjyy/GMxV+EnFeipdg+Oe0LDfqhzy374+pxBMGE5n7p0nFCUJgVeqZAGrFHxElzmqpmze377HiKg+BkGxakY8chwXdNZ2yTPHMwmk3vAOeWUwS/hr2z9k97w1VEF0pcYXeSCvPhqJSwPA24NB5rpTZ3PL/0qG83PRH7gR3krfQj5QB9rWq5nB9vhFeBCSNdnHXohyBi44nvHMPq/LmNoibBkHDtFLILTstwIhCnp46iFqz0vfpEw+DRdMXT2nXEUEDQ3D1V5Wfp4ENQfS83Mk3S+C1mElZE5NCSju6ZjjxpuHmT23/+Gtn8e+8n9Qh97Df+HsHkAKir94lyApY90sjlwE7wvNVsv3ha0xmNiYTBvDFgr9UA5cUS15jzi1iLBHCZrgByPr+U4Pn4JZNb1O7kQR5BzQhPOftwDYbH3qdB+OO0Fq+wl7Ee/avwAnJD12SXMhqvXXXqHCSx9nXTw3IPVzgQ1lOmUWJ0vNTQgjBV5ivz5mC26lhTVTXz3+h6D6Pf2/BN1J7+45LWWqZE/27mI4OSXO5LSj3GrJ/dBjxlBd/1U8jkmrR9q2QfGPxNcBjzlNBCZ01HSXaFZ/YymKJ9CIPSw/Kjk7NH6zneYo6oOfFPKVLfNc78jD1hCMSHi564r+0R0qZqnLurYgU25Qm3u5aor0dqkNq6snhMRNYjAF+ZuwZKq0CasHFZvKHHC49Rbx6ek6PRMVQpa4SnskizfC8Bzf9YyeKSVrm95WmGpD4w4wa/y X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: PKh4Mh7iRKf4I+3SSvr/yeVcR8FrsjlGkjnzj6RkrBoxyOpWqQG9QHjbs+BC1iJGvN5PBU0TEApiWdMCF886yuhbqdQM1d9c3gF4NWDvntyavMb0DD+ECLLXHpd/JasduhANcKy2hmVtNrJhOnH4TcoplV8QvvHMvmnlqTv7v8VteqAElHZQgWn140dh3Hzt17lpztk9KAHCS12l9psLpnNyiqmGUmBGpWnekkhyCRQ/lMadCGg+M4Ffu7gEGFSD6B2CwE/4sdgU/LOeCW8DuHWSrSmdOvMAOsWaq4qvgw2aLr/0Uv4NMWhG6FSkyiO0CsrtyevTL3SPoye5TN3lFDFzN0iFjOkIOjGyWOoUDr92xyvthx8PYWfuv7ApEcyfum+y0hpBXfyLc8W8iAufENGRZ8J+JFEVledLtkAc5h6/QUFxbzy65SbVjtogGfPhMcdLz8M27yR+nqHyfiT+K5Toyg7yxYRpkP+tLgUZjGEYtg8mARf9jg78EuNHO3wjPeD0mcOdQkInmvPaIO3+udyb2INHF10Rmmcn1548FzgETdl4F8sg/rb5KSQXDqA6chYMTViFGkEdI9HzbNXbXMajYsuVtWXDfivA3FFneekfmAOo/VuvNZIPwEFXXOJP7fsssVtGlzWLMF9xUDZqaA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: g1LBb+hRDOrfOIQyjQTKKjL4iXU8fmBVdnj5gSq4brtah4+dznaCJ+2WfjPmdxNy2Wlg2sNIELChERUvqGzvtjYOpzF4Z3XgBCUO1v9LQDdRTTlfLFvvKXdvt4LE1v+weqVj/sye022jsUrMO6tVPZHSrG6Hvros1k8bykxoSF35zoMWRQjNWJNlbF1gx7tvvYQxeBcai5RrvRoZOUXkLHDXmJkRpcGIQtphDSTo8tG+Pl9QKZsar1y/xVeWISR+0CrI5XSi+JdodXke2WixNm6HPWpv1QqjdIYgLS0yv2bRIr+gWF5blDMct3WY9fSXXsveFa6WsYRGU6aWFMBdZTkRXtYQRFcIALfnQG7dAOP+dgicuF+tCch2RAmEhdV1kmVgrVT3o3If4vFPzfLnExvOmGBtCXdkzfJp5QaRxEH4GPe3YBt0TGJskIMzLhq8sQz4YC0yZpg3I2XeNFoq+7QPPb5zHx4y/skMX4emSaM2EUns3opLNxLHOY3m9Oxfus88JmJD6aBLJZRFhkfYCp6ZLVmoTCGk6nJ3yt6dzOmZRhj8XXH71rYp0WFexkPKX3ML6iVfl/1IKgSg5++H00ad+kfBEDuWUzAqg5TBKU2+8zTzVG0sdEQTLl8DBJSNvkcEe4bpv+CcVXu4h9eZQWgUGTJeAyvDTnehydiONMEqspYQRag7uztctXb+rac8sO3hKdIdJ6UBJuDre5oYLAz5nUpDGVK5KIlCgYO5L19FSpJwdnHn9XoCfvrvcJpJlFSnGhPrJEdSr94siPvLCigKV9wW/hRNY4F9AOxLfZhMcpr5q5YRsthyQVs+9DpvrGW8qW17oOLSV02ZJA9oBagUFPBNZxgu56tKDLwKa799ZyPXTKBiPlMrK0uBa36VuAmAbwBfM7WPBEm5HDoKPCjkF665Bxl+YiJNzNm13IRkGJ7gX/cmiOGj+/tGs4wtYg2Aalj5S1kCDwwt2rSgQcnrBHZtmMwP7s2enoCrpHV73oxK1x8Q5XxqxR0NxZM+IoQgrKjfQcm58Qu88laXxcGhnQi7hA1XMkmMkFbmfHgfZg7p7+/i56GNI7oOmIE1Li9kTEuiglt4AXUYzCrT5n3WVpt6jOSYuE110mPtxBEf5fyhdkpFTNu4H1kBiC2NdcS4XdU9Z1ciCt0rh7ZvJbNdIOnL1r5f/9rjSNLx6EKjp0mXVz/ArpO8zHUnEbndEKBYQ6Bet0MJFJ6HAZqUlp1lKHORVSvuHGYMsqjh20+mtD95gNtr7JeD5XnlzhUxawJz2LSc1DNSctHtQtgjF8Uv97gAu9Dorf4pIHKq4pI= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 45425301-8a08-4522-4283-08da9aa7dce1 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:31:38.4187 (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 3/3] avcodec/fmtconvert: Remove unused AVCodecContext 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: 08Ou6SIyAt8T Unused since d74a8cb7e42f703be5796eeb485f06af710ae8ca. Signed-off-by: Andreas Rheinhardt --- libavcodec/aarch64/fmtconvert_init.c | 4 +--- libavcodec/ac3dec.c | 2 +- libavcodec/ac3dec.h | 1 + libavcodec/arm/fmtconvert_init_arm.c | 3 +-- libavcodec/fmtconvert.c | 11 +++++------ libavcodec/fmtconvert.h | 12 ++++++------ libavcodec/mips/fmtconvert_mips.c | 1 - libavcodec/ppc/fmtconvert_altivec.c | 3 +-- libavcodec/x86/fmtconvert_init.c | 2 +- tests/checkasm/fmtconvert.c | 2 +- 10 files changed, 18 insertions(+), 23 deletions(-) diff --git a/libavcodec/aarch64/fmtconvert_init.c b/libavcodec/aarch64/fmtconvert_init.c index 210e74b654..e0990afabc 100644 --- a/libavcodec/aarch64/fmtconvert_init.c +++ b/libavcodec/aarch64/fmtconvert_init.c @@ -22,7 +22,6 @@ #include "libavutil/attributes.h" #include "libavutil/aarch64/cpu.h" -#include "libavcodec/avcodec.h" #include "libavcodec/fmtconvert.h" void ff_int32_to_float_fmul_array8_neon(FmtConvertContext *c, float *dst, @@ -31,8 +30,7 @@ void ff_int32_to_float_fmul_array8_neon(FmtConvertContext *c, float *dst, void ff_int32_to_float_fmul_scalar_neon(float *dst, const int32_t *src, float mul, int len); -av_cold void ff_fmt_convert_init_aarch64(FmtConvertContext *c, - AVCodecContext *avctx) +av_cold void ff_fmt_convert_init_aarch64(FmtConvertContext *c) { int cpu_flags = av_get_cpu_flags(); diff --git a/libavcodec/ac3dec.c b/libavcodec/ac3dec.c index 5d0add40fe..ac6298d57e 100644 --- a/libavcodec/ac3dec.c +++ b/libavcodec/ac3dec.c @@ -205,7 +205,7 @@ static av_cold int ac3_decode_init(AVCodecContext *avctx) #if (USE_FIXED) s->fdsp = avpriv_alloc_fixed_dsp(avctx->flags & AV_CODEC_FLAG_BITEXACT); #else - ff_fmt_convert_init(&s->fmt_conv, avctx); + ff_fmt_convert_init(&s->fmt_conv); s->fdsp = avpriv_float_dsp_alloc(avctx->flags & AV_CODEC_FLAG_BITEXACT); #endif if (!s->fdsp) diff --git a/libavcodec/ac3dec.h b/libavcodec/ac3dec.h index 9444124974..88651ae61f 100644 --- a/libavcodec/ac3dec.h +++ b/libavcodec/ac3dec.h @@ -57,6 +57,7 @@ #include "ac3.h" #include "ac3dsp.h" +#include "avcodec.h" #include "bswapdsp.h" #include "get_bits.h" #include "fft.h" diff --git a/libavcodec/arm/fmtconvert_init_arm.c b/libavcodec/arm/fmtconvert_init_arm.c index e88255d619..e12f83c842 100644 --- a/libavcodec/arm/fmtconvert_init_arm.c +++ b/libavcodec/arm/fmtconvert_init_arm.c @@ -22,7 +22,6 @@ #include "libavutil/attributes.h" #include "libavutil/arm/cpu.h" -#include "libavcodec/avcodec.h" #include "libavcodec/fmtconvert.h" void ff_int32_to_float_fmul_array8_neon(FmtConvertContext *c, float *dst, @@ -37,7 +36,7 @@ void ff_int32_to_float_fmul_array8_vfp(FmtConvertContext *c, float *dst, const int32_t *src, const float *mul, int len); -av_cold void ff_fmt_convert_init_arm(FmtConvertContext *c, AVCodecContext *avctx) +av_cold void ff_fmt_convert_init_arm(FmtConvertContext *c) { int cpu_flags = av_get_cpu_flags(); diff --git a/libavcodec/fmtconvert.c b/libavcodec/fmtconvert.c index 00f55f8f1e..cedfd61138 100644 --- a/libavcodec/fmtconvert.c +++ b/libavcodec/fmtconvert.c @@ -22,7 +22,6 @@ #include "config.h" #include "libavutil/attributes.h" -#include "avcodec.h" #include "fmtconvert.h" static void int32_to_float_fmul_scalar_c(float *dst, const int32_t *src, @@ -42,19 +41,19 @@ static void int32_to_float_fmul_array8_c(FmtConvertContext *c, float *dst, c->int32_to_float_fmul_scalar(&dst[i], &src[i], *mul++, 8); } -av_cold void ff_fmt_convert_init(FmtConvertContext *c, AVCodecContext *avctx) +av_cold void ff_fmt_convert_init(FmtConvertContext *c) { c->int32_to_float_fmul_scalar = int32_to_float_fmul_scalar_c; c->int32_to_float_fmul_array8 = int32_to_float_fmul_array8_c; #if ARCH_AARCH64 - ff_fmt_convert_init_aarch64(c, avctx); + ff_fmt_convert_init_aarch64(c); #elif ARCH_ARM - ff_fmt_convert_init_arm(c, avctx); + ff_fmt_convert_init_arm(c); #elif ARCH_PPC - ff_fmt_convert_init_ppc(c, avctx); + ff_fmt_convert_init_ppc(c); #elif ARCH_X86 - ff_fmt_convert_init_x86(c, avctx); + ff_fmt_convert_init_x86(c); #endif #if HAVE_MIPSFPU ff_fmt_convert_init_mips(c); diff --git a/libavcodec/fmtconvert.h b/libavcodec/fmtconvert.h index b2df7a9629..da244e05a5 100644 --- a/libavcodec/fmtconvert.h +++ b/libavcodec/fmtconvert.h @@ -23,7 +23,7 @@ #ifndef AVCODEC_FMTCONVERT_H #define AVCODEC_FMTCONVERT_H -#include "avcodec.h" +#include typedef struct FmtConvertContext { /** @@ -56,12 +56,12 @@ typedef struct FmtConvertContext { } FmtConvertContext; -void ff_fmt_convert_init(FmtConvertContext *c, AVCodecContext *avctx); +void ff_fmt_convert_init(FmtConvertContext *c); -void ff_fmt_convert_init_aarch64(FmtConvertContext *c, AVCodecContext *avctx); -void ff_fmt_convert_init_arm(FmtConvertContext *c, AVCodecContext *avctx); -void ff_fmt_convert_init_ppc(FmtConvertContext *c, AVCodecContext *avctx); -void ff_fmt_convert_init_x86(FmtConvertContext *c, AVCodecContext *avctx); +void ff_fmt_convert_init_aarch64(FmtConvertContext *c); +void ff_fmt_convert_init_arm(FmtConvertContext *c); +void ff_fmt_convert_init_ppc(FmtConvertContext *c); +void ff_fmt_convert_init_x86(FmtConvertContext *c); void ff_fmt_convert_init_mips(FmtConvertContext *c); #endif /* AVCODEC_FMTCONVERT_H */ diff --git a/libavcodec/mips/fmtconvert_mips.c b/libavcodec/mips/fmtconvert_mips.c index 89c699854e..c39e853575 100644 --- a/libavcodec/mips/fmtconvert_mips.c +++ b/libavcodec/mips/fmtconvert_mips.c @@ -49,7 +49,6 @@ */ #include "config.h" #include "libavutil/attributes.h" -#include "libavcodec/avcodec.h" #include "libavcodec/fmtconvert.h" #include "libavutil/mips/asmdefs.h" diff --git a/libavcodec/ppc/fmtconvert_altivec.c b/libavcodec/ppc/fmtconvert_altivec.c index 7323eff0bd..2e34de7c90 100644 --- a/libavcodec/ppc/fmtconvert_altivec.c +++ b/libavcodec/ppc/fmtconvert_altivec.c @@ -54,8 +54,7 @@ static void int32_to_float_fmul_scalar_altivec(float *dst, const int32_t *src, #endif /* HAVE_ALTIVEC */ -av_cold void ff_fmt_convert_init_ppc(FmtConvertContext *c, - AVCodecContext *avctx) +av_cold void ff_fmt_convert_init_ppc(FmtConvertContext *c) { #if HAVE_ALTIVEC if (!PPC_ALTIVEC(av_get_cpu_flags())) diff --git a/libavcodec/x86/fmtconvert_init.c b/libavcodec/x86/fmtconvert_init.c index 58b396856e..acbc334565 100644 --- a/libavcodec/x86/fmtconvert_init.c +++ b/libavcodec/x86/fmtconvert_init.c @@ -35,7 +35,7 @@ void ff_int32_to_float_fmul_array8_sse2(FmtConvertContext *c, float *dst, const #endif /* HAVE_X86ASM */ -av_cold void ff_fmt_convert_init_x86(FmtConvertContext *c, AVCodecContext *avctx) +av_cold void ff_fmt_convert_init_x86(FmtConvertContext *c) { #if HAVE_X86ASM int cpu_flags = av_get_cpu_flags(); diff --git a/tests/checkasm/fmtconvert.c b/tests/checkasm/fmtconvert.c index aef74479f6..e103a664d0 100644 --- a/tests/checkasm/fmtconvert.c +++ b/tests/checkasm/fmtconvert.c @@ -56,7 +56,7 @@ void checkasm_check_fmtconvert(void) for (i = 0; i < FF_ARRAY_ELEMS(scale_arr); i++) scale_arr[i] = (FF_ARRAY_ELEMS(scale_arr) - FF_ARRAY_ELEMS(scale_arr) / 2) / 13; - ff_fmt_convert_init(&c, NULL); + ff_fmt_convert_init(&c); memset(dst0, 0, sizeof(*dst0) * BUF_SIZE); memset(dst1, 0, sizeof(*dst1) * BUF_SIZE);