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);