From 8da367d9a1ffbde6b1c577d58a722d1a42bcc741 Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Mon, 20 Aug 2012 12:11:17 -0500 Subject: [PATCH] FS-4548 --resolve such a little patch for a big problem, good find --- src/mod/applications/mod_conference/mod_conference.c | 4 ++-- src/switch_rtp.c | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/mod/applications/mod_conference/mod_conference.c b/src/mod/applications/mod_conference/mod_conference.c index bc60091964..cd6ca741e2 100644 --- a/src/mod/applications/mod_conference/mod_conference.c +++ b/src/mod/applications/mod_conference/mod_conference.c @@ -2209,7 +2209,7 @@ static void *SWITCH_THREAD_FUNC conference_thread_run(switch_thread_t *thread, v if (x <= file_sample_len) { main_frame[x] = (int32_t) bptr[x]; } else { - main_frame[x] = 255; + memset(&main_frame[x], 255, sizeof(main_frame[x])); } } } @@ -3279,7 +3279,7 @@ static void *SWITCH_THREAD_FUNC conference_loop_input(switch_thread_t *thread, v /* skip frames that are not actual media or when we are muted or silent */ if ((switch_test_flag(member, MFLAG_TALKING) || member->energy_level == 0 || switch_test_flag(member->conference, CFLAG_AUDIO_ALWAYS)) - && switch_test_flag(member, MFLAG_CAN_SPEAK) && !switch_test_flag(member->conference, CFLAG_WAIT_MOD)) { + && switch_test_flag(member, MFLAG_CAN_SPEAK) && !switch_test_flag(member->conference, CFLAG_WAIT_MOD) && member->conference->count > 1) { switch_audio_resampler_t *read_resampler = member->read_resampler; void *data; uint32_t datalen; diff --git a/src/switch_rtp.c b/src/switch_rtp.c index 1c23efc714..0b966d8ba2 100644 --- a/src/switch_rtp.c +++ b/src/switch_rtp.c @@ -3545,6 +3545,8 @@ static int rtp_common_read(switch_rtp_t *rtp_session, switch_payload_t *payload_ if (((rtp_session->cng_pt && rtp_session->recv_msg.header.pt == rtp_session->cng_pt) || rtp_session->recv_msg.header.pt == 13)) { *flags |= SFF_NOT_AUDIO; + } else { + *flags &= ~SFF_NOT_AUDIO; /* If this flag was already set, make sure to remove it when we get real audio */ }