| Message ID | DB6PR0101MB2214ED81E6C30F2F5E3E67E48F9B9@DB6PR0101MB2214.eurprd01.prod.exchangelabs.com |
|---|---|
| State | Accepted |
| Commit | eb5c5ae658aaf8cd7c03e1d0a6c84274d3a39a66 |
| Headers | show |
| Series | [FFmpeg-devel,1/4] avcodec/intrax8: Remove unused IDCTDSPContext | expand |
| Context | Check | Description |
|---|---|---|
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
Andreas Rheinhardt: > Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> > --- > configure | 2 +- > libavcodec/intrax8.c | 4 +--- > libavcodec/intrax8.h | 3 +-- > libavcodec/vc1dec.c | 2 +- > libavcodec/wmv2dec.c | 2 +- > 5 files changed, 5 insertions(+), 8 deletions(-) > > diff --git a/configure b/configure > index 8c7e8c9d1d..974768a663 100755 > --- a/configure > +++ b/configure > @@ -2733,7 +2733,7 @@ h264dsp_select="startcode" > hevcparse_select="atsc_a53 golomb" > frame_thread_encoder_deps="encoders threads" > inflate_wrapper_deps="zlib" > -intrax8_select="blockdsp idctdsp" > +intrax8_select="blockdsp" > iso_media_select="mpeg4audio" > mdct_select="fft" > mdct15_select="fft" > diff --git a/libavcodec/intrax8.c b/libavcodec/intrax8.c > index 73b8aeea78..b99e8590b1 100644 > --- a/libavcodec/intrax8.c > +++ b/libavcodec/intrax8.c > @@ -25,7 +25,6 @@ > #include "libavutil/thread.h" > #include "avcodec.h" > #include "get_bits.h" > -#include "idctdsp.h" > #include "msmpeg4data.h" > #include "intrax8huf.h" > #include "intrax8.h" > @@ -692,7 +691,7 @@ static void x8_init_block_index(IntraX8Context *w, AVFrame *frame) > } > > av_cold int ff_intrax8_common_init(AVCodecContext *avctx, > - IntraX8Context *w, IDCTDSPContext *idsp, > + IntraX8Context *w, > int16_t (*block)[64], > int block_last_index[12], > int mb_width, int mb_height) > @@ -700,7 +699,6 @@ av_cold int ff_intrax8_common_init(AVCodecContext *avctx, > static AVOnce init_static_once = AV_ONCE_INIT; > > w->avctx = avctx; > - w->idsp = *idsp; > w->mb_width = mb_width; > w->mb_height = mb_height; > w->block = block; > diff --git a/libavcodec/intrax8.h b/libavcodec/intrax8.h > index 5b8946ea25..3ebbf73434 100644 > --- a/libavcodec/intrax8.h > +++ b/libavcodec/intrax8.h > @@ -44,7 +44,6 @@ typedef struct IntraX8Context { > > // set by the caller codec > IntraX8DSPContext dsp; > - IDCTDSPContext idsp; > BlockDSPContext bdsp; > int quant; > int dquant; > @@ -86,7 +85,7 @@ typedef struct IntraX8Context { > * @return 0 on success, a negative AVERROR value on error > */ > int ff_intrax8_common_init(AVCodecContext *avctx, > - IntraX8Context *w, IDCTDSPContext *idsp, > + IntraX8Context *w, > int16_t (*block)[64], > int block_last_index[12], > int mb_width, int mb_height); > diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c > index 5c5b31ad32..b53490b3ab 100644 > --- a/libavcodec/vc1dec.c > +++ b/libavcodec/vc1dec.c > @@ -391,7 +391,7 @@ av_cold int ff_vc1_decode_init_alloc_tables(VC1Context *v) > goto error; > } > > - ret = ff_intrax8_common_init(s->avctx, &v->x8, &s->idsp, > + ret = ff_intrax8_common_init(s->avctx, &v->x8, > s->block, s->block_last_index, > s->mb_width, s->mb_height); > if (ret < 0) > diff --git a/libavcodec/wmv2dec.c b/libavcodec/wmv2dec.c > index e61b549439..6d9b72d123 100644 > --- a/libavcodec/wmv2dec.c > +++ b/libavcodec/wmv2dec.c > @@ -578,7 +578,7 @@ static av_cold int wmv2_decode_init(AVCodecContext *avctx) > ff_init_scantable(s->idsp.idct_permutation, &w->abt_scantable[1], > ff_wmv2_scantableB); > > - return ff_intrax8_common_init(avctx, &w->x8, &w->s.idsp, > + return ff_intrax8_common_init(avctx, &w->x8, > w->s.block, w->s.block_last_index, > w->s.mb_width, w->s.mb_height); > } Will apply this patchset tonight unless there are objections. - Andreas
diff --git a/configure b/configure index 8c7e8c9d1d..974768a663 100755 --- a/configure +++ b/configure @@ -2733,7 +2733,7 @@ h264dsp_select="startcode" hevcparse_select="atsc_a53 golomb" frame_thread_encoder_deps="encoders threads" inflate_wrapper_deps="zlib" -intrax8_select="blockdsp idctdsp" +intrax8_select="blockdsp" iso_media_select="mpeg4audio" mdct_select="fft" mdct15_select="fft" diff --git a/libavcodec/intrax8.c b/libavcodec/intrax8.c index 73b8aeea78..b99e8590b1 100644 --- a/libavcodec/intrax8.c +++ b/libavcodec/intrax8.c @@ -25,7 +25,6 @@ #include "libavutil/thread.h" #include "avcodec.h" #include "get_bits.h" -#include "idctdsp.h" #include "msmpeg4data.h" #include "intrax8huf.h" #include "intrax8.h" @@ -692,7 +691,7 @@ static void x8_init_block_index(IntraX8Context *w, AVFrame *frame) } av_cold int ff_intrax8_common_init(AVCodecContext *avctx, - IntraX8Context *w, IDCTDSPContext *idsp, + IntraX8Context *w, int16_t (*block)[64], int block_last_index[12], int mb_width, int mb_height) @@ -700,7 +699,6 @@ av_cold int ff_intrax8_common_init(AVCodecContext *avctx, static AVOnce init_static_once = AV_ONCE_INIT; w->avctx = avctx; - w->idsp = *idsp; w->mb_width = mb_width; w->mb_height = mb_height; w->block = block; diff --git a/libavcodec/intrax8.h b/libavcodec/intrax8.h index 5b8946ea25..3ebbf73434 100644 --- a/libavcodec/intrax8.h +++ b/libavcodec/intrax8.h @@ -44,7 +44,6 @@ typedef struct IntraX8Context { // set by the caller codec IntraX8DSPContext dsp; - IDCTDSPContext idsp; BlockDSPContext bdsp; int quant; int dquant; @@ -86,7 +85,7 @@ typedef struct IntraX8Context { * @return 0 on success, a negative AVERROR value on error */ int ff_intrax8_common_init(AVCodecContext *avctx, - IntraX8Context *w, IDCTDSPContext *idsp, + IntraX8Context *w, int16_t (*block)[64], int block_last_index[12], int mb_width, int mb_height); diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c index 5c5b31ad32..b53490b3ab 100644 --- a/libavcodec/vc1dec.c +++ b/libavcodec/vc1dec.c @@ -391,7 +391,7 @@ av_cold int ff_vc1_decode_init_alloc_tables(VC1Context *v) goto error; } - ret = ff_intrax8_common_init(s->avctx, &v->x8, &s->idsp, + ret = ff_intrax8_common_init(s->avctx, &v->x8, s->block, s->block_last_index, s->mb_width, s->mb_height); if (ret < 0) diff --git a/libavcodec/wmv2dec.c b/libavcodec/wmv2dec.c index e61b549439..6d9b72d123 100644 --- a/libavcodec/wmv2dec.c +++ b/libavcodec/wmv2dec.c @@ -578,7 +578,7 @@ static av_cold int wmv2_decode_init(AVCodecContext *avctx) ff_init_scantable(s->idsp.idct_permutation, &w->abt_scantable[1], ff_wmv2_scantableB); - return ff_intrax8_common_init(avctx, &w->x8, &w->s.idsp, + return ff_intrax8_common_init(avctx, &w->x8, w->s.block, w->s.block_last_index, w->s.mb_width, w->s.mb_height); }
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> --- configure | 2 +- libavcodec/intrax8.c | 4 +--- libavcodec/intrax8.h | 3 +-- libavcodec/vc1dec.c | 2 +- libavcodec/wmv2dec.c | 2 +- 5 files changed, 5 insertions(+), 8 deletions(-)