summaryrefslogtreecommitdiff
path: root/libavcodec/g722enc.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/g722enc.c
parent4abfa387b8234736f6e0e541951e3d5eb60eb843 (diff)
downloadffmpeg-67690683130faf37dd9d969ced15eba2a1940ade.tar.gz
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/g722enc.c')
-rw-r--r--libavcodec/g722enc.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/g722enc.c b/libavcodec/g722enc.c
index be437946c6..3a3d7b7c07 100644
--- a/libavcodec/g722enc.c
+++ b/libavcodec/g722enc.c
@@ -119,6 +119,8 @@ static av_cold int g722_encode_init(AVCodecContext * avctx)
}
}
+ ff_g722dsp_init(&c->dsp);
+
return 0;
error:
g722_encode_close(avctx);
@@ -138,7 +140,7 @@ static inline void filter_samples(G722Context *c, const int16_t *samples,
int xout1, xout2;
c->prev_samples[c->prev_samples_pos++] = samples[0];
c->prev_samples[c->prev_samples_pos++] = samples[1];
- 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);
*xlow = xout1 + xout2 >> 14;
*xhigh = xout1 - xout2 >> 14;
if (c->prev_samples_pos >= PREV_SAMPLES_BUF_SIZE) {