Author: anthm Date: Thu Oct 18 18:41:58 2007 New Revision: 5980 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c freeswitch/trunk/src/switch_rtp.c Log: sigh Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Thu Oct 18 18:41:58 2007 @@ -1511,7 +1511,7 @@ uint32_t interval = read_codec->implementation->microseconds_per_frame / 1000; uint32_t csamples = switch_bytes_per_frame(member->conference->rate, member->conference->interval); uint32_t samples = switch_bytes_per_frame(member->conference->rate, interval); - uint32_t tsamples = switch_bytes_per_frame(read_codec->implementation->samples_per_second, interval) / 2; + uint32_t tsamples = switch_bytes_per_frame(read_codec->implementation->samples_per_second, interval); uint32_t low_count = 0, bytes = samples * 2; call_list_t *call_list = NULL, *cp = NULL; Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Thu Oct 18 18:41:58 2007 @@ -847,6 +847,12 @@ return -1; } + if (rtp_session->recv_msg.header.pt == 9 /* && G722 RFC != LAME */) { + uint32_t rfc_sucks = ntohl(rtp_session->recv_msg.header.ts); + rfc_sucks *= 2; + rtp_session->recv_msg.header.ts = htonl(rfc_sucks); + } + if (rtp_session->jb && bytes && rtp_session->recv_msg.header.pt == rtp_session->payload) { if (rtp_session->recv_msg.header.m) { stfu_n_reset(rtp_session->jb); @@ -1617,7 +1623,9 @@ } send_msg = rtp_session->send_msg; - + if (payload == 9 /* && G722 RFC != LAME */) { + ts /= 2; + } send_msg.header.seq = htons(mseq); send_msg.header.ts = htonl(ts); send_msg.header.ssrc = htonl(ssrc);