kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-05-18 05:36:23 +00:00
Code Issues Projects Releases Wiki Activity

FS-10843: [freeswitch-core] Tweak RTP write timing #resolve

Browse Source
This commit is contained in:
Anthony Minessale 2017-12-13 16:23:27 -06:00 committed by Mike Jerris
parent 15a5dc52a9
commit 34b390bee0
1 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/switch_rtp.c
View File

@ -378,6 +378,7 @@ struct switch_rtp {
switch_rtp_invalid_handler_t invalid_handler; switch_rtp_invalid_handler_t invalid_handler;
void *private_data; void *private_data;
uint32_t ts; uint32_t ts;
//uint32_t last_clock_ts;
uint32_t last_write_ts; uint32_t last_write_ts;
uint32_t last_read_ts; uint32_t last_read_ts;
uint32_t last_cng_ts; uint32_t last_cng_ts;
@ -1519,16 +1520,8 @@ static uint8_t get_next_write_ts(switch_rtp_t *rtp_session, uint32_t timestamp)
if (timestamp) { if (timestamp) {
rtp_session->ts = (uint32_t) timestamp; rtp_session->ts = (uint32_t) timestamp;
changed++; changed++;
/* Send marker bit if timestamp is lower/same as before (resetted/new timer) */
if (abs((int32_t)(rtp_session->ts - rtp_session->last_write_ts)) > rtp_session->samples_per_interval
&& !(rtp_session->rtp_bugs & RTP_BUG_NEVER_SEND_MARKER)) {
m++;
}
} else if (switch_rtp_test_flag(rtp_session, SWITCH_RTP_FLAG_USE_TIMER)) { } else if (switch_rtp_test_flag(rtp_session, SWITCH_RTP_FLAG_USE_TIMER)) {
switch_core_timer_sync(&rtp_session->write_timer); switch_core_timer_next(&rtp_session->write_timer);
if (rtp_session->last_write_ts == rtp_session->write_timer.samplecount) {
switch_core_timer_step(&rtp_session->write_timer);
}
rtp_session->ts = rtp_session->write_timer.samplecount; rtp_session->ts = rtp_session->write_timer.samplecount;
changed++; changed++;
} }
@ -1536,6 +1529,12 @@ static uint8_t get_next_write_ts(switch_rtp_t *rtp_session, uint32_t timestamp)
if (!changed) { if (!changed) {
rtp_session->ts = rtp_session->last_write_ts + rtp_session->samples_per_interval; rtp_session->ts = rtp_session->last_write_ts + rtp_session->samples_per_interval;
} else {
/* Send marker bit if timestamp is lower/same as before (resetted/new timer) */
if (abs((int32_t)(rtp_session->ts - rtp_session->last_write_ts)) > rtp_session->samples_per_interval
&& !(rtp_session->rtp_bugs & RTP_BUG_NEVER_SEND_MARKER)) {
m++;
}
} }
return m; return m;
@ -2021,10 +2020,6 @@ static int check_rtcp_and_ice(switch_rtp_t *rtp_session)
int rate = 0, nack_ttl = 0; int rate = 0, nack_ttl = 0;
uint32_t cur_nack[MAX_NACK] = { 0 }; uint32_t cur_nack[MAX_NACK] = { 0 };
if (rtp_session->flags[SWITCH_RTP_FLAG_USE_TIMER]) {
switch_core_timer_sync(&rtp_session->write_timer);
}
if (!rtp_session->flags[SWITCH_RTP_FLAG_UDPTL] && if (!rtp_session->flags[SWITCH_RTP_FLAG_UDPTL] &&
rtp_session->flags[SWITCH_RTP_FLAG_AUTO_CNG] && rtp_session->flags[SWITCH_RTP_FLAG_AUTO_CNG] &&
rtp_session->send_msg.header.ts && rtp_session->send_msg.header.ts &&
@ -4155,7 +4150,7 @@ SWITCH_DECLARE(switch_status_t) switch_rtp_change_interval(switch_rtp_t *rtp_ses
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(rtp_session->session), SWITCH_LOG_DEBUG, switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(rtp_session->session), SWITCH_LOG_DEBUG,
"RE-Starting timer [%s] %d bytes per %dms\n", rtp_session->timer_name, samples_per_interval, ms_per_packet / 1000); "RE-Starting timer [%s] %d bytes per %dms\n", rtp_session->timer_name, samples_per_interval, ms_per_packet / 1000);
switch_core_timer_init(&rtp_session->write_timer, rtp_session->timer_name, ms_per_packet / 1000, samples_per_interval, rtp_session->pool); switch_core_timer_init(&rtp_session->write_timer, rtp_session->timer_name, (ms_per_packet / 1000), samples_per_interval, rtp_session->pool);
} else { } else {
memset(&rtp_session->timer, 0, sizeof(rtp_session->timer)); memset(&rtp_session->timer, 0, sizeof(rtp_session->timer));
@ -4280,7 +4275,7 @@ SWITCH_DECLARE(switch_status_t) switch_rtp_create(switch_rtp_t **new_rtp_session
if (switch_core_timer_init(&rtp_session->timer, timer_name, ms_per_packet / 1000, samples_per_interval, pool) == SWITCH_STATUS_SUCCESS) { if (switch_core_timer_init(&rtp_session->timer, timer_name, ms_per_packet / 1000, samples_per_interval, pool) == SWITCH_STATUS_SUCCESS) {
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(rtp_session->session), SWITCH_LOG_DEBUG, switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(rtp_session->session), SWITCH_LOG_DEBUG,
"Starting timer [%s] %d bytes per %dms\n", timer_name, samples_per_interval, ms_per_packet / 1000); "Starting timer [%s] %d bytes per %dms\n", timer_name, samples_per_interval, ms_per_packet / 1000);
switch_core_timer_init(&rtp_session->write_timer, timer_name, ms_per_packet / 1000, samples_per_interval, pool); switch_core_timer_init(&rtp_session->write_timer, timer_name, (ms_per_packet / 1000), samples_per_interval, pool);
#ifdef DEBUG_TS_ROLLOVER #ifdef DEBUG_TS_ROLLOVER
rtp_session->timer.tick = TS_ROLLOVER_START / samples_per_interval; rtp_session->timer.tick = TS_ROLLOVER_START / samples_per_interval;
#endif #endif
@ -5262,7 +5257,7 @@ static void do_2833(switch_rtp_t *rtp_session)
if (!rtp_session->last_write_ts) { if (!rtp_session->last_write_ts) {
if (rtp_session->timer.timer_interface) { if (rtp_session->timer.timer_interface) {
switch_core_timer_sync(&rtp_session->write_timer); //switch_core_timer_sync(&rtp_session->write_timer);
rtp_session->last_write_ts = rtp_session->write_timer.samplecount; rtp_session->last_write_ts = rtp_session->write_timer.samplecount;
} else { } else {
rtp_session->last_write_ts = rtp_session->samples_per_interval; rtp_session->last_write_ts = rtp_session->samples_per_interval;
@ -5313,7 +5308,7 @@ static void do_2833(switch_rtp_t *rtp_session)
rtp_session->need_mark = 1; rtp_session->need_mark = 1;
if (rtp_session->flags[SWITCH_RTP_FLAG_USE_TIMER]) { if (rtp_session->flags[SWITCH_RTP_FLAG_USE_TIMER]) {
switch_core_timer_sync(&rtp_session->write_timer); //switch_core_timer_sync(&rtp_session->write_timer);
rtp_session->last_write_samplecount = rtp_session->write_timer.samplecount; rtp_session->last_write_samplecount = rtp_session->write_timer.samplecount;
} }
@ -5331,7 +5326,7 @@ static void do_2833(switch_rtp_t *rtp_session)
void *pop; void *pop;
if (rtp_session->flags[SWITCH_RTP_FLAG_USE_TIMER]) { if (rtp_session->flags[SWITCH_RTP_FLAG_USE_TIMER]) {
switch_core_timer_sync(&rtp_session->write_timer); //switch_core_timer_sync(&rtp_session->write_timer);
if (rtp_session->write_timer.samplecount < rtp_session->next_write_samplecount) { if (rtp_session->write_timer.samplecount < rtp_session->next_write_samplecount) {
return; return;
} }
@ -8003,7 +7998,7 @@ static int rtp_common_write(switch_rtp_t *rtp_session,
WRITE_INC(rtp_session); WRITE_INC(rtp_session);
if (rtp_session->flags[SWITCH_RTP_FLAG_USE_TIMER]) { if (rtp_session->flags[SWITCH_RTP_FLAG_USE_TIMER]) {
switch_core_timer_sync(&rtp_session->write_timer); //switch_core_timer_sync(&rtp_session->write_timer);
} }
if (send_msg) { if (send_msg) {
@ -8057,7 +8052,7 @@ static int rtp_common_write(switch_rtp_t *rtp_session,
} }
if (rtp_session->flags[SWITCH_RTP_FLAG_USE_TIMER]) { if (rtp_session->flags[SWITCH_RTP_FLAG_USE_TIMER]) {
switch_core_timer_sync(&rtp_session->write_timer); //switch_core_timer_sync(&rtp_session->write_timer);
} }
if (rtp_session->flags[SWITCH_RTP_FLAG_USE_TIMER] && if (rtp_session->flags[SWITCH_RTP_FLAG_USE_TIMER] &&
@ -8503,7 +8498,7 @@ static int rtp_common_write(switch_rtp_t *rtp_session,
} }
if (rtp_session->flags[SWITCH_RTP_FLAG_USE_TIMER]) { if (rtp_session->flags[SWITCH_RTP_FLAG_USE_TIMER]) {
switch_core_timer_sync(&rtp_session->write_timer); //switch_core_timer_sync(&rtp_session->write_timer);
rtp_session->last_write_samplecount = rtp_session->write_timer.samplecount; rtp_session->last_write_samplecount = rtp_session->write_timer.samplecount;
} }