kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-04-17 09:12:25 +00:00
Code Issues Projects Releases Wiki Activity

mod_sangoma_codec: flush sockets on first use

Browse Source
This commit is contained in:
Moises Silva 2010-10-15 06:52:13 -04:00
parent e5459d34bf
commit bbba1148ab
1 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/mod/codecs/mod_sangoma_codec/mod_sangoma_codec.c
View File

@ -366,6 +366,29 @@ static switch_status_t switch_sangoma_init_ilbc(switch_codec_t *codec, switch_co
return switch_sangoma_init(codec, flags, codec_settings); return switch_sangoma_init(codec, flags, codec_settings);
} }
static void flush_rtp(switch_rtp_t *rtp)
{
switch_status_t sres;
switch_frame_t read_frame;
int flushed = 0;
int sanity = 1000;
while (sanity--) {
sres = switch_rtp_zerocopy_read_frame(rtp, &read_frame, SWITCH_IO_FLAG_NOBLOCK);
if (sres == SWITCH_STATUS_GENERR) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to read on Sangoma encoder RTP session while flushing: %d\n", sres);
return;
}
if (!read_frame.datalen) {
break;
}
flushed++;
}
if (!sanity) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Insanely big UDP queue!\n");
}
}
#define SAFE_INDEX_INC(array, index) \ #define SAFE_INDEX_INC(array, index) \
(index)++; \ (index)++; \
if ((index) == switch_arraylen((array))) { \ if ((index) == switch_arraylen((array))) { \
@ -415,6 +438,7 @@ static switch_status_t switch_sangoma_encode(switch_codec_t *codec, switch_codec
sess->encoder.txrtp = sess->encoder.reply.tx_fd; sess->encoder.txrtp = sess->encoder.reply.tx_fd;
sess->encoder.rxrtp = sess->encoder.reply.rx_fd; sess->encoder.rxrtp = sess->encoder.reply.rx_fd;
switch_mutex_unlock(g_sessions_lock); switch_mutex_unlock(g_sessions_lock);
flush_rtp(sess->encoder.rxrtp);
} }
if (sess->encoder.debug_timing && sess->encoder.last_func_call_time) { if (sess->encoder.debug_timing && sess->encoder.last_func_call_time) {
@ -452,7 +476,6 @@ static switch_status_t switch_sangoma_encode(switch_codec_t *codec, switch_codec
sess->encoder.tx++; sess->encoder.tx++;
/* do the reading */ /* do the reading */
memset(&encoded_frame, 0, sizeof(encoded_frame));
for ( ; ; ) { for ( ; ; ) {
#if 0 #if 0
prevread_time = switch_micro_time_now(); prevread_time = switch_micro_time_now();
@ -610,6 +633,7 @@ static switch_status_t switch_sangoma_decode(switch_codec_t *codec, /* codec ses
sess->decoder.txrtp = sess->decoder.reply.tx_fd; sess->decoder.txrtp = sess->decoder.reply.tx_fd;
sess->decoder.rxrtp = sess->decoder.reply.rx_fd; sess->decoder.rxrtp = sess->decoder.reply.rx_fd;
switch_mutex_unlock(g_sessions_lock); switch_mutex_unlock(g_sessions_lock);
flush_rtp(sess->decoder.rxrtp);
} }
if (sess->decoder.debug_timing && sess->decoder.last_func_call_time) { if (sess->decoder.debug_timing && sess->decoder.last_func_call_time) {
@ -641,7 +665,6 @@ static switch_status_t switch_sangoma_decode(switch_codec_t *codec, /* codec ses
sess->decoder.tx++; sess->decoder.tx++;
/* do the reading */ /* do the reading */
memset(&ulaw_frame, 0, sizeof(ulaw_frame));
for ( ; ; ) { for ( ; ; ) {
#if 0 #if 0
prevread_time = switch_micro_time_now(); prevread_time = switch_micro_time_now();