[FFmpeg-cvslog] avcodec/opus_pvq: Don't build ppp_pvq_search_c when unused
Andreas Rheinhardt
git at videolan.org
Sat Oct 8 11:43:02 EEST 2022
ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at outlook.com> | Fri Oct 7 18:01:57 2022 +0200| [ba30744213c8ee8df2281a681f41c56c8f4d88b5] | committer: Andreas Rheinhardt
avcodec/opus_pvq: Don't build ppp_pvq_search_c when unused
Reviewed-by: Lynne <dev at lynne.ee>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ba30744213c8ee8df2281a681f41c56c8f4d88b5
---
libavcodec/opus_pvq.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/libavcodec/opus_pvq.c b/libavcodec/opus_pvq.c
index 79101847af..d08dcd7413 100644
--- a/libavcodec/opus_pvq.c
+++ b/libavcodec/opus_pvq.c
@@ -366,6 +366,7 @@ static inline float celt_decode_pulses(OpusRangeCoder *rc, int *y, uint32_t N, u
return celt_cwrsi(N, K, idx, y);
}
+#if CONFIG_OPUS_ENCODER
/*
* Faster than libopus's search, operates entirely in the signed domain.
* Slightly worse/better depending on N, K and the input vector.
@@ -418,6 +419,7 @@ static float ppp_pvq_search_c(float *X, int *y, int K, int N)
return (float)y_norm;
}
+#endif
static uint32_t celt_alg_quant(OpusRangeCoder *rc, float *X, uint32_t N, uint32_t K,
enum CeltSpread spread, uint32_t blocks, float gain,
@@ -907,11 +909,13 @@ int av_cold ff_celt_pvq_init(CeltPVQ **pvq, int encode)
if (!s)
return AVERROR(ENOMEM);
- s->pvq_search = ppp_pvq_search_c;
s->quant_band = encode ? pvq_encode_band : pvq_decode_band;
-#if CONFIG_OPUS_ENCODER && ARCH_X86
+#if CONFIG_OPUS_ENCODER
+ s->pvq_search = ppp_pvq_search_c;
+#if ARCH_X86
ff_celt_pvq_init_x86(s);
+#endif
#endif
*pvq = s;
More information about the ffmpeg-cvslog
mailing list