Skip to content

Commit f0e1a31

Browse files
committed
avcodec/iirfilter: Remove iirfilter, psy-preprocessing
The iirfilter is only used in its test tool since 01ecb71 which stopped using it in AAC, its only user. Signed-off-by: Andreas Rheinhardt <[email protected]>
1 parent 28c0a18 commit f0e1a31

File tree

13 files changed

+1
-810
lines changed

13 files changed

+1
-810
lines changed

configure

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2606,7 +2606,6 @@ CONFIG_EXTRA="
26062606
iamfdec
26072607
iamfenc
26082608
idctdsp
2609-
iirfilter
26102609
inflate_wrapper
26112610
intrax8
26122611
iso_media
@@ -2917,7 +2916,7 @@ wmv2dsp_select="qpeldsp"
29172916
# decoders / encoders
29182917
aac_decoder_select="adts_header mpeg4audio sinewin"
29192918
aac_fixed_decoder_select="adts_header mpeg4audio"
2920-
aac_encoder_select="audio_frame_queue iirfilter lpc sinewin"
2919+
aac_encoder_select="audio_frame_queue lpc sinewin"
29212920
aac_latm_decoder_select="aac_decoder aac_latm_parser"
29222921
ac3_decoder_select="ac3_parser ac3dsp bswapdsp fmtconvert"
29232922
ac3_fixed_decoder_select="ac3_parser ac3dsp bswapdsp"

doc/mips.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,5 @@ Files that have MIPS copyright notice in them:
6060
compute_antialias_float.h
6161
lsp_mips.h
6262
fmtconvert_mips.c
63-
iirfilter_mips.c
6463
mpegaudiodsp_mips_fixed.c
6564
mpegaudiodsp_mips_float.c

libavcodec/Makefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,6 @@ OBJS-$(CONFIG_HUFFMAN) += huffman.o
120120
OBJS-$(CONFIG_HUFFYUVDSP) += huffyuvdsp.o
121121
OBJS-$(CONFIG_HUFFYUVENCDSP) += huffyuvencdsp.o
122122
OBJS-$(CONFIG_IDCTDSP) += idctdsp.o simple_idct.o jrevdct.o
123-
OBJS-$(CONFIG_IIRFILTER) += iirfilter.o
124123
OBJS-$(CONFIG_INFLATE_WRAPPER) += zlib_wrapper.o
125124
OBJS-$(CONFIG_INTRAX8) += intrax8.o intrax8dsp.o msmpeg4_vc1_data.o
126125
OBJS-$(CONFIG_IVIDSP) += ivi_dsp.o
@@ -1336,7 +1335,6 @@ TESTPROGS-$(CONFIG_CABAC) += cabac
13361335
TESTPROGS-$(CONFIG_GOLOMB) += golomb
13371336
TESTPROGS-$(CONFIG_IDCTDSP) += dct
13381337
TESTPROGS-$(CONFIG_DXV_ENCODER) += hashtable
1339-
TESTPROGS-$(CONFIG_IIRFILTER) += iirfilter
13401338
TESTPROGS-$(CONFIG_MJPEG_ENCODER) += mjpegenc_huffman
13411339
TESTPROGS-$(HAVE_MMX) += motion
13421340
TESTPROGS-$(CONFIG_MPEGVIDEO) += mpeg12framerate

libavcodec/aacenc.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -845,8 +845,6 @@ static int aac_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
845845
}
846846

847847
copy_input_samples(s, frame);
848-
if (s->psypp)
849-
ff_psy_preprocess(s->psypp, s->planar_samples, s->channels);
850848

851849
if (!avctx->frame_num)
852850
return 0;
@@ -1141,8 +1139,6 @@ static av_cold int aac_encode_end(AVCodecContext *avctx)
11411139
av_tx_uninit(&s->mdct128);
11421140
ff_psy_end(&s->psy);
11431141
ff_lpc_end(&s->lpc);
1144-
if (s->psypp)
1145-
ff_psy_preprocess_end(s->psypp);
11461142
av_freep(&s->buffer.samples);
11471143
av_freep(&s->cpe);
11481144
av_freep(&s->fdsp);
@@ -1294,7 +1290,6 @@ static av_cold int aac_encode_init(AVCodecContext *avctx)
12941290
if ((ret = ff_psy_init(&s->psy, avctx, 2, sizes, lengths,
12951291
s->chan_map[0], grouping)) < 0)
12961292
return ret;
1297-
s->psypp = ff_psy_preprocess_init(avctx);
12981293
ff_lpc_init(&s->lpc, 2*avctx->frame_size, TNS_MAX_ORDER, FF_LPC_TYPE_LEVINSON);
12991294
s->random_state = 0x1f2e3d4c;
13001295

libavcodec/aacenc.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,6 @@ typedef struct AACEncContext {
199199

200200
ChannelElement *cpe; ///< channel elements
201201
FFPsyContext psy;
202-
struct FFPsyPreprocessContext* psypp;
203202
const AACCoefficientsEncoder *coder;
204203
int cur_channel; ///< current channel for coder context
205204
int random_state;

0 commit comments

Comments
 (0)