mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-17 03:35:21 +00:00
Code Issues 1 Projects Releases Wiki Activity

rtpsource: simplify the rate estimation some more

Browse source
This commit is contained in:
Wim Taymans 2010-09-24 13:48:50 +02:00
parent 0fa589a3dd
commit c5203a479b
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
gst/rtpmanager/rtpsource.c
View file

@ -252,8 +252,9 @@ rtp_source_create_stats (RTPSource * src)
"octets-received", G_TYPE_UINT64, src->stats.octets_received, "octets-received", G_TYPE_UINT64, src->stats.octets_received,
"packets-received", G_TYPE_UINT64, src->stats.packets_received, "packets-received", G_TYPE_UINT64, src->stats.packets_received,
"bitrate", G_TYPE_UINT64, src->bitrate, "bitrate", G_TYPE_UINT64, src->bitrate,
"packets-lost", G_TYPE_INT, (gint) rtp_stats_get_packets_lost (&src->stats), "packets-lost", G_TYPE_INT,
"jitter", G_TYPE_UINT, (guint) (src->stats.jitter >> 4), NULL); (gint) rtp_stats_get_packets_lost (&src->stats), "jitter", G_TYPE_UINT,
(guint) (src->stats.jitter >> 4), NULL);
if (is_sender) { if (is_sender) {
gboolean have_sr; gboolean have_sr;
@ -895,6 +896,8 @@ init_seq (RTPSource * src, guint16 seq)
GST_DEBUG ("base_seq %d", seq); GST_DEBUG ("base_seq %d", seq);
} }
#define BITRATE_INTERVAL (2 * GST_SECOND)
static void static void
do_bitrate_estimation (RTPSource * src, GstClockTime running_time, do_bitrate_estimation (RTPSource * src, GstClockTime running_time,
guint64 * bytes_handled) guint64 * bytes_handled)
@ -904,12 +907,10 @@ do_bitrate_estimation (RTPSource * src, GstClockTime running_time,
if (src->prev_rtime) { if (src->prev_rtime) {
elapsed = running_time - src->prev_rtime; elapsed = running_time - src->prev_rtime;
if (elapsed > (G_GINT64_CONSTANT (1) << 31)) { if (elapsed > BITRATE_INTERVAL) {
const guint64 bits_per_byte = G_GUINT64_CONSTANT (8);
guint64 rate; guint64 rate;
rate = gst_util_uint64_scale (*bytes_handled, rate = gst_util_uint64_scale (*bytes_handled, 8 * GST_SECOND, elapsed);
bits_per_byte * GST_SECOND, elapsed);
GST_LOG ("Elapsed %" G_GUINT64_FORMAT ", bytes %" G_GUINT64_FORMAT GST_LOG ("Elapsed %" G_GUINT64_FORMAT ", bytes %" G_GUINT64_FORMAT
", rate %" G_GUINT64_FORMAT, elapsed, *bytes_handled, rate); ", rate %" G_GUINT64_FORMAT, elapsed, *bytes_handled, rate);