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_g726.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_g726.c')
-rw-r--r-- | codecs/codec_g726.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/codecs/codec_g726.c b/codecs/codec_g726.c index c8a671ee8..8d1346e66 100644 --- a/codecs/codec_g726.c +++ b/codecs/codec_g726.c @@ -692,7 +692,7 @@ static int lintog726_new(struct ast_trans_pvt *pvt) static int g726aal2tolin_framein (struct ast_trans_pvt *pvt, struct ast_frame *f) { struct g726_coder_pvt *tmp = pvt->pvt; - unsigned char *src = f->data; + unsigned char *src = f->data.ptr; int16_t *dst = (int16_t *) pvt->outbuf + pvt->samples; unsigned int i; @@ -711,7 +711,7 @@ static int g726aal2tolin_framein (struct ast_trans_pvt *pvt, struct ast_frame *f static int lintog726aal2_framein(struct ast_trans_pvt *pvt, struct ast_frame *f) { struct g726_coder_pvt *tmp = pvt->pvt; - int16_t *src = f->data; + int16_t *src = f->data.ptr; unsigned int i; for (i = 0; i < f->samples; i++) { @@ -733,7 +733,7 @@ static int lintog726aal2_framein(struct ast_trans_pvt *pvt, struct ast_frame *f) static int g726tolin_framein (struct ast_trans_pvt *pvt, struct ast_frame *f) { struct g726_coder_pvt *tmp = pvt->pvt; - unsigned char *src = f->data; + unsigned char *src = f->data.ptr; int16_t *dst = (int16_t *) pvt->outbuf + pvt->samples; unsigned int i; @@ -752,7 +752,7 @@ static int g726tolin_framein (struct ast_trans_pvt *pvt, struct ast_frame *f) static int lintog726_framein(struct ast_trans_pvt *pvt, struct ast_frame *f) { struct g726_coder_pvt *tmp = pvt->pvt; - int16_t *src = f->data; + int16_t *src = f->data.ptr; unsigned int i; for (i = 0; i < f->samples; i++) { @@ -773,7 +773,7 @@ static int lintog726_framein(struct ast_trans_pvt *pvt, struct ast_frame *f) /*! \brief convert G726-32 RFC3551 packed data into AAL2 packed data (or vice-versa) */ static int g726tog726aal2_framein(struct ast_trans_pvt *pvt, struct ast_frame *f) { - unsigned char *src = f->data; + unsigned char *src = f->data.ptr; unsigned char *dst = (unsigned char *) pvt->outbuf + pvt->samples; unsigned int i; @@ -794,7 +794,7 @@ static struct ast_frame *g726tolin_sample(void) .datalen = sizeof(g726_slin_ex), .samples = sizeof(g726_slin_ex) * 2, /* 2 samples per byte */ .src = __PRETTY_FUNCTION__, - .data = g726_slin_ex, + .data.ptr = g726_slin_ex, }; return &f; @@ -808,7 +808,7 @@ static struct ast_frame *lintog726_sample (void) .datalen = sizeof(slin_g726_ex), .samples = sizeof(slin_g726_ex) / 2, /* 1 sample per 2 bytes */ .src = __PRETTY_FUNCTION__, - .data = slin_g726_ex, + .data.ptr = slin_g726_ex, }; return &f; |