diff options
| author | Vicente Olivert Riera <Vincent.Riera@imgtec.com> | 2015-12-03 13:22:16 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-12-04 02:35:42 +0100 |
| commit | a27401a05ba31fe4a8f7824d376c1d48d2e571a9 (patch) | |
| tree | 130760407361cc9c2174a51e3fc4ace54d3c3523 /libavcodec | |
| parent | eb3628d87f67b35e8dd354a466028e93bdd7f9c0 (diff) | |
| download | ffmpeg-a27401a05ba31fe4a8f7824d376c1d48d2e571a9.tar.gz | |
mips: rename mipsdspr1 to mipsdsp
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/aacenc.c | 2 | ||||
| -rw-r--r-- | libavcodec/mips/Makefile | 4 | ||||
| -rw-r--r-- | libavcodec/mips/ac3dsp_mips.c | 4 | ||||
| -rw-r--r-- | libavcodec/mips/mpegaudiodsp_mips_fixed.c | 2 | ||||
| -rw-r--r-- | libavcodec/mpegaudiodec_template.c | 4 | ||||
| -rw-r--r-- | libavcodec/mpegaudiodsp.c | 2 | ||||
| -rw-r--r-- | libavcodec/mpegaudiodsp.h | 2 |
7 files changed, 10 insertions, 10 deletions
diff --git a/libavcodec/aacenc.c b/libavcodec/aacenc.c index 971f8ab0e1..b370f439d0 100644 --- a/libavcodec/aacenc.c +++ b/libavcodec/aacenc.c @@ -991,7 +991,7 @@ static av_cold int aac_encode_init(AVCodecContext *avctx) s->psypp = ff_psy_preprocess_init(avctx); ff_lpc_init(&s->lpc, 2*avctx->frame_size, TNS_MAX_ORDER, FF_LPC_TYPE_LEVINSON); - if (HAVE_MIPSDSPR1) + if (HAVE_MIPSDSP) ff_aac_coder_init_mips(s); if ((ret = ff_thread_once(&aac_table_init, &aac_encode_init_tables)) != 0) diff --git a/libavcodec/mips/Makefile b/libavcodec/mips/Makefile index 2e8b1ee479..f66017abc5 100644 --- a/libavcodec/mips/Makefile +++ b/libavcodec/mips/Makefile @@ -8,7 +8,7 @@ MIPSFPU-OBJS-$(CONFIG_AMRWB_DECODER) += mips/acelp_filters_mips.o \ mips/celp_math_mips.o \ mips/acelp_vectors_mips.o MIPSFPU-OBJS-$(CONFIG_MPEGAUDIODSP) += mips/mpegaudiodsp_mips_float.o -MIPSDSPR1-OBJS-$(CONFIG_MPEGAUDIODSP) += mips/mpegaudiodsp_mips_fixed.o +MIPSDSP-OBJS-$(CONFIG_MPEGAUDIODSP) += mips/mpegaudiodsp_mips_fixed.o MIPSFPU-OBJS-$(CONFIG_FFT) += mips/fft_mips.o MIPSFPU-OBJS-$(CONFIG_FMTCONVERT) += mips/fmtconvert_mips.o OBJS-$(CONFIG_AC3DSP) += mips/ac3dsp_mips.o @@ -16,7 +16,7 @@ OBJS-$(CONFIG_AAC_DECODER) += mips/aacdec_mips.o \ mips/aacsbr_mips.o \ mips/sbrdsp_mips.o \ mips/aacpsdsp_mips.o -MIPSDSPR1-OBJS-$(CONFIG_AAC_ENCODER) += mips/aaccoder_mips.o +MIPSDSP-OBJS-$(CONFIG_AAC_ENCODER) += mips/aaccoder_mips.o MIPSFPU-OBJS-$(CONFIG_AAC_ENCODER) += mips/iirfilter_mips.o OBJS-$(CONFIG_HEVC_DECODER) += mips/hevcdsp_init_mips.o \ mips/hevcpred_init_mips.o diff --git a/libavcodec/mips/ac3dsp_mips.c b/libavcodec/mips/ac3dsp_mips.c index 01c7de57a0..da4919f6eb 100644 --- a/libavcodec/mips/ac3dsp_mips.c +++ b/libavcodec/mips/ac3dsp_mips.c @@ -59,7 +59,7 @@ #include "libavutil/mips/asmdefs.h" #if HAVE_INLINE_ASM -#if HAVE_MIPSDSPR1 +#if HAVE_MIPSDSP static void ac3_bit_alloc_calc_bap_mips(int16_t *mask, int16_t *psd, int start, int end, int snr_offset, int floor, @@ -400,7 +400,7 @@ static void ac3_downmix_mips(float **samples, float (*matrix)[2], void ff_ac3dsp_init_mips(AC3DSPContext *c, int bit_exact) { #if HAVE_INLINE_ASM -#if HAVE_MIPSDSPR1 +#if HAVE_MIPSDSP c->bit_alloc_calc_bap = ac3_bit_alloc_calc_bap_mips; c->update_bap_counts = ac3_update_bap_counts_mips; #endif diff --git a/libavcodec/mips/mpegaudiodsp_mips_fixed.c b/libavcodec/mips/mpegaudiodsp_mips_fixed.c index 86ea13d8d6..92d260b85f 100644 --- a/libavcodec/mips/mpegaudiodsp_mips_fixed.c +++ b/libavcodec/mips/mpegaudiodsp_mips_fixed.c @@ -901,7 +901,7 @@ static void ff_imdct36_blocks_mips_fixed(int *out, int *buf, int *in, } } -void ff_mpadsp_init_mipsdspr1(MPADSPContext *s) +void ff_mpadsp_init_mipsdsp(MPADSPContext *s) { s->apply_window_fixed = ff_mpadsp_apply_window_mips_fixed; s->imdct36_blocks_fixed = ff_imdct36_blocks_mips_fixed; diff --git a/libavcodec/mpegaudiodec_template.c b/libavcodec/mpegaudiodec_template.c index 0f32ac7b51..f681ef7a57 100644 --- a/libavcodec/mpegaudiodec_template.c +++ b/libavcodec/mpegaudiodec_template.c @@ -1172,9 +1172,9 @@ found2: # include "mips/compute_antialias_float.h" #endif /* HAVE_MIPSFPU */ #else -#if HAVE_MIPSDSPR1 +#if HAVE_MIPSDSP # include "mips/compute_antialias_fixed.h" -#endif /* HAVE_MIPSDSPR1 */ +#endif /* HAVE_MIPSDSP */ #endif /* USE_FLOATS */ #ifndef compute_antialias diff --git a/libavcodec/mpegaudiodsp.c b/libavcodec/mpegaudiodsp.c index 5fe3444896..a5d20df629 100644 --- a/libavcodec/mpegaudiodsp.c +++ b/libavcodec/mpegaudiodsp.c @@ -46,5 +46,5 @@ av_cold void ff_mpadsp_init(MPADSPContext *s) if (ARCH_PPC) ff_mpadsp_init_ppc(s); if (ARCH_X86) ff_mpadsp_init_x86(s); if (HAVE_MIPSFPU) ff_mpadsp_init_mipsfpu(s); - if (HAVE_MIPSDSPR1) ff_mpadsp_init_mipsdspr1(s); + if (HAVE_MIPSDSP) ff_mpadsp_init_mipsdsp(s); } diff --git a/libavcodec/mpegaudiodsp.h b/libavcodec/mpegaudiodsp.h index a722a2f36b..b827163d61 100644 --- a/libavcodec/mpegaudiodsp.h +++ b/libavcodec/mpegaudiodsp.h @@ -60,7 +60,7 @@ void ff_mpadsp_init_arm(MPADSPContext *s); void ff_mpadsp_init_ppc(MPADSPContext *s); void ff_mpadsp_init_x86(MPADSPContext *s); void ff_mpadsp_init_mipsfpu(MPADSPContext *s); -void ff_mpadsp_init_mipsdspr1(MPADSPContext *s); +void ff_mpadsp_init_mipsdsp(MPADSPContext *s); void ff_mpa_synth_init_float(float *window); void ff_mpa_synth_init_fixed(int32_t *window); |