kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

account for lost frames during ptime detection 

This allows the "broken ptime" detection to work correctly when packet
loss is present on the wire. In addition to the timestamps this patch
adds frame sequence tracking and corrects the timestamp difference
only as needed and according to the number of lost packets.

FS-6898 #resolve
This commit is contained in:
Hristo Trendev 2014-10-09 11:37:52 +02:00
parent 63734bcde0
commit d48057e23f
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/switch_core_media.c
View File

@ -95,6 +95,7 @@ typedef struct switch_rtp_engine_s {
switch_codec_implementation_t write_impl; switch_codec_implementation_t write_impl;
switch_size_t last_ts; switch_size_t last_ts;
switch_size_t last_seq;
uint32_t check_frames; uint32_t check_frames;
uint32_t mismatch_count; uint32_t mismatch_count;
uint32_t last_codec_ms; uint32_t last_codec_ms;
@ -1743,6 +1744,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_media_read_frame(switch_core_session
engine->check_frames = 0; engine->check_frames = 0;
engine->last_ts = 0; engine->last_ts = 0;
engine->last_seq = 0;
do_cng = 1; do_cng = 1;
} }
@ -1869,8 +1871,14 @@ SWITCH_DECLARE(switch_status_t) switch_core_media_read_frame(switch_core_session
uint32_t codec_ms = (int) (engine->read_frame.timestamp - uint32_t codec_ms = (int) (engine->read_frame.timestamp -
engine->last_ts) / (engine->read_impl.samples_per_second / 1000); engine->last_ts) / (engine->read_impl.samples_per_second / 1000);
if (engine->last_seq && (int) (engine->read_frame.seq - engine->last_seq) > 1) {
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Correcting calculated ptime value from %d to %d to compensate for %d lost packet(s)\n", codec_ms, codec_ms / (int) (engine->read_frame.seq - engine->last_seq), (int) (engine->read_frame.seq - engine->last_seq - 1));
codec_ms = codec_ms / (int) (engine->read_frame.seq - engine->last_seq);
}
if ((codec_ms % 10) != 0 || codec_ms > engine->read_impl.samples_per_packet * 10) { if ((codec_ms % 10) != 0 || codec_ms > engine->read_impl.samples_per_packet * 10) {
engine->last_ts = 0; engine->last_ts = 0;
engine->last_seq = 0;
goto skip; goto skip;
} }
@ -1918,11 +1926,13 @@ SWITCH_DECLARE(switch_status_t) switch_core_media_read_frame(switch_core_session
} }
engine->last_ts = engine->read_frame.timestamp; engine->last_ts = engine->read_frame.timestamp;
engine->last_seq = engine->read_frame.seq;
} else { } else {
engine->mismatch_count = 0; engine->mismatch_count = 0;
engine->last_ts = 0; engine->last_ts = 0;
engine->last_seq = 0;
} }
} }
@ -4560,6 +4570,7 @@ SWITCH_DECLARE(void) switch_core_media_reset_autofix(switch_core_session_t *sess
engine->check_frames = 0; engine->check_frames = 0;
engine->last_ts = 0; engine->last_ts = 0;
engine->last_seq = 0;
} }