diff options
Diffstat (limited to 'chromium/third_party/ffmpeg/libavcodec/ra144enc.c')
| -rw-r--r-- | chromium/third_party/ffmpeg/libavcodec/ra144enc.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/chromium/third_party/ffmpeg/libavcodec/ra144enc.c b/chromium/third_party/ffmpeg/libavcodec/ra144enc.c index 3558254e568..1f4e5bae45b 100644 --- a/chromium/third_party/ffmpeg/libavcodec/ra144enc.c +++ b/chromium/third_party/ffmpeg/libavcodec/ra144enc.c @@ -29,12 +29,12 @@ #include "avcodec.h" #include "audio_frame_queue.h" +#include "celp_filters.h" #include "internal.h" +#include "mathops.h" #include "put_bits.h" -#include "celp_filters.h" #include "ra144.h" - static av_cold int ra144_encode_close(AVCodecContext *avctx) { RA144Context *ractx = avctx->priv_data; @@ -61,6 +61,7 @@ static av_cold int ra144_encode_init(AVCodecContext * avctx) ractx->lpc_coef[0] = ractx->lpc_tables[0]; ractx->lpc_coef[1] = ractx->lpc_tables[1]; ractx->avctx = avctx; + ff_dsputil_init(&ractx->dsp, avctx); ret = ff_lpc_init(&ractx->lpc_ctx, avctx->frame_size, LPC_ORDER, FF_LPC_TYPE_LEVINSON); if (ret < 0) @@ -334,7 +335,6 @@ static void ra144_encode_subblock(RA144Context *ractx, float data[BLOCKSIZE] = { 0 }, work[LPC_ORDER + BLOCKSIZE]; float coefs[LPC_ORDER]; float zero[BLOCKSIZE], cba[BLOCKSIZE], cb1[BLOCKSIZE], cb2[BLOCKSIZE]; - int16_t cba_vect[BLOCKSIZE]; int cba_idx, cb1_idx, cb2_idx, gain; int i, n; unsigned m[3]; @@ -373,8 +373,8 @@ static void ra144_encode_subblock(RA144Context *ractx, */ memcpy(cba, work + LPC_ORDER, sizeof(cba)); - ff_copy_and_dup(cba_vect, ractx->adapt_cb, cba_idx + BLOCKSIZE / 2 - 1); - m[0] = (ff_irms(cba_vect) * rms) >> 12; + ff_copy_and_dup(ractx->buffer_a, ractx->adapt_cb, cba_idx + BLOCKSIZE / 2 - 1); + m[0] = (ff_irms(&ractx->dsp, ractx->buffer_a) * rms) >> 12; } fixed_cb_search(work + LPC_ORDER, coefs, data, cba_idx, &cb1_idx, &cb2_idx); for (i = 0; i < BLOCKSIZE; i++) { |