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

fixes 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@4751 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2007-03-23 16:34:13 +00:00
parent 318dc8b4e5
commit 3b84b53819
1 changed files with 39 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
src/mod/applications/mod_conference/mod_conference.c
View File

@ -735,7 +735,7 @@ static void *SWITCH_THREAD_FUNC conference_thread_run(switch_thread_t *thread, v
if (conference->fnode->leadin) { if (conference->fnode->leadin) {
conference->fnode->leadin--; conference->fnode->leadin--;
} else { } else {
ready++; file_sample_len = samples;
if (conference->fnode->type == NODE_TYPE_SPEECH) { if (conference->fnode->type == NODE_TYPE_SPEECH) {
switch_speech_flag_t flags = SWITCH_SPEECH_FLAG_BLOCKING; switch_speech_flag_t flags = SWITCH_SPEECH_FLAG_BLOCKING;
uint32_t rate = conference->rate; uint32_t rate = conference->rate;
@ -758,34 +758,40 @@ static void *SWITCH_THREAD_FUNC conference_thread_run(switch_thread_t *thread, v
} }
} }
has_file_data = 1; has_file_data = 1;
ready++;
} else { } else {
has_file_data = 0; has_file_data = 0;
} }
if (conference->async_fnode) { if (conference->async_fnode) {
switch_core_file_read(&conference->async_fnode->fh, async_file_frame, &file_sample_len); /* Lead in time */
if (conference->async_fnode->leadin) {
if (file_sample_len <= 0) { conference->async_fnode->leadin--;
conference->async_fnode->done++;
} else { } else {
if (has_file_data) { file_sample_len = samples;
switch_size_t x; switch_core_file_read(&conference->async_fnode->fh, async_file_frame, &file_sample_len);
for (x = 0; x < file_sample_len; x++) { if (file_sample_len <= 0) {
int32_t z; conference->async_fnode->done++;
int16_t *bptr, *muxed;
muxed = (int16_t *) file_frame;
bptr = (int16_t *) async_file_frame;
z = muxed[x] + bptr[x];
switch_normalize_to_16bit(z);
muxed[x] = (int16_t)z;
}
} else { } else {
memcpy(file_frame, async_file_frame, file_sample_len * 2); if (has_file_data) {
has_file_data = 1; switch_size_t x;
for (x = 0; x < file_sample_len; x++) {
int32_t z;
int16_t *bptr, *muxed;
muxed = (int16_t *) file_frame;
bptr = (int16_t *) async_file_frame;
z = muxed[x] + bptr[x];
switch_normalize_to_16bit(z);
muxed[x] = (int16_t)z;
}
} else {
memcpy(file_frame, async_file_frame, file_sample_len * 2);
has_file_data = 1;
ready++;
}
} }
} }
} }
if (ready) { if (ready) {
@ -833,22 +839,22 @@ static void *SWITCH_THREAD_FUNC conference_thread_run(switch_thread_t *thread, v
if (imember->read > imember->len) { if (imember->read > imember->len) {
imember->len = imember->read; imember->len = imember->read;
} }
bptr = (int16_t *) imember->frame; bptr = (int16_t *) imember->frame;
muxed = (int16_t *) omember->mux_frame; muxed = (int16_t *) omember->mux_frame;
for (x = 0; x < imember->read / 2; x++) { for (x = 0; x < imember->read / 2; x++) {
int32_t z = muxed[x] + bptr[x]; int32_t z = muxed[x] + bptr[x];
switch_normalize_to_16bit(z); switch_normalize_to_16bit(z);
muxed[x] = (int16_t)z; muxed[x] = (int16_t)z;
} }
ready++; ready++;
} }
} }
} }
/* Go back and write each member his dedicated copy of the audio frame that does not contain his own audio. */ /* Go back and write each member his dedicated copy of the audio frame that does not contain his own audio. */
for (imember = conference->members; imember; imember = imember->next) { for (imember = conference->members; imember; imember = imember->next) {
if (switch_test_flag(imember, MFLAG_RUNNING)) { if (switch_test_flag(imember, MFLAG_RUNNING)) {
@ -1958,7 +1964,7 @@ static switch_status_t conference_play_file(conference_obj_t *conference, char *
} }
} }
if (!strncasecmp(file, "say:", 4)) { if (!async && !strncasecmp(file, "say:", 4)) {
status = conference_say(conference, file + 4, leadin); status = conference_say(conference, file + 4, leadin);
goto done; goto done;
} }
@ -1969,10 +1975,12 @@ static switch_status_t conference_play_file(conference_obj_t *conference, char *
goto done; goto done;
} }
file = dfile; file = dfile;
} else { } else if (!async) {
status = conference_say(conference, file, leadin); status = conference_say(conference, file, leadin);
goto done; goto done;
} } else {
goto done;
}
} }
/* Setup a memory pool to use. */ /* Setup a memory pool to use. */
@ -2017,8 +2025,10 @@ static switch_status_t conference_play_file(conference_obj_t *conference, char *
conference->async_fnode = fnode; conference->async_fnode = fnode;
if (nptr) { if (nptr) {
switch_speech_flag_t flags = SWITCH_SPEECH_FLAG_NONE; switch_memory_pool_t *pool;
switch_core_speech_close(&conference->fnode->sh, &flags); switch_core_file_close(&nptr->fh);
pool = nptr->pool;
switch_core_destroy_memory_pool(&pool);
} }
} else { } else {