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

zag 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@7438 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2008-01-30 17:23:36 +00:00
parent fc20408ad4
commit e7bbaca9db
1 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -133,7 +133,8 @@ typedef enum {
MFLAG_INTREE = (1 << 6), MFLAG_INTREE = (1 << 6),
MFLAG_WASTE_BANDWIDTH = (1 << 7), MFLAG_WASTE_BANDWIDTH = (1 << 7),
MFLAG_FLUSH_BUFFER = (1 << 8), MFLAG_FLUSH_BUFFER = (1 << 8),
MFLAG_ENDCONF = (1 << 9) MFLAG_ENDCONF = (1 << 9),
MFLAG_HAS_AUDIO = (1 << 10)
} member_flag_t; } member_flag_t;
typedef enum { typedef enum {
@ -222,6 +223,8 @@ typedef struct conference_obj {
uint8_t min; uint8_t min;
switch_speech_handle_t lsh; switch_speech_handle_t lsh;
switch_speech_handle_t *sh; switch_speech_handle_t *sh;
switch_byte_t *not_talking_buf;
uint32_t not_talking_buf_len;
} conference_obj_t; } conference_obj_t;
/* Relationship with another member */ /* Relationship with another member */
@ -715,12 +718,12 @@ static void *SWITCH_THREAD_FUNC conference_thread_run(switch_thread_t * thread,
conference_member_t *imember, *omember; conference_member_t *imember, *omember;
uint32_t samples = switch_bytes_per_frame(conference->rate, conference->interval); uint32_t samples = switch_bytes_per_frame(conference->rate, conference->interval);
uint32_t bytes = samples * 2; uint32_t bytes = samples * 2;
uint8_t ready = 0; uint8_t ready = 0, total = 0;
switch_timer_t timer = { 0 }; switch_timer_t timer = { 0 };
switch_event_t *event; switch_event_t *event;
uint8_t *file_frame; uint8_t *file_frame;
uint8_t *async_file_frame; uint8_t *async_file_frame;
file_frame = switch_core_alloc(conference->pool, SWITCH_RECOMMENDED_BUFFER_SIZE); file_frame = switch_core_alloc(conference->pool, SWITCH_RECOMMENDED_BUFFER_SIZE);
async_file_frame = switch_core_alloc(conference->pool, SWITCH_RECOMMENDED_BUFFER_SIZE); async_file_frame = switch_core_alloc(conference->pool, SWITCH_RECOMMENDED_BUFFER_SIZE);
@ -753,10 +756,11 @@ static void *SWITCH_THREAD_FUNC conference_thread_run(switch_thread_t * thread,
break; break;
} }
switch_mutex_lock(conference->mutex); switch_mutex_lock(conference->mutex);
ready = 0; ready = total = 0;
/* Read one frame of audio from each member channel and save it for redistribution */ /* Read one frame of audio from each member channel and save it for redistribution */
for (imember = conference->members; imember; imember = imember->next) { for (imember = conference->members; imember; imember = imember->next) {
total++;
if (imember->buflen) { if (imember->buflen) {
memset(imember->frame, 255, imember->buflen); memset(imember->frame, 255, imember->buflen);
} else { } else {
@ -764,11 +768,12 @@ static void *SWITCH_THREAD_FUNC conference_thread_run(switch_thread_t * thread,
imember->mux_frame = switch_core_alloc(imember->pool, bytes); imember->mux_frame = switch_core_alloc(imember->pool, bytes);
imember->buflen = bytes; imember->buflen = bytes;
} }
switch_clear_flag(imember, MFLAG_HAS_AUDIO);
switch_mutex_lock(imember->audio_in_mutex); switch_mutex_lock(imember->audio_in_mutex);
/* if there is audio in the resample buffer it takes precedence over the other data */ /* if there is audio in the resample buffer it takes precedence over the other data */
if (imember->mux_resampler && switch_buffer_inuse(imember->resample_buffer) >= bytes) { if (imember->mux_resampler && switch_buffer_inuse(imember->resample_buffer) >= bytes) {
imember->read = (uint32_t) switch_buffer_read(imember->resample_buffer, imember->frame, bytes); imember->read = (uint32_t) switch_buffer_read(imember->resample_buffer, imember->frame, bytes);
switch_set_flag(imember, MFLAG_HAS_AUDIO);
ready++; ready++;
} else if ((imember->read = (uint32_t) switch_buffer_read(imember->audio_buffer, imember->frame, imember->buflen))) { } else if ((imember->read = (uint32_t) switch_buffer_read(imember->audio_buffer, imember->frame, imember->buflen))) {
/* If the caller is not at the right sample rate resample him to suit and buffer accordingly */ /* If the caller is not at the right sample rate resample him to suit and buffer accordingly */
@ -791,9 +796,11 @@ static void *SWITCH_THREAD_FUNC conference_thread_run(switch_thread_t * thread,
switch_buffer_write(imember->resample_buffer, out, len); switch_buffer_write(imember->resample_buffer, out, len);
if (switch_buffer_inuse(imember->resample_buffer) >= bytes) { if (switch_buffer_inuse(imember->resample_buffer) >= bytes) {
imember->read = (uint32_t) switch_buffer_read(imember->resample_buffer, imember->frame, bytes); imember->read = (uint32_t) switch_buffer_read(imember->resample_buffer, imember->frame, bytes);
switch_set_flag(imember, MFLAG_HAS_AUDIO);
ready++; ready++;
} }
} else { } else {
switch_set_flag(imember, MFLAG_HAS_AUDIO);
ready++; /* Tally of how many channels had data */ ready++; /* Tally of how many channels had data */
} }
} }
@ -861,6 +868,7 @@ static void *SWITCH_THREAD_FUNC conference_thread_run(switch_thread_t * thread,
} }
if (ready) { if (ready) {
int nt = 0;
/* Build a muxed frame for every member that contains the mixed audio of everyone else */ /* Build a muxed frame for every member that contains the mixed audio of everyone else */
for (omember = conference->members; omember; omember = omember->next) { for (omember = conference->members; omember; omember = omember->next) {
omember->len = bytes; omember->len = bytes;
@ -901,6 +909,12 @@ static void *SWITCH_THREAD_FUNC conference_thread_run(switch_thread_t * thread,
} }
} }
} }
if (nt && conference->not_talking_buf_len && !switch_test_flag(omember, MFLAG_HAS_AUDIO)) {
memcpy(omember->mux_frame, conference->not_talking_buf, conference->not_talking_buf_len);
continue;
}
if (imember->read > imember->len) { if (imember->read > imember->len) {
imember->len = imember->read; imember->len = imember->read;
@ -915,8 +929,15 @@ static void *SWITCH_THREAD_FUNC conference_thread_run(switch_thread_t * thread,
switch_normalize_to_16bit(z); switch_normalize_to_16bit(z);
muxed[x] = (int16_t) z; muxed[x] = (int16_t) z;
} }
ready++; if (total - ready > 1) {
conference->not_talking_buf_len = imember->read;
if (!conference->not_talking_buf) {
conference->not_talking_buf = switch_core_alloc(conference->pool, imember->read + 128);
}
memcpy(conference->not_talking_buf, muxed, conference->not_talking_buf_len);
nt++;
}
} }
} }
} }