summaryrefslogtreecommitdiff
path: root/libavcodec/opusenc.c
diff options
context:
space:
mode:
authorAndreas Rheinhardt <andreas.rheinhardt@outlook.com>2022-10-03 17:21:53 +0200
committerAndreas Rheinhardt <andreas.rheinhardt@outlook.com>2022-10-10 14:10:49 +0200
commite10e27a2ead8848648b29a1b397cc240206e9c3d (patch)
tree603bab97c11c8ddbc55f1bdae2f3bf4dff732a75 /libavcodec/opusenc.c
parenta60befce40572d5867e603a71ff274db797b0532 (diff)
avcodec/opustab: Avoid indirection to access ff_celt_window
Currently, it is accessed via a pointer (ff_celt_window) exported from opustab.h which points inside a static array (ff_celt_window_padded) in opustab.h. Instead export ff_celt_window_padded directly and make opustab.h a static const pointer pointing inside ff_celt_window_padded. Also mark all the declarations in opustab.h as hidden, so that the compiler knows that ff_celt_window has a fixed offset from the code even when compiling position-independent code. Reviewed-by: Lynne <dev@lynne.ee> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Diffstat (limited to 'libavcodec/opusenc.c')
-rw-r--r--libavcodec/opusenc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/opusenc.c b/libavcodec/opusenc.c
index 280425c74f..8b86aa7a35 100644
--- a/libavcodec/opusenc.c
+++ b/libavcodec/opusenc.c
@@ -205,7 +205,7 @@ static void celt_frame_mdct(OpusEncContext *s, CeltFrame *f)
float *src2 = &b->samples[CELT_OVERLAP*t];
s->dsp->vector_fmul(win, src1, ff_celt_window, 128);
s->dsp->vector_fmul_reverse(&win[CELT_OVERLAP], src2,
- ff_celt_window - 8, 128);
+ ff_celt_window_padded, 128);
src1 = src2;
s->tx_fn[0](s->tx[0], b->coeffs + t, win, sizeof(float)*f->blocks);
}
@@ -226,7 +226,7 @@ static void celt_frame_mdct(OpusEncContext *s, CeltFrame *f)
/* Samples, windowed */
s->dsp->vector_fmul_reverse(temp, b->samples + rwin,
- ff_celt_window - 8, 128);
+ ff_celt_window_padded, 128);
memcpy(win + lap_dst + blk_len, temp, CELT_OVERLAP*sizeof(float));
s->tx_fn[f->size](s->tx[f->size], b->coeffs, win, sizeof(float));