mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-07 07:58:51 +00:00
Code Issues 1 Projects Releases Wiki Activity

rtpstats: Don't save the ts & seqnum if the avg is not updated

Browse source 
This makes it update correctly when you have more than one packet per
frame.
This commit is contained in:
olivier.crete@collabora.com 2019-09-10 18:59:02 +01:00 committed by Olivier Crête
parent 48a7381602
commit a637ec3da8
1 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
gst/rtpmanager/rtpstats.c
View file

@ -47,13 +47,21 @@ gst_rtp_packet_rate_ctx_update (RTPPacketRateCtx * ctx, guint16 seqnum,
if (!ctx->probed) { if (!ctx->probed) {
ctx->probed = TRUE; ctx->probed = TRUE;
goto done; goto done_but_save;
} }
diff_seqnum = gst_rtp_buffer_compare_seqnum (ctx->last_seqnum, seqnum); diff_seqnum = gst_rtp_buffer_compare_seqnum (ctx->last_seqnum, seqnum);
if (diff_seqnum <= 0 || new_ts <= ctx->last_ts || diff_seqnum > 1) { /* Ignore seqnums that are over 15,000 away from the latest one, it's close
* to 2^14 but far enough to avoid any risk of computing error.
*/
if (diff_seqnum > 15000)
goto done_but_save;
/* Ignore any packet that is in the past, we're only interested in newer
* packets to compute the packet rate.
*/
if (diff_seqnum <= 0 || new_ts <= ctx->last_ts)
goto done; goto done;
}
diff_ts = new_ts - ctx->last_ts; diff_ts = new_ts - ctx->last_ts;
diff_ts = gst_util_uint64_scale_int (diff_ts, GST_SECOND, ctx->clock_rate); diff_ts = gst_util_uint64_scale_int (diff_ts, GST_SECOND, ctx->clock_rate);
@ -72,9 +80,11 @@ gst_rtp_packet_rate_ctx_update (RTPPacketRateCtx * ctx, guint16 seqnum,
ctx->avg_packet_rate = (ctx->avg_packet_rate + new_packet_rate + 1) / 2; ctx->avg_packet_rate = (ctx->avg_packet_rate + new_packet_rate + 1) / 2;
} }
done: done_but_save:
ctx->last_seqnum = seqnum; ctx->last_seqnum = seqnum;
ctx->last_ts = new_ts; ctx->last_ts = new_ts;
done:
return ctx->avg_packet_rate; return ctx->avg_packet_rate;
} }