diff options
author | mvanbaak <mvanbaak@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-05-22 16:29:54 +0000 |
---|---|---|
committer | mvanbaak <mvanbaak@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-05-22 16:29:54 +0000 |
commit | c1210321e7aeb274076b14fc2f622edf442246fa (patch) | |
tree | bcbbf4eda53cdb8257bbc7add4616e01e31b1ae2 /codecs/codec_adpcm.c | |
parent | 2d9ba021dd38039616c82a4e317f652abe246ba3 (diff) |
- revert change to ast_queue_hangup and create ast_queue_hangup_with_cause
- make data member of the ast_frame struct a named union instead of a void
Recently the ast_queue_hangup function got a new parameter, the hangupcause
Feedback came in that this is no good and that instead a new function should be created.
This I did.
The hangupcause was stored in the seqno member of the ast_frame struct. This is not very
elegant, and since there's already a data member that one should be used.
Problem is, this member was a void *.
Now it's a named union so it can hold a pointer, an uint32 and there's a padding in case someone
wants to store another type in there in the future.
This commit is so massive, because all ast_frame.data uses have to be
altered to ast_frame.data.data
Thanks russellb and kpfleming for the feedback.
(closes issue #12674)
Reported by: mvanbaak
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@117802 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'codecs/codec_adpcm.c')
-rw-r--r-- | codecs/codec_adpcm.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/codecs/codec_adpcm.c b/codecs/codec_adpcm.c index 63a1ab1bc..cad4ded75 100644 --- a/codecs/codec_adpcm.c +++ b/codecs/codec_adpcm.c @@ -229,7 +229,7 @@ static int adpcmtolin_framein(struct ast_trans_pvt *pvt, struct ast_frame *f) { struct adpcm_decoder_pvt *tmp = pvt->pvt; int x = f->datalen; - unsigned char *src = f->data; + unsigned char *src = f->data.ptr; int16_t *dst = (int16_t *)pvt->outbuf + pvt->samples; while (x--) { @@ -246,7 +246,7 @@ static int lintoadpcm_framein(struct ast_trans_pvt *pvt, struct ast_frame *f) { struct adpcm_encoder_pvt *tmp = pvt->pvt; - memcpy(&tmp->inbuf[pvt->samples], f->data, f->datalen); + memcpy(&tmp->inbuf[pvt->samples], f->data.ptr, f->datalen); pvt->samples += f->samples; return 0; } @@ -296,7 +296,7 @@ static struct ast_frame *adpcmtolin_sample(void) f.mallocd = 0; f.offset = 0; f.src = __PRETTY_FUNCTION__; - f.data = adpcm_slin_ex; + f.data.ptr = adpcm_slin_ex; return &f; } @@ -312,7 +312,7 @@ static struct ast_frame *lintoadpcm_sample(void) f.mallocd = 0; f.offset = 0; f.src = __PRETTY_FUNCTION__; - f.data = slin_adpcm_ex; + f.data.ptr = slin_adpcm_ex; return &f; } |