Commit 4a2c6516 authored by Lynne's avatar Lynne Committed by Carl Eugen Hoyos

x86/opus_dsp: rename to celt_pvq

Its only used in the encoder and in CELT's PVQ.
parent 4eec0082
...@@ -904,7 +904,7 @@ int av_cold ff_celt_pvq_init(CeltPVQ **pvq, int encode) ...@@ -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; s->quant_band = encode ? pvq_encode_band : pvq_decode_band;
if (ARCH_X86) if (ARCH_X86)
ff_opus_dsp_init_x86(s); ff_celt_pvq_init_x86(s);
*pvq = s; *pvq = s;
......
...@@ -40,7 +40,7 @@ struct CeltPVQ { ...@@ -40,7 +40,7 @@ struct CeltPVQ {
QUANT_FN(*quant_band); 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); int ff_celt_pvq_init(struct CeltPVQ **pvq, int encode);
void ff_celt_pvq_uninit(struct CeltPVQ **pvq); void ff_celt_pvq_uninit(struct CeltPVQ **pvq);
......
...@@ -53,8 +53,8 @@ OBJS-$(CONFIG_CAVS_DECODER) += x86/cavsdsp.o ...@@ -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_DCA_DECODER) += x86/dcadsp_init.o x86/synth_filter_init.o
OBJS-$(CONFIG_DNXHD_ENCODER) += x86/dnxhdenc_init.o OBJS-$(CONFIG_DNXHD_ENCODER) += x86/dnxhdenc_init.o
OBJS-$(CONFIG_EXR_DECODER) += x86/exrdsp_init.o OBJS-$(CONFIG_EXR_DECODER) += x86/exrdsp_init.o
OBJS-$(CONFIG_OPUS_DECODER) += x86/opus_dsp_init.o OBJS-$(CONFIG_OPUS_DECODER) += x86/celt_pvq_init.o
OBJS-$(CONFIG_OPUS_ENCODER) += x86/opus_dsp_init.o OBJS-$(CONFIG_OPUS_ENCODER) += x86/celt_pvq_init.o
OBJS-$(CONFIG_HEVC_DECODER) += x86/hevcdsp_init.o OBJS-$(CONFIG_HEVC_DECODER) += x86/hevcdsp_init.o
OBJS-$(CONFIG_JPEG2000_DECODER) += x86/jpeg2000dsp_init.o OBJS-$(CONFIG_JPEG2000_DECODER) += x86/jpeg2000dsp_init.o
OBJS-$(CONFIG_MLP_DECODER) += x86/mlpdsp_init.o OBJS-$(CONFIG_MLP_DECODER) += x86/mlpdsp_init.o
...@@ -127,7 +127,7 @@ X86ASM-OBJS-$(CONFIG_MDCT15) += x86/mdct15.o ...@@ -127,7 +127,7 @@ X86ASM-OBJS-$(CONFIG_MDCT15) += x86/mdct15.o
X86ASM-OBJS-$(CONFIG_ME_CMP) += x86/me_cmp.o X86ASM-OBJS-$(CONFIG_ME_CMP) += x86/me_cmp.o
X86ASM-OBJS-$(CONFIG_MPEGAUDIODSP) += x86/imdct36.o X86ASM-OBJS-$(CONFIG_MPEGAUDIODSP) += x86/imdct36.o
X86ASM-OBJS-$(CONFIG_MPEGVIDEOENC) += x86/mpegvideoencdsp.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_PIXBLOCKDSP) += x86/pixblockdsp.o
X86ASM-OBJS-$(CONFIG_QPELDSP) += x86/qpeldsp.o \ X86ASM-OBJS-$(CONFIG_QPELDSP) += x86/qpeldsp.o \
x86/fpel.o \ x86/fpel.o \
......
...@@ -28,7 +28,7 @@ extern float ff_pvq_search_approx_sse2(float *X, int *y, int K, int N); ...@@ -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_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); 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(); int cpu_flags = av_get_cpu_flags();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment