kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

update 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@6600 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2007-12-10 18:13:07 +00:00
parent 9944918ea0
commit 1c45f71722
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mod/applications/mod_dptools/mod_dptools.c
View File

@ -1201,7 +1201,7 @@ SWITCH_STANDARD_APP(displace_session_function)
if (data && (lbuf = switch_core_session_strdup(session, data)) if (data && (lbuf = switch_core_session_strdup(session, data))
&& (argc = switch_separate_string(lbuf, ' ', argv, (sizeof(argv) / sizeof(argv[0]))))) { && (argc = switch_separate_string(lbuf, ' ', argv, (sizeof(argv) / sizeof(argv[0]))))) {
path = argv[0]; path = argv[0];
for(x = 0; x < argc; x++) { for(x = 1; x < argc; x++) {
if (strchr(argv[x], '+')) { if (strchr(argv[x], '+')) {
limit = atoi(argv[x]); limit = atoi(argv[x]);
} else if (!switch_strlen_zero(argv[x])) { } else if (!switch_strlen_zero(argv[x])) {

12
src/switch_ivr_async.c
View File

@ -131,6 +131,7 @@ static switch_bool_t displace_callback(switch_media_bug_t *bug, void *user_data,
if (dh) { if (dh) {
switch_frame_t *frame = NULL; switch_frame_t *frame = NULL;
switch_size_t len; switch_size_t len;
switch_status_t st;
frame = switch_core_media_bug_get_write_replace_frame(bug); frame = switch_core_media_bug_get_write_replace_frame(bug);
len = frame->samples; len = frame->samples;
@ -139,8 +140,8 @@ static switch_bool_t displace_callback(switch_media_bug_t *bug, void *user_data,
int16_t buf[1024]; int16_t buf[1024];
int16_t *fp = frame->data; int16_t *fp = frame->data;
uint32_t x; uint32_t x;
switch_core_file_read(&dh->fh, buf, &len); st = switch_core_file_read(&dh->fh, buf, &len);
for(x = 0; x < (uint32_t) len; x++) { for(x = 0; x < (uint32_t) len; x++) {
int32_t mixed = fp[x] + buf[x]; int32_t mixed = fp[x] + buf[x];
@ -148,10 +149,15 @@ static switch_bool_t displace_callback(switch_media_bug_t *bug, void *user_data,
fp[x] = (int16_t) mixed; fp[x] = (int16_t) mixed;
} }
} else { } else {
switch_core_file_read(&dh->fh, frame->data, &len); st = switch_core_file_read(&dh->fh, frame->data, &len);
frame->samples = (uint32_t) len; frame->samples = (uint32_t) len;
frame->datalen = frame->samples * 2; frame->datalen = frame->samples * 2;
} }
if (st != SWITCH_STATUS_SUCCESS || len == 0) {
return SWITCH_FALSE;
}
switch_core_media_bug_set_write_replace_frame(bug, frame); switch_core_media_bug_set_write_replace_frame(bug, frame);
} }
break; break;