From f1e9371da8b502999b9aec1db7f68635395a7b6a Mon Sep 17 00:00:00 2001 From: Michiel van Baak Date: Thu, 22 May 2008 16:29:54 +0000 Subject: - 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: https://origsvn.digium.com/svn/asterisk/trunk@117802 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- codecs/codec_g722.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'codecs/codec_g722.c') diff --git a/codecs/codec_g722.c b/codecs/codec_g722.c index 02f4720cd..a574136e8 100644 --- a/codecs/codec_g722.c +++ b/codecs/codec_g722.c @@ -108,7 +108,7 @@ static int g722tolin_framein(struct ast_trans_pvt *pvt, struct ast_frame *f) in_samples = f->samples / 2; out_samples = g722_decode(&tmp->g722, (int16_t *) &pvt->outbuf[pvt->samples * sizeof(int16_t)], - (uint8_t *) f->data, in_samples); + (uint8_t *) f->data.ptr, in_samples); pvt->samples += out_samples; @@ -123,7 +123,7 @@ static int lintog722_framein(struct ast_trans_pvt *pvt, struct ast_frame *f) int outlen; outlen = g722_encode(&tmp->g722, (uint8_t *) (&pvt->outbuf[pvt->datalen]), - (int16_t *) f->data, f->samples); + (int16_t *) f->data.ptr, f->samples); pvt->samples += outlen * 2; @@ -140,7 +140,7 @@ static struct ast_frame *g722tolin_sample(void) .datalen = sizeof(g722_slin_ex), .samples = sizeof(g722_slin_ex) * 2, .src = __PRETTY_FUNCTION__, - .data = g722_slin_ex, + .data.ptr = g722_slin_ex, }; return &f; @@ -154,7 +154,7 @@ static struct ast_frame *g722tolin16_sample(void) .datalen = sizeof(g722_slin_ex), .samples = sizeof(g722_slin_ex) * 2, .src = __PRETTY_FUNCTION__, - .data = g722_slin_ex, + .data.ptr = g722_slin_ex, }; return &f; @@ -168,7 +168,7 @@ static struct ast_frame *lintog722_sample (void) .datalen = sizeof(slin_g722_ex), .samples = sizeof(slin_g722_ex) / sizeof(slin_g722_ex[0]), .src = __PRETTY_FUNCTION__, - .data = slin_g722_ex, + .data.ptr = slin_g722_ex, }; return &f; @@ -182,7 +182,7 @@ static struct ast_frame *lin16tog722_sample (void) .datalen = sizeof(slin_g722_ex), .samples = sizeof(slin_g722_ex) / sizeof(slin_g722_ex[0]), .src = __PRETTY_FUNCTION__, - .data = slin_g722_ex, + .data.ptr = slin_g722_ex, }; return &f; -- cgit v1.2.3