Skip to content

Commit

Permalink
Fix RTCP out quality stats (#3228)
Browse files Browse the repository at this point in the history
  • Loading branch information
@atoppi
atoppi committed Jun 13, 2023
1 parent f9da1d1 commit 125e024
Show file tree
Hide file tree
Showing 3 changed files with 44 additions and 26 deletions.
6 changes: 4 additions & 2 deletions src/ice.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4216,7 +4216,8 @@ static gboolean janus_ice_outgoing_rtcp_handle(gpointer user_data) {
.video = (medium->type == JANUS_MEDIA_VIDEO), .buffer = rtcpbuf, .length = srlen+sdeslen };
janus_ice_relay_rtcp_internal(handle, medium, &rtcp, FALSE);
/* Check if we detected too many losses, and send a slowlink event in case */
guint lost = janus_rtcp_context_get_lost_all(rtcp_ctx, TRUE);
gint lost = janus_rtcp_context_get_lost_all(rtcp_ctx, TRUE);
lost = lost > 0 ? lost : 0;
janus_slow_link_update(medium, handle, TRUE, lost);
}
if(medium->recv) {
Expand All @@ -4242,7 +4243,8 @@ static gboolean janus_ice_outgoing_rtcp_handle(gpointer user_data) {
janus_ice_relay_rtcp_internal(handle, medium, &rtcp, FALSE);
if(vindex == 0) {
/* Check if we detected too many losses, and send a slowlink event in case */
guint lost = janus_rtcp_context_get_lost_all(medium->rtcp_ctx[vindex], FALSE);
gint lost = janus_rtcp_context_get_lost_all(medium->rtcp_ctx[vindex], FALSE);
lost = lost > 0 ? lost : 0;
janus_slow_link_update(medium, handle, FALSE, lost);
}
}
Expand Down
58 changes: 37 additions & 21 deletions src/rtcp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -350,28 +350,40 @@ static void janus_rtcp_rr_update_stats(rtcp_context *ctx, janus_report_block rb)
if(delta_t < 2*G_USEC_PER_SEC) {
return;
}
ctx->rr_last_ts = ts;
uint32_t total_lost = ntohl(rb.flcnpl) & 0x00FFFFFF;
if (ctx->rr_last_ehsnr != 0) {
int32_t total_lost = ntohl(rb.flcnpl) & 0x00FFFFFF;
/* Sign extend from 24 to 32 bits */
total_lost = (total_lost << 8) >> 8;
if(ctx->rr_last_ehsnr != 0) {
int32_t sent = g_atomic_int_get(&ctx->sent_packets_since_last_rr);
uint32_t expect = ntohl(rb.ehsnr) - ctx->rr_last_ehsnr;
int32_t nacks = g_atomic_int_get(&ctx->nack_count) - ctx->rr_last_nack_count;
/* In case the number of NACKs is higher than the number of sent packets,
* we normalize it and set it to the same value instead, otherwise the
* value of the out link quality will overflow: for details, see
* https://github.com/meetecho/janus-gateway/issues/2579 */
if(sent && nacks > sent)
nacks = sent;
double link_q = !sent ? 0 : 100.0 - (100.0 * nacks / (double)sent);
double link_q;
/* Handle special cases separetely */
if(!nacks)
link_q = 100.0;
else if(!sent || nacks >= sent)
/* In case the number of NACKs is higher than the number of sent packets
* set link quality to 0, otherwise the value will overflow, see:
* https://github.com/meetecho/janus-gateway/issues/2579 */
link_q = 0.0;
else
link_q = 100.0 * (1.0 - ((double)nacks / (double)sent));
ctx->out_link_quality = janus_rtcp_link_quality_filter(ctx->out_link_quality, link_q);
int32_t lost = total_lost - ctx->rr_last_lost;
if(lost < 0) {
lost = 0;
}
double media_link_q = !expect ? 0 : 100.0 - (100.0 * lost / (double)expect);
double media_link_q;
/* Handle special cases separetely */
if(lost <= 0)
media_link_q = 100.0;
else if(!expect || (uint32_t)lost >= expect)
/* In case the number of reported losses is higher than the number of expected packets
* set media link quality to 0, otherwise the value will overflow */
media_link_q = 0.0;
else
media_link_q = 100.0 * (1.0 - ((double)lost / (double)expect));
ctx->out_media_link_quality = janus_rtcp_link_quality_filter(ctx->out_media_link_quality, media_link_q);
JANUS_LOG(LOG_HUGE, "Out link quality=%"SCNu32", media link quality=%"SCNu32"\n", janus_rtcp_context_get_out_link_quality(ctx), janus_rtcp_context_get_out_media_link_quality(ctx));
}
ctx->rr_last_ts = ts;
ctx->rr_last_ehsnr = ntohl(rb.ehsnr);
ctx->rr_last_lost = total_lost;
ctx->rr_last_nack_count = g_atomic_int_get(&ctx->nack_count);
Expand All @@ -386,8 +398,10 @@ static void janus_rtcp_incoming_rr(janus_rtcp_context *ctx, janus_rtcp_rr *rr) {
if(rr->header.rc > 0) {
double jitter = (double)ntohl(rr->rb[0].jitter);
uint32_t fraction = ntohl(rr->rb[0].flcnpl) >> 24;
uint32_t total = ntohl(rr->rb[0].flcnpl) & 0x00FFFFFF;
JANUS_LOG(LOG_HUGE, "jitter=%f, fraction=%"SCNu32", loss=%"SCNu32"\n", jitter, fraction, total);
int32_t total = ntohl(rr->rb[0].flcnpl) & 0x00FFFFFF;
/* Sign extend from 24 to 32 bits */
total = (total << 8) >> 8;
JANUS_LOG(LOG_HUGE, "jitter=%f, fraction=%"SCNu32", loss=%d\n", jitter, fraction, total);
ctx->lost_remote = total;
ctx->jitter_remote = jitter;
janus_rtcp_rr_update_stats(ctx, rr->rb[0]);
Expand Down Expand Up @@ -928,22 +942,24 @@ uint32_t janus_rtcp_context_get_out_media_link_quality(janus_rtcp_context *ctx)
return ctx ? (uint32_t)(ctx->out_media_link_quality + 0.5) : 0;
}

uint32_t janus_rtcp_context_get_lost_all(janus_rtcp_context *ctx, gboolean remote) {
int32_t janus_rtcp_context_get_lost_all(janus_rtcp_context *ctx, gboolean remote) {
if(ctx == NULL)
return 0;
return remote ? ctx->lost_remote : ctx->lost;
}

static uint32_t janus_rtcp_context_get_lost(janus_rtcp_context *ctx) {
static int32_t janus_rtcp_context_get_lost(janus_rtcp_context *ctx) {
if(ctx == NULL)
return 0;
uint32_t lost;
int32_t lost;
if(ctx->lost > 0x7FFFFF) {
lost = 0x7FFFFF;
} else if(ctx->lost < -0x800000) {
lost = -0x800000;
} else {
lost = ctx->lost;
}
return lost;
return lost & 0x00FFFFFF;
}

static uint32_t janus_rtcp_context_get_lost_fraction(janus_rtcp_context *ctx) {
Expand Down Expand Up @@ -1003,7 +1019,7 @@ int janus_rtcp_report_block(janus_rtcp_context *ctx, janus_report_block *rb) {
lost_interval = expected_interval - received_interval;
}
ctx->lost += lost_interval;
uint32_t reported_lost = janus_rtcp_context_get_lost(ctx);
int32_t reported_lost = janus_rtcp_context_get_lost(ctx);
uint32_t reported_fraction = janus_rtcp_context_get_lost_fraction(ctx);
janus_rtcp_estimate_in_link_quality(ctx);
ctx->expected_prior = ctx->expected;
Expand Down
6 changes: 3 additions & 3 deletions src/rtcp.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -262,15 +262,15 @@ typedef struct rtcp_context
uint32_t received_prior;
uint32_t expected;
uint32_t expected_prior;
uint32_t lost, lost_remote;
int32_t lost, lost_remote;

uint32_t retransmitted;
uint32_t retransmitted_prior;

/* Inbound RR process */
int64_t rr_last_ts;
uint32_t rr_last_ehsnr;
uint32_t rr_last_lost;
int32_t rr_last_lost;
uint32_t rr_last_nack_count;
gint sent_packets_since_last_rr;
gint nack_count;
Expand Down Expand Up @@ -304,7 +304,7 @@ uint32_t janus_rtcp_context_get_rtt(janus_rtcp_context *ctx);
* @param[in] ctx The RTCP context to query
* @param[in] remote Whether we're quering the remote (provided by peer) or local (computed by Janus) info
* @returns The total number of lost packets */
uint32_t janus_rtcp_context_get_lost_all(janus_rtcp_context *ctx, gboolean remote);
int32_t janus_rtcp_context_get_lost_all(janus_rtcp_context *ctx, gboolean remote);
/*! \brief Method to retrieve the jitter from an existing RTCP context
* @param[in] ctx The RTCP context to query
* @param[in] remote Whether we're quering the remote (provided by peer) or local (computed by Janus) info
Expand Down

0 comments on commit 125e024

Please sign in to comment.