summaryrefslogtreecommitdiff
path: root/libavcodec/g722dec.c
diff options
context:
space:
mode:
authorPeter Meerwald <pmeerw@pmeerw.net>2015-02-15 12:21:21 +0100
committerMartin Storsjö <martin@martin.st>2015-02-15 22:47:10 +0200
commit67690683130faf37dd9d969ced15eba2a1940ade (patch)
tree5ec3655cec9624bfd4cb1438fc152de935e34318 /libavcodec/g722dec.c
parent4abfa387b8234736f6e0e541951e3d5eb60eb843 (diff)
g722: Split out g722_qmf_apply() function into g722dsp.c
Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net> Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavcodec/g722dec.c')
-rw-r--r--libavcodec/g722dec.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/libavcodec/g722dec.c b/libavcodec/g722dec.c
index 26f288b721..4e1815009b 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;
}
@@ -122,8 +124,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) {