* [FFmpeg-devel] [PATCH 2/3] avcodec/blockdsp: Remove unused AVCodecContext parameter
2022-09-20 1:29 [FFmpeg-devel] [PATCH 1/3] avcodec/cavsdsp: Remove unused function parameter Andreas Rheinhardt
@ 2022-09-20 1:31 ` Andreas Rheinhardt
2022-09-20 1:31 ` [FFmpeg-devel] [PATCH 3/3] avcodec/fmtconvert: " Andreas Rheinhardt
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Andreas Rheinhardt @ 2022-09-20 1:31 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Andreas Rheinhardt
Possible since be95df12bb06b183c8d2aea3b0831fdf05466cf3.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
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 <stddef.h>
#include <stdint.h>
-#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);
--
2.34.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 5+ messages in thread* [FFmpeg-devel] [PATCH 3/3] avcodec/fmtconvert: Remove unused AVCodecContext parameter
2022-09-20 1:29 [FFmpeg-devel] [PATCH 1/3] avcodec/cavsdsp: Remove unused function parameter Andreas Rheinhardt
2022-09-20 1:31 ` [FFmpeg-devel] [PATCH 2/3] avcodec/blockdsp: Remove unused AVCodecContext parameter Andreas Rheinhardt
@ 2022-09-20 1:31 ` Andreas Rheinhardt
2022-09-21 15:05 ` [FFmpeg-devel] [PATCH 1/3] avcodec/cavsdsp: Remove unused function parameter Andreas Rheinhardt
2022-09-21 15:16 ` Rémi Denis-Courmont
3 siblings, 0 replies; 5+ messages in thread
From: Andreas Rheinhardt @ 2022-09-20 1:31 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Andreas Rheinhardt
Unused since d74a8cb7e42f703be5796eeb485f06af710ae8ca.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
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 <stdint.h>
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);
--
2.34.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [FFmpeg-devel] [PATCH 1/3] avcodec/cavsdsp: Remove unused function parameter
2022-09-20 1:29 [FFmpeg-devel] [PATCH 1/3] avcodec/cavsdsp: Remove unused function parameter Andreas Rheinhardt
2022-09-20 1:31 ` [FFmpeg-devel] [PATCH 2/3] avcodec/blockdsp: Remove unused AVCodecContext parameter Andreas Rheinhardt
2022-09-20 1:31 ` [FFmpeg-devel] [PATCH 3/3] avcodec/fmtconvert: " Andreas Rheinhardt
@ 2022-09-21 15:05 ` Andreas Rheinhardt
2022-09-21 15:16 ` Rémi Denis-Courmont
3 siblings, 0 replies; 5+ messages in thread
From: Andreas Rheinhardt @ 2022-09-21 15:05 UTC (permalink / raw)
To: ffmpeg-devel
Andreas Rheinhardt:
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
> ---
> 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 <stdio.h>
> -
> #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 <stddef.h>
> #include <stdint.h>
>
> -#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)) {
Ok'ed by Rémi Denis-Courmont on IRC. I will therefore apply this tonight
unless there are objections.
- Andreas
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 5+ messages in thread