Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed RTCP packet lost calculation #3653

Merged
merged 6 commits into from
Aug 31, 2023
Merged

Fixed RTCP packet lost calculation #3653

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5fe88fc
Fixed RTCP packet lost calculation
sauwming Aug 9, 2023
b8d227a
Start the packet received and lost calculation after probation
sauwming Aug 9, 2023
894fcca
Fix seq rollover during probation
sauwming Aug 11, 2023
14c2a78
Move the calculation on incoming RTP instead
sauwming Aug 29, 2023
e5f68ff
Fixed loss period calculation
sauwming Aug 29, 2023
20e2d00
Minor optimization
sauwming Aug 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 21 additions & 12 deletions pjmedia/src/pjmedia/rtcp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,26 +369,35 @@ PJ_DEF(void) pjmedia_rtcp_rx_rtp2(pjmedia_rtcp_session *sess,
return;
}

/* Only mark "good" packets */
++sess->received;
/* Only mark "good" packets. Do this after we're no longer in probation. */
if (!seq_st.status.flag.probation)
++sess->received;

/* Calculate loss periods. */
if (seq_st.diff > 1) {
unsigned count = seq_st.diff - 1;
/* Calculate packet lost and loss periods. */
if (!seq_st.status.flag.probation && !seq_st.status.flag.outorder) {
unsigned count = 0, loss = 0;
unsigned period;
pj_uint32_t last_seq, expected;

last_seq = sess->seq_ctrl.max_seq +
(sess->seq_ctrl.cycles & 0xFFFF0000L);
expected = last_seq - sess->seq_ctrl.base_seq;

if (expected > sess->received)
loss = expected - sess->received;

if (loss > sess->stat.rx.loss)
count = loss - sess->stat.rx.loss;
period = count * sess->dec_pkt_size * 1000 / sess->clock_rate;
period *= 1000;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

minor: move this period calculation to inside the loss_period update block below?


/* Update packet lost.
* The packet lost number will also be updated when we're sending
* outbound RTCP RR.
*/
sess->stat.rx.loss += (seq_st.diff - 1);
TRACE_((sess->name, "%d packet(s) lost", seq_st.diff - 1));
sess->stat.rx.loss = loss;

/* Update loss period stat */
pj_math_stat_update(&sess->stat.rx.loss_period, period);
if (count > 0) {
TRACE_((sess->name, "%d packet(s) lost", count));
pj_math_stat_update(&sess->stat.rx.loss_period, period);
}
}


Expand Down
6 changes: 4 additions & 2 deletions pjmedia/src/pjmedia/rtp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,6 +315,7 @@ void pjmedia_rtp_seq_update( pjmedia_rtp_seq_session *sess,

/* Init status */
st.status.value = 0;
st.status.flag.probation = 0;
st.diff = 0;

/*
Expand All @@ -325,13 +326,14 @@ void pjmedia_rtp_seq_update( pjmedia_rtp_seq_session *sess,

st.status.flag.probation = -1;

if (seq == sess->max_seq+ 1) {
if (seq == (pj_uint16_t)(sess->max_seq + 1)) {
/* packet is in sequence */
st.diff = 1;
sess->probation--;
sess->max_seq = seq;
if (sess->probation == 0) {
st.status.flag.probation = 0;
/* Init base seq, as per the RFC 3550. */
sess->base_seq = seq;
}
} else {

Expand Down
Loading