[asterisk-commits] ctooley: branch ctooley/excel-sip-changes r117840 - in /team/ctooley/excel-si...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Thu May 22 12:23:33 CDT 2008
Author: ctooley
Date: Thu May 22 12:23:32 2008
New Revision: 117840
URL: http://svn.digium.com/view/asterisk?view=rev&rev=117840
Log:
Merged revisions 117825,117828,117834 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r117825 | mvanbaak | 2008-05-22 12:08:18 -0500 (Thu, 22 May 2008) | 2 lines
oops
........
r117828 | qwell | 2008-05-22 12:10:53 -0500 (Thu, 22 May 2008) | 1 line
Fix a few places where frame data was used directly.
........
r117834 | mvanbaak | 2008-05-22 12:16:08 -0500 (Thu, 22 May 2008) | 2 lines
chan_console fixes because of ast_frame.data => ast_frame.data.ptr
........
Modified:
team/ctooley/excel-sip-changes/ (props changed)
team/ctooley/excel-sip-changes/apps/app_jack.c
team/ctooley/excel-sip-changes/channels/chan_console.c
team/ctooley/excel-sip-changes/channels/chan_misdn.c
team/ctooley/excel-sip-changes/codecs/codec_speex.c
team/ctooley/excel-sip-changes/formats/format_ogg_vorbis.c
team/ctooley/excel-sip-changes/funcs/func_speex.c
Propchange: team/ctooley/excel-sip-changes/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu May 22 12:23:32 2008
@@ -1,1 +1,1 @@
-/trunk:1-117823
+/trunk:1-117837
Modified: team/ctooley/excel-sip-changes/apps/app_jack.c
URL: http://svn.digium.com/view/asterisk/team/ctooley/excel-sip-changes/apps/app_jack.c?view=diff&rev=117840&r1=117839&r2=117840
==============================================================================
--- team/ctooley/excel-sip-changes/apps/app_jack.c (original)
+++ team/ctooley/excel-sip-changes/apps/app_jack.c Thu May 22 12:23:32 2008
@@ -484,7 +484,7 @@
float f_buf[f->samples * 8];
size_t f_buf_used = 0;
int i;
- int16_t *s_buf = f->data;
+ int16_t *s_buf = f->data.ptr;
size_t res;
memset(f_buf, 0, sizeof(f_buf));
@@ -572,7 +572,7 @@
.frametype = AST_FRAME_VOICE,
.subclass = AST_FORMAT_SLINEAR,
.src = "JACK",
- .data = buf,
+ .data.ptr = buf,
.datalen = sizeof(buf),
.samples = ARRAY_LEN(buf),
};
@@ -582,7 +582,7 @@
char *read_buf;
read_len = out_frame ? out_frame->datalen : sizeof(buf);
- read_buf = out_frame ? out_frame->data : buf;
+ read_buf = out_frame ? out_frame->data.ptr : buf;
res = jack_ringbuffer_read_space(jack_data->input_rb);
@@ -590,7 +590,7 @@
/* Not enough data ready for another frame, move on ... */
if (out_frame) {
ast_debug(1, "Sending an empty frame for the JACK_HOOK\n");
- memset(out_frame->data, 0, out_frame->datalen);
+ memset(out_frame->data.ptr, 0, out_frame->datalen);
}
break;
}
Modified: team/ctooley/excel-sip-changes/channels/chan_console.c
URL: http://svn.digium.com/view/asterisk/team/ctooley/excel-sip-changes/channels/chan_console.c?view=diff&rev=117840&r1=117839&r2=117840
==============================================================================
--- team/ctooley/excel-sip-changes/channels/chan_console.c (original)
+++ team/ctooley/excel-sip-changes/channels/chan_console.c Thu May 22 12:23:32 2008
@@ -273,7 +273,7 @@
.frametype = AST_FRAME_VOICE,
.subclass = AST_FORMAT_SLINEAR16,
.src = "console_stream_monitor",
- .data = buf,
+ .data.ptr = buf,
.datalen = sizeof(buf),
.samples = sizeof(buf) / sizeof(int16_t),
};
@@ -592,7 +592,7 @@
{
struct console_pvt *pvt = chan->tech_pvt;
- Pa_WriteStream(pvt->stream, f->data, f->samples);
+ Pa_WriteStream(pvt->stream, f->data.ptr, f->samples);
return 0;
}
@@ -1084,7 +1084,7 @@
struct console_pvt *pvt = get_active_pvt();
struct ast_frame f = {
.frametype = AST_FRAME_TEXT,
- .data = buf,
+ .data.ptr = buf,
.src = "console_send_text",
};
int len;
Modified: team/ctooley/excel-sip-changes/channels/chan_misdn.c
URL: http://svn.digium.com/view/asterisk/team/ctooley/excel-sip-changes/channels/chan_misdn.c?view=diff&rev=117840&r1=117839&r2=117840
==============================================================================
--- team/ctooley/excel-sip-changes/channels/chan_misdn.c (original)
+++ team/ctooley/excel-sip-changes/channels/chan_misdn.c Thu May 22 12:23:32 2008
@@ -3120,7 +3120,7 @@
cl->notxtone = 0;
cl->norxtone = 0;
/* This prods us in misdn_write */
- ast_playtones_start(ast, 0, ts->data.ptr, 0);
+ ast_playtones_start(ast, 0, ts->data, 0);
}
return 0;
Modified: team/ctooley/excel-sip-changes/codecs/codec_speex.c
URL: http://svn.digium.com/view/asterisk/team/ctooley/excel-sip-changes/codecs/codec_speex.c?view=diff&rev=117840&r1=117839&r2=117840
==============================================================================
--- team/ctooley/excel-sip-changes/codecs/codec_speex.c (original)
+++ team/ctooley/excel-sip-changes/codecs/codec_speex.c Thu May 22 12:23:32 2008
@@ -165,7 +165,7 @@
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 @@
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 @@
}
/* 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 @@
/* 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;
}
Modified: team/ctooley/excel-sip-changes/formats/format_ogg_vorbis.c
URL: http://svn.digium.com/view/asterisk/team/ctooley/excel-sip-changes/formats/format_ogg_vorbis.c?view=diff&rev=117840&r1=117839&r2=117840
==============================================================================
--- team/ctooley/excel-sip-changes/formats/format_ogg_vorbis.c (original)
+++ team/ctooley/excel-sip-changes/formats/format_ogg_vorbis.c Thu May 22 12:23:32 2008
@@ -291,7 +291,7 @@
if (!f->datalen)
return -1;
- data = (short *) f->data;
+ data = (short *) f->data.ptr;
buffer = vorbis_analysis_buffer(&s->vd, f->samples);
@@ -433,7 +433,7 @@
fs->fr.subclass = AST_FORMAT_SLINEAR;
fs->fr.mallocd = 0;
AST_FRAME_SET_BUFFER(&fs->fr, fs->buf, AST_FRIENDLY_OFFSET, BUF_SIZE);
- buf = (short *)(fs->fr.data); /* SLIN data buffer */
+ buf = (short *)(fs->fr.data.ptr); /* SLIN data buffer */
while (samples_out != SAMPLES_MAX) {
float **pcm;
Modified: team/ctooley/excel-sip-changes/funcs/func_speex.c
URL: http://svn.digium.com/view/asterisk/team/ctooley/excel-sip-changes/funcs/func_speex.c?view=diff&rev=117840&r1=117839&r2=117840
==============================================================================
--- team/ctooley/excel-sip-changes/funcs/func_speex.c (original)
+++ team/ctooley/excel-sip-changes/funcs/func_speex.c Thu May 22 12:23:32 2008
@@ -135,7 +135,7 @@
speex_preprocess_ctl(sdi->state, SPEEX_PREPROCESS_SET_DENOISE, &sdi->denoise);
}
- speex_preprocess(sdi->state, frame->data, NULL);
+ speex_preprocess(sdi->state, frame->data.ptr, NULL);
return 0;
}
More information about the asterisk-commits
mailing list