kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-03-13 12:40:17 +00:00
Code Issues Projects Releases Wiki Activity

update

Browse Source 
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@5341 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2007-06-13 15:19:16 +00:00
parent 057ba60aaf
commit 59f50d6a2f
2 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
conf/default_context.xml
View File

@ -28,6 +28,7 @@
a.k.a. by the dtmf of the A leg. a.k.a. by the dtmf of the A leg.
if it were 'recv' then it would be parsed when the dtmf was if it were 'recv' then it would be parsed when the dtmf was
received *from* the b leg so it could control itself. received *from* the b leg so it could control itself.
The optional keywords "read" and "write" will also change the stream replaced
--> -->
<action application="set" data="bridge_pre_execute_bleg_data=send -4s"/> <action application="set" data="bridge_pre_execute_bleg_data=send -4s"/>
<action application="bridge" data="sofia/$${domain}/foo"/> <action application="bridge" data="sofia/$${domain}/foo"/>

38
src/mod/applications/mod_soundtouch/mod_soundtouch.cpp
View File

@ -46,6 +46,7 @@ struct soundtouch_helper {
SoundTouch *st; SoundTouch *st;
switch_core_session_t *session; switch_core_session_t *session;
int send; int send;
int read;
float pitch; float pitch;
float octaves; float octaves;
float semi; float semi;
@ -208,6 +209,7 @@ static switch_bool_t soundtouch_callback(switch_media_bug_t *bug, void *user_dat
case SWITCH_ABC_TYPE_READ: case SWITCH_ABC_TYPE_READ:
case SWITCH_ABC_TYPE_WRITE: case SWITCH_ABC_TYPE_WRITE:
break; break;
case SWITCH_ABC_TYPE_READ_REPLACE:
case SWITCH_ABC_TYPE_WRITE_REPLACE: case SWITCH_ABC_TYPE_WRITE_REPLACE:
{ {
switch_frame_t *frame; switch_frame_t *frame;
@ -215,7 +217,12 @@ static switch_bool_t soundtouch_callback(switch_media_bug_t *bug, void *user_dat
assert(sth != NULL); assert(sth != NULL);
assert(sth->st != NULL); assert(sth->st != NULL);
frame = switch_core_media_bug_get_write_replace_frame(bug); if (sth->read) {
frame = switch_core_media_bug_get_read_replace_frame(bug);
} else {
frame = switch_core_media_bug_get_write_replace_frame(bug);
}
sth->st->putSamples((SAMPLETYPE *)frame->data, frame->samples); sth->st->putSamples((SAMPLETYPE *)frame->data, frame->samples);
if (sth->st->numSamples() >= frame->samples * 2) { if (sth->st->numSamples() >= frame->samples * 2) {
@ -224,9 +231,12 @@ static switch_bool_t soundtouch_callback(switch_media_bug_t *bug, void *user_dat
} else { } else {
memset(frame->data, 0, frame->datalen); memset(frame->data, 0, frame->datalen);
} }
switch_core_media_bug_set_write_replace_frame(bug, frame); if (sth->read) {
switch_core_media_bug_set_read_replace_frame(bug, frame);
} else {
switch_core_media_bug_set_write_replace_frame(bug, frame);
}
} }
default: default:
@ -258,14 +268,15 @@ static void soundtouch_start_function(switch_core_session_t *session, char *data
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]))))) {
if (!strcasecmp(argv[0], "send") && argc >= 1) { sth->send = 0;
sth->send = 1; sth->read = 0;
} else { sth->pitch = 1;
sth->send = 0; for(x = 0; x < argc; x++) {
} if (!strncasecmp(argv[x], "send", 4)) {
sth->send = 1;
for(x = 1; x < argc; x++) { } else if (!strncasecmp(argv[x], "read", 4)) {
if (strchr(argv[x], 'p')) { sth->read = 1;
} else if (strchr(argv[x], 'p')) {
if ((sth->pitch = atof(argv[x]) < 0)) { if ((sth->pitch = atof(argv[x]) < 0)) {
sth->pitch = 0; sth->pitch = 0;
} }
@ -286,7 +297,8 @@ static void soundtouch_start_function(switch_core_session_t *session, char *data
sth->session = session; sth->session = session;
if ((status = switch_core_media_bug_add(session, soundtouch_callback, sth, 0, SMBF_WRITE_REPLACE, &bug)) != SWITCH_STATUS_SUCCESS) { if ((status = switch_core_media_bug_add(session, soundtouch_callback, sth, 0,
sth->read ? SMBF_READ_REPLACE : SMBF_WRITE_REPLACE, &bug)) != SWITCH_STATUS_SUCCESS) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failure!\n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failure!\n");
return; return;
} }