Preston_PLB/freeswitch
1
0
Fork 0
forked from Mirrors/freeswitch
Code Pull Requests Activity

revert fd9d77feee

Browse Source
This commit is contained in:
Anthony Minessale 2014-07-23 01:01:44 +05:00
parent d6574e8c0f
commit 93983e63cc
1 changed files with 19 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -401,7 +401,6 @@ typedef struct conference_obj {
switch_memory_pool_t *pool;
switch_thread_rwlock_t *rwlock;
uint32_t count;
uint32_t count3d;
int32_t energy_level;
uint8_t min;
switch_speech_handle_t lsh;
@ -465,7 +464,6 @@ struct conference_member {
conference_obj_t *conference;
switch_memory_pool_t *pool;
switch_buffer_t *audio_buffer;
switch_buffer_t *clean_audio_buffer;
switch_buffer_t *mux_buffer;
switch_buffer_t *resample_buffer;
uint32_t flags;
@ -487,13 +485,10 @@ struct conference_member {
switch_time_t rec_time;
conference_record_t *rec;
uint8_t *frame;
uint8_t *clean_frame;
uint8_t *last_frame;
uint32_t frame_size;
uint32_t clean_frame_size;
uint8_t *mux_frame;
uint32_t read;
uint32_t clean_read;
uint32_t vol_period;
int32_t energy_level;
int32_t agc_volume_in_level;
@ -682,7 +677,7 @@ static void gen_arc(conference_obj_t *conference, switch_stream_handle_t *stream
offset = 180 / (count - 1);
radius = 1.5f;//3.0f; //(float)count / 2.0f; //3.0f;
radius = 2.0f;//3.0f; //(float)count / 2.0f; //3.0f;
pos = -90.0f;// + (offset / 2.0f);
@ -694,9 +689,6 @@ static void gen_arc(conference_obj_t *conference, switch_stream_handle_t *stream
if (!member->al) {
member->al = create_al(member->pool);
switch_mutex_lock(member->conference->member_mutex);
member->conference->count3d++;
switch_mutex_unlock(member->conference->member_mutex);
}
switch_set_flag(member, MFLAG_POSITIONAL);
@ -776,7 +768,7 @@ static void process_al(al_handle_t *al, void *data, switch_size_t datalen, int r
alGenSources(1, &al->source);
alSourcef( al->source, AL_PITCH, 1.);
alSourcef( al->source, AL_GAIN, 1.2);
alSourcef( al->source, AL_GAIN, 1.);
alGenBuffers(2, al->buffer_in);
alBufferData(al->buffer_in[0], AL_FORMAT_MONO16, data, datalen, rate);
@ -2362,9 +2354,6 @@ static switch_status_t conference_add_member(conference_obj_t *conference, confe
switch_set_flag(member, MFLAG_POSITIONAL);
member->al = create_al(member->pool);
switch_mutex_lock(member->conference->member_mutex);
member->conference->count3d++;
switch_mutex_unlock(member->conference->member_mutex);
}
} else {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "%s cannot set position data on mono conference.\n", switch_channel_get_name(channel));
@ -2701,6 +2690,12 @@ static switch_status_t conference_del_member(conference_obj_t *conference, confe
conference_cdr_del(member);
#ifdef OPENAL_POSITIONING
if (member->al && member->al->device) {
close_al(member->al);
}
#endif
member_fnode = member->fnode;
member_sh = member->sh;
member->fnode = NULL;
@ -2718,13 +2713,6 @@ static switch_status_t conference_del_member(conference_obj_t *conference, confe
lock_member(member);
switch_clear_flag(member, MFLAG_INTREE);
#ifdef OPENAL_POSITIONING
if (member->al && member->al->device) {
member->conference->count3d--;
close_al(member->al);
}
#endif
for (imember = conference->members; imember; imember = imember->next) {
if (imember == member) {
if (last) {
@ -3142,13 +3130,6 @@ static void *SWITCH_THREAD_FUNC conference_thread_run(switch_thread_t *thread, v
switch_set_flag_locked(imember, MFLAG_HAS_AUDIO);
ready++;
}
if (imember->clean_audio_buffer && imember->clean_frame && switch_buffer_inuse(imember->clean_audio_buffer) >= bytes
&& (buf_read = (uint32_t) switch_buffer_read(imember->clean_audio_buffer, imember->clean_frame, bytes))) {
imember->clean_read = buf_read;
} else {
imember->clean_read = 0;
}
switch_mutex_unlock(imember->audio_in_mutex);
}
@ -3318,14 +3299,7 @@ static void *SWITCH_THREAD_FUNC conference_thread_run(switch_thread_t *thread, v
/* Use more bits in the main_frame to preserve the exact sum of the audio samples. */
int main_frame[SWITCH_RECOMMENDED_BUFFER_SIZE] = { 0 };
int16_t write_frame[SWITCH_RECOMMENDED_BUFFER_SIZE] = { 0 };
int clean_main_frame[SWITCH_RECOMMENDED_BUFFER_SIZE] = { 0 };
int clean = 0;
#ifdef OPENAL_POSITIONING
if (conference->channels == 2) {
clean = 1;
}
#endif
/* Init the main frame with file data if there is any. */
bptr = (int16_t *) file_frame;
@ -3334,14 +3308,9 @@ static void *SWITCH_THREAD_FUNC conference_thread_run(switch_thread_t *thread, v
for (x = 0; x < bytes / 2; x++) {
if (x <= file_sample_len * conference->channels) {
main_frame[x] = (int32_t) bptr[x];
if (clean) {
clean_main_frame[x] = (int32_t) bptr[x];
}
} else {
memset(&main_frame[x], 255, sizeof(main_frame[x]));
if (clean) {
memset(&clean_main_frame[x], 255, sizeof(main_frame[x]));
}
//printf("FUCCCK %d <= %ld (%ld/%d)\n", x, file_sample_len * conference->channels, file_sample_len, conference->channels);
}
}
}
@ -3370,14 +3339,6 @@ static void *SWITCH_THREAD_FUNC conference_thread_run(switch_thread_t *thread, v
for (x = 0; x < omember->read / 2; x++) {
main_frame[x] += (int32_t) bptr[x];
}
if (clean && omember->clean_read) {
bptr = (int16_t *) omember->clean_frame;
for (x = 0; x < omember->clean_read / 2; x++) {
clean_main_frame[x] += (int32_t) bptr[x];
}
}
}
if (conference->agc_level && conference->member_loop_count) {
@ -3412,21 +3373,10 @@ static void *SWITCH_THREAD_FUNC conference_thread_run(switch_thread_t *thread, v
continue;
}
if (omember->read_impl.number_of_channels == 1 && omember->clean_read) {
bptr = (int16_t *) omember->clean_frame;
} else {
bptr = (int16_t *) omember->frame;
}
bptr = (int16_t *) omember->frame;
for (x = 0; x < bytes / 2 ; x++) {
if (omember->read_impl.number_of_channels == 1 && omember->clean_read) {
z = clean_main_frame[x];
} else {
z = main_frame[x];
}
z = main_frame[x];
/* bptr[x] represents my own contribution to this audio sample */
if (switch_test_flag(omember, MFLAG_HAS_AUDIO) && x <= omember->read / 2) {
@ -4227,10 +4177,8 @@ static void check_agc_levels(conference_member_t *member)
}
}
static int member_check_channels(switch_frame_t *frame, conference_member_t *member, switch_bool_t in, switch_bool_t skip3d)
static void member_check_channels(switch_frame_t *frame, conference_member_t *member, switch_bool_t in)
{
int r = 0;
if (member->conference->channels != member->read_impl.number_of_channels || switch_test_flag(member, MFLAG_POSITIONAL)) {
uint32_t rlen;
int from, to;
@ -4245,7 +4193,7 @@ static void check_agc_levels(conference_member_t *member)
rlen = frame->datalen / 2 / from;
if (in && frame->rate == 48000 && ((from == 1 && to == 2) || (from == 2 && to == 2)) && switch_test_flag(member, MFLAG_POSITIONAL) && !skip3d) {
if (in && frame->rate == 48000 && ((from == 1 && to == 2) || (from == 2 && to == 2)) && switch_test_flag(member, MFLAG_POSITIONAL)) {
if (from == 2 && to == 2) {
switch_mux_channels((int16_t *) frame->data, rlen, 2, 1);
frame->datalen /= 2;
@ -4253,15 +4201,13 @@ static void check_agc_levels(conference_member_t *member)
}
process_al(member->al, frame->data, frame->datalen, frame->rate);
r++;
} else {
switch_mux_channels((int16_t *) frame->data, rlen, from, to);
}
frame->datalen = rlen * 2 * to;
}
return r;
}
@ -4561,7 +4507,6 @@ static void *SWITCH_THREAD_FUNC conference_loop_input(switch_thread_t *thread, v
switch_audio_resampler_t *read_resampler = member->read_resampler;
void *data;
uint32_t datalen;
int16_t save_frame[SWITCH_RECOMMENDED_BUFFER_SIZE] = { 0 };
if (read_resampler) {
int16_t *bptr = (int16_t *) read_frame->data;
@ -4577,14 +4522,11 @@ static void *SWITCH_THREAD_FUNC conference_loop_input(switch_thread_t *thread, v
datalen = read_frame->datalen;
}
if (member->clean_audio_buffer) {
memcpy(save_frame, data, datalen);
}
tmp_frame.data = data;
tmp_frame.datalen = datalen;
tmp_frame.rate = member->conference->rate;
member_check_channels(&tmp_frame, member, SWITCH_TRUE, SWITCH_FALSE);
member_check_channels(&tmp_frame, member, SWITCH_TRUE);
if (datalen) {
switch_size_t ok = 1;
@ -4593,24 +4535,9 @@ static void *SWITCH_THREAD_FUNC conference_loop_input(switch_thread_t *thread, v
switch_mutex_lock(member->audio_in_mutex);
if (switch_buffer_inuse(member->audio_buffer) > flush_len) {
switch_buffer_zero(member->audio_buffer);
if (member->clean_audio_buffer) {
switch_buffer_zero(member->clean_audio_buffer);
}
switch_channel_audio_sync(channel);
}
ok = switch_buffer_write(member->audio_buffer, tmp_frame.data, tmp_frame.datalen);
if (member->clean_audio_buffer) {
if (member->conference->count3d) {
tmp_frame.data = save_frame;
tmp_frame.datalen = datalen;
member_check_channels(&tmp_frame, member, SWITCH_TRUE, SWITCH_TRUE);
switch_buffer_write(member->clean_audio_buffer, tmp_frame.data, tmp_frame.datalen);
}
}
switch_mutex_unlock(member->audio_in_mutex);
if (!ok) {
switch_mutex_unlock(member->read_mutex);
@ -4991,7 +4918,7 @@ static void conference_loop_output(conference_member_t *member)
member_add_file_data(member, write_frame.data, write_frame.datalen);
}
member_check_channels(&write_frame, member, SWITCH_FALSE, SWITCH_FALSE);
member_check_channels(&write_frame, member, SWITCH_FALSE);
if (switch_core_session_write_frame(member->session, &write_frame, SWITCH_IO_FLAG_NONE, 0) != SWITCH_STATUS_SUCCESS) {
switch_mutex_unlock(member->audio_out_mutex);
@ -5007,7 +4934,7 @@ static void conference_loop_output(conference_member_t *member)
memset(write_frame.data, 255, write_frame.datalen);
write_frame.timestamp = timer.samplecount;
member_add_file_data(member, write_frame.data, write_frame.datalen);
member_check_channels(&write_frame, member, SWITCH_FALSE, SWITCH_FALSE);
member_check_channels(&write_frame, member, SWITCH_FALSE);
if (switch_core_session_write_frame(member->session, &write_frame, SWITCH_IO_FLAG_NONE, 0) != SWITCH_STATUS_SUCCESS) {
switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER);
break;
@ -5024,7 +4951,7 @@ static void conference_loop_output(conference_member_t *member)
write_frame.samples = samples;
write_frame.timestamp = timer.samplecount;
member_check_channels(&write_frame, member, SWITCH_FALSE, SWITCH_FALSE);
member_check_channels(&write_frame, member, SWITCH_FALSE);
if (switch_core_session_write_frame(member->session, &write_frame, SWITCH_IO_FLAG_NONE, 0) != SWITCH_STATUS_SUCCESS) {
switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER);
@ -5173,13 +5100,6 @@ static void *SWITCH_THREAD_FUNC conference_record_thread_run(switch_thread_t *th
member->mux_frame = switch_core_alloc(member->pool, member->frame_size);
#ifdef OPENAL_POSITIONING
if (member->conference->channels == 2) {
member->clean_frame_size = SWITCH_RECOMMENDED_BUFFER_SIZE;
member->clean_frame = switch_core_alloc(member->pool, member->clean_frame_size);
}
#endif
switch_mutex_init(&member->write_mutex, SWITCH_MUTEX_NESTED, rec->pool);
switch_mutex_init(&member->flag_mutex, SWITCH_MUTEX_NESTED, rec->pool);
switch_mutex_init(&member->fnode_mutex, SWITCH_MUTEX_NESTED, rec->pool);
@ -5194,17 +5114,6 @@ static void *SWITCH_THREAD_FUNC conference_record_thread_run(switch_thread_t *th
goto end;
}
#ifdef OPENAL_POSITIONING
if (conference->channels == 2) {
/* Setup an audio buffer for the incoming audio */
if (switch_buffer_create_dynamic(&member->clean_audio_buffer, CONF_DBLOCK_SIZE, CONF_DBUFFER_SIZE, 0) != SWITCH_STATUS_SUCCESS) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error Creating Audio Buffer!\n");
goto end;
}
}
#endif
/* Setup an audio buffer for the outgoing audio */
if (switch_buffer_create_dynamic(&member->mux_buffer, CONF_DBLOCK_SIZE, CONF_DBUFFER_SIZE, 0) != SWITCH_STATUS_SUCCESS) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error Creating Audio Buffer!\n");
@ -5344,9 +5253,6 @@ static void *SWITCH_THREAD_FUNC conference_record_thread_run(switch_thread_t *th
conference_del_member(conference, member);
switch_buffer_destroy(&member->audio_buffer);
if (member->clean_audio_buffer) {
switch_buffer_destroy(&member->clean_audio_buffer);
}
switch_buffer_destroy(&member->mux_buffer);
switch_clear_flag_locked(member, MFLAG_RUNNING);
if (switch_test_flag((&fh), SWITCH_FILE_OPEN)) {
@ -6583,9 +6489,6 @@ static switch_status_t conf_api_sub_position(conference_member_t *member, switch
if (!switch_test_flag(member, MFLAG_POSITIONAL) && member->conference->channels == 2) {
switch_set_flag(member, MFLAG_POSITIONAL);
member->al = create_al(member->pool);
switch_mutex_lock(member->conference->member_mutex);
member->conference->count3d++;
switch_mutex_unlock(member->conference->member_mutex);
} else {
if (stream) {
@ -9036,14 +8939,6 @@ static int setup_media(conference_member_t *member, conference_obj_t *conference
member->mux_frame = switch_core_alloc(member->pool, member->frame_size);
}
#ifdef OPENAL_POSITIONING
if (conference->channels == 2) {
member->clean_frame_size = SWITCH_RECOMMENDED_BUFFER_SIZE;
member->clean_frame = switch_core_alloc(member->pool, member->clean_frame_size);
}
#endif
if (read_impl.actual_samples_per_second != conference->rate) {
if (switch_resample_create(&member->read_resampler,
read_impl.actual_samples_per_second,
@ -9088,14 +8983,6 @@ static int setup_media(conference_member_t *member, conference_obj_t *conference
goto codec_done1;
}
if (conference->channels == 2) {
/* Setup an audio buffer for the incoming audio */
if (switch_buffer_create_dynamic(&member->clean_audio_buffer, CONF_DBLOCK_SIZE, CONF_DBUFFER_SIZE, 0) != SWITCH_STATUS_SUCCESS) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error Creating Audio Buffer!\n");
goto codec_done1;
}
}
/* Setup an audio buffer for the outgoing audio */
if (switch_buffer_create_dynamic(&member->mux_buffer, CONF_DBLOCK_SIZE, CONF_DBUFFER_SIZE, CONF_DBUFFER_MAX) != SWITCH_STATUS_SUCCESS) {
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(member->session), SWITCH_LOG_CRIT, "Memory Error Creating Audio Buffer!\n");
@ -9683,9 +9570,6 @@ SWITCH_STANDARD_APP(conference_function)
switch_event_destroy(&params);
switch_buffer_destroy(&member.resample_buffer);
switch_buffer_destroy(&member.audio_buffer);
if (member.clean_audio_buffer) {
switch_buffer_destroy(&member.clean_audio_buffer);
}
switch_buffer_destroy(&member.mux_buffer);
if (conference) {