diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-16 01:45:50 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-16 01:46:35 +0100 |
| commit | 47df21e1727c83648a645b0dde34e99f1b7bdc93 (patch) | |
| tree | ed098a84b05dde35955ca00471464be09a6eba78 /libavcodec/g722dec.c | |
| parent | 38e641a060e0c00930851a8053ca96250b3ecccc (diff) | |
| parent | 67690683130faf37dd9d969ced15eba2a1940ade (diff) | |
| download | ffmpeg-47df21e1727c83648a645b0dde34e99f1b7bdc93.tar.gz | |
Merge commit '67690683130faf37dd9d969ced15eba2a1940ade'
* commit '67690683130faf37dd9d969ced15eba2a1940ade':
g722: Split out g722_qmf_apply() function into g722dsp.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/g722dec.c')
| -rw-r--r-- | libavcodec/g722dec.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libavcodec/g722dec.c b/libavcodec/g722dec.c index 14bd67e95f..84540dc010 100644 --- a/libavcodec/g722dec.c +++ b/libavcodec/g722dec.c @@ -67,6 +67,8 @@ static av_cold int g722_decode_init(AVCodecContext * avctx) c->band[1].scale_factor = 2; c->prev_samples_pos = 22; + ff_g722dsp_init(&c->dsp); + return 0; } @@ -120,8 +122,8 @@ static int g722_decode_frame(AVCodecContext *avctx, void *data, c->prev_samples[c->prev_samples_pos++] = rlow + rhigh; c->prev_samples[c->prev_samples_pos++] = rlow - rhigh; - ff_g722_apply_qmf(c->prev_samples + c->prev_samples_pos - 24, - &xout1, &xout2); + c->dsp.apply_qmf(c->prev_samples + c->prev_samples_pos - 24, + &xout1, &xout2); *out_buf++ = av_clip_int16(xout1 >> 11); *out_buf++ = av_clip_int16(xout2 >> 11); if (c->prev_samples_pos >= PREV_SAMPLES_BUF_SIZE) { |