kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-20 08:40:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "res_rtp_asterisk: Fix sequence number cycling and packet loss count." into 16

Browse Source
This commit is contained in:
Joshua Colp
2019-05-15 17:48:51 -05:00
committed by Gerrit Code Review
parent 2de4f668be ece29db9bd
commit 2aa9bc6d2c
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
res/res_rtp_asterisk.c
View File

@@ -4126,6 +4126,14 @@ static void calculate_lost_packet_statistics(struct ast_rtp *rtp,
*lost_packets = expected_packets - rtp->rxcount; *lost_packets = expected_packets - rtp->rxcount;
expected_interval = expected_packets - rtp->rtcp->expected_prior; expected_interval = expected_packets - rtp->rtcp->expected_prior;
received_interval = rtp->rxcount - rtp->rtcp->received_prior; received_interval = rtp->rxcount - rtp->rtcp->received_prior;
if (received_interval > expected_interval) {
/* If we receive some late packets it is possible for the packets
* we received in this interval to exceed the number we expected.
* We update the expected so that the packet loss calculations
* show that no packets are lost.
*/
expected_interval = received_interval;
}
lost_interval = expected_interval - received_interval; lost_interval = expected_interval - received_interval;
if (expected_interval == 0 || lost_interval <= 0) { if (expected_interval == 0 || lost_interval <= 0) {
*fraction_lost = 0; *fraction_lost = 0;
@@ -6801,7 +6809,7 @@ static struct ast_frame *ast_rtp_interpret(struct ast_rtp_instance *instance, st
ast_log(LOG_WARNING, "scheduling RTCP transmission failed.\n"); ast_log(LOG_WARNING, "scheduling RTCP transmission failed.\n");
} }
} }
if ((int)rtp->lastrxseqno - (int)seqno > 100) /* if so it would indicate that the sender cycled; allow for misordering */ if ((int)prev_seqno - (int)seqno > 100) /* if so it would indicate that the sender cycled; allow for misordering */
rtp->cycles += RTP_SEQ_MOD; rtp->cycles += RTP_SEQ_MOD;
/* If we are directly bridged to another instance send the audio directly out, /* If we are directly bridged to another instance send the audio directly out,