diff options
author | Michiel van Baak <michiel@vanbaak.info> | 2008-05-22 16:29:54 +0000 |
---|---|---|
committer | Michiel van Baak <michiel@vanbaak.info> | 2008-05-22 16:29:54 +0000 |
commit | f1e9371da8b502999b9aec1db7f68635395a7b6a (patch) | |
tree | bcbbf4eda53cdb8257bbc7add4616e01e31b1ae2 /codecs/codec_resample.c | |
parent | 2c7760e6262c97afc19037890242299421d62157 (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: https://origsvn.digium.com/svn/asterisk/trunk@117802 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'codecs/codec_resample.c')
-rw-r--r-- | codecs/codec_resample.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/codecs/codec_resample.c b/codecs/codec_resample.c index 251d99c23..bdf9d19f9 100644 --- a/codecs/codec_resample.c +++ b/codecs/codec_resample.c @@ -102,7 +102,7 @@ static int resample_frame(struct ast_trans_pvt *pvt, { int total_in_buf_used = 0; int total_out_buf_used = 0; - int16_t *in_buf = (int16_t *) f->data; + int16_t *in_buf = (int16_t *) f->data.ptr; int16_t *out_buf = (int16_t *) pvt->outbuf + pvt->samples; float in_buf_f[f->samples]; float out_buf_f[2048]; @@ -168,7 +168,7 @@ static struct ast_frame *slin16_to_slin8_sample(void) .datalen = sizeof(slin16_slin8_ex), .samples = sizeof(slin16_slin8_ex) / sizeof(slin16_slin8_ex[0]), .src = __PRETTY_FUNCTION__, - .data = slin16_slin8_ex, + .data.ptr = slin16_slin8_ex, }; return &f; @@ -182,7 +182,7 @@ static struct ast_frame *slin8_to_slin16_sample(void) .datalen = sizeof(slin8_slin16_ex), .samples = sizeof(slin8_slin16_ex) / sizeof(slin8_slin16_ex[0]), .src = __PRETTY_FUNCTION__, - .data = slin8_slin16_ex, + .data.ptr = slin8_slin16_ex, }; return &f; |