diff options
| author | Lynne <dev@lynne.ee> | 2019-03-16 17:30:16 +0100 |
|---|---|---|
| committer | Carl Eugen Hoyos <ceffmpeg@gmail.com> | 2019-03-31 23:35:00 +0200 |
| commit | 4a2c65162029755a4717528014a456a400590e36 (patch) | |
| tree | 39b5b3c3f92dc7f8da1df5d6cd901b072d6edadb | |
| parent | 4eec0082599adf4b7a25ce6e6ec761f6849783a3 (diff) | |
| download | ffmpeg-4a2c65162029755a4717528014a456a400590e36.tar.gz | |
x86/opus_dsp: rename to celt_pvq
Its only used in the encoder and in CELT's PVQ.
| -rw-r--r-- | libavcodec/opus_pvq.c | 2 | ||||
| -rw-r--r-- | libavcodec/opus_pvq.h | 2 | ||||
| -rw-r--r-- | libavcodec/x86/Makefile | 6 | ||||
| -rw-r--r-- | libavcodec/x86/celt_pvq_init.c (renamed from libavcodec/x86/opus_dsp_init.c) | 2 | ||||
| -rw-r--r-- | libavcodec/x86/celt_pvq_search.asm (renamed from libavcodec/x86/opus_pvq_search.asm) | 0 |
5 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/opus_pvq.c b/libavcodec/opus_pvq.c index 0dbf14184d..c3119a03f1 100644 --- a/libavcodec/opus_pvq.c +++ b/libavcodec/opus_pvq.c @@ -904,7 +904,7 @@ int av_cold ff_celt_pvq_init(CeltPVQ **pvq, int encode) s->quant_band = encode ? pvq_encode_band : pvq_decode_band; if (ARCH_X86) - ff_opus_dsp_init_x86(s); + ff_celt_pvq_init_x86(s); *pvq = s; diff --git a/libavcodec/opus_pvq.h b/libavcodec/opus_pvq.h index e2f01a01b5..52f9a4e6d4 100644 --- a/libavcodec/opus_pvq.h +++ b/libavcodec/opus_pvq.h @@ -40,7 +40,7 @@ struct CeltPVQ { QUANT_FN(*quant_band); }; -void ff_opus_dsp_init_x86(struct CeltPVQ *s); +void ff_celt_pvq_init_x86(struct CeltPVQ *s); int ff_celt_pvq_init(struct CeltPVQ **pvq, int encode); void ff_celt_pvq_uninit(struct CeltPVQ **pvq); diff --git a/libavcodec/x86/Makefile b/libavcodec/x86/Makefile index 2350c8bbee..3bfba94ec2 100644 --- a/libavcodec/x86/Makefile +++ b/libavcodec/x86/Makefile @@ -53,8 +53,8 @@ OBJS-$(CONFIG_CAVS_DECODER) += x86/cavsdsp.o OBJS-$(CONFIG_DCA_DECODER) += x86/dcadsp_init.o x86/synth_filter_init.o OBJS-$(CONFIG_DNXHD_ENCODER) += x86/dnxhdenc_init.o OBJS-$(CONFIG_EXR_DECODER) += x86/exrdsp_init.o -OBJS-$(CONFIG_OPUS_DECODER) += x86/opus_dsp_init.o -OBJS-$(CONFIG_OPUS_ENCODER) += x86/opus_dsp_init.o +OBJS-$(CONFIG_OPUS_DECODER) += x86/celt_pvq_init.o +OBJS-$(CONFIG_OPUS_ENCODER) += x86/celt_pvq_init.o OBJS-$(CONFIG_HEVC_DECODER) += x86/hevcdsp_init.o OBJS-$(CONFIG_JPEG2000_DECODER) += x86/jpeg2000dsp_init.o OBJS-$(CONFIG_MLP_DECODER) += x86/mlpdsp_init.o @@ -127,7 +127,7 @@ X86ASM-OBJS-$(CONFIG_MDCT15) += x86/mdct15.o X86ASM-OBJS-$(CONFIG_ME_CMP) += x86/me_cmp.o X86ASM-OBJS-$(CONFIG_MPEGAUDIODSP) += x86/imdct36.o X86ASM-OBJS-$(CONFIG_MPEGVIDEOENC) += x86/mpegvideoencdsp.o -X86ASM-OBJS-$(CONFIG_OPUS_ENCODER) += x86/opus_pvq_search.o +X86ASM-OBJS-$(CONFIG_OPUS_ENCODER) += x86/celt_pvq_search.o X86ASM-OBJS-$(CONFIG_PIXBLOCKDSP) += x86/pixblockdsp.o X86ASM-OBJS-$(CONFIG_QPELDSP) += x86/qpeldsp.o \ x86/fpel.o \ diff --git a/libavcodec/x86/opus_dsp_init.c b/libavcodec/x86/celt_pvq_init.c index a9f8a96159..3890a9cb9f 100644 --- a/libavcodec/x86/opus_dsp_init.c +++ b/libavcodec/x86/celt_pvq_init.c @@ -28,7 +28,7 @@ extern float ff_pvq_search_approx_sse2(float *X, int *y, int K, int N); extern float ff_pvq_search_approx_sse4(float *X, int *y, int K, int N); extern float ff_pvq_search_exact_avx (float *X, int *y, int K, int N); -av_cold void ff_opus_dsp_init_x86(CeltPVQ *s) +av_cold void ff_celt_pvq_init_x86(CeltPVQ *s) { int cpu_flags = av_get_cpu_flags(); diff --git a/libavcodec/x86/opus_pvq_search.asm b/libavcodec/x86/celt_pvq_search.asm index 5c1e6d6174..5c1e6d6174 100644 --- a/libavcodec/x86/opus_pvq_search.asm +++ b/libavcodec/x86/celt_pvq_search.asm |