diff options
author | qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-05-22 17:10:53 +0000 |
---|---|---|
committer | qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-05-22 17:10:53 +0000 |
commit | dac7a3528e6f5436b32dd372eb5c31c5b5b1f4be (patch) | |
tree | 9a258decae4f074f9e9a7bfe05180c78af99aca4 /codecs/codec_speex.c | |
parent | 9ae780c750855c4aeadf55a66e2e091e3a928c01 (diff) |
Fix a few places where frame data was used directly.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@117828 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'codecs/codec_speex.c')
-rw-r--r-- | codecs/codec_speex.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/codecs/codec_speex.c b/codecs/codec_speex.c index 494693182..b9f879535 100644 --- a/codecs/codec_speex.c +++ b/codecs/codec_speex.c @@ -165,7 +165,7 @@ static struct ast_frame *lintospeex_sample(void) f.mallocd = 0; f.offset = 0; f.src = __PRETTY_FUNCTION__; - f.data = slin_speex_ex; + f.data.ptr = slin_speex_ex; return &f; } @@ -180,7 +180,7 @@ static struct ast_frame *speextolin_sample(void) f.mallocd = 0; f.offset = 0; f.src = __PRETTY_FUNCTION__; - f.data = speex_slin_ex; + f.data.ptr = speex_slin_ex; return &f; } @@ -220,7 +220,7 @@ static int speextolin_framein(struct ast_trans_pvt *pvt, struct ast_frame *f) } /* Read in bits */ - speex_bits_read_from(&tmp->bits, f->data, f->datalen); + speex_bits_read_from(&tmp->bits, f->data.ptr, f->datalen); for (;;) { #ifdef _SPEEX_TYPES_H res = speex_decode_int(tmp->speex, &tmp->bits, fout); @@ -249,7 +249,7 @@ static int lintospeex_framein(struct ast_trans_pvt *pvt, struct ast_frame *f) /* XXX We should look at how old the rest of our stream is, and if it is too old, then we should overwrite it entirely, otherwise we can get artifacts of earlier talk that do not belong */ - memcpy(tmp->buf + pvt->samples, f->data, f->datalen); + memcpy(tmp->buf + pvt->samples, f->data.ptr, f->datalen); pvt->samples += f->samples; return 0; } |