rtpbin = GST_RTP_BIN (object);
g_slist_foreach (rtpbin->sessions, (GFunc) free_session, NULL);
- g_slist_foreach (rtpbin->clients, (GFunc) free_client, NULL);
g_slist_free (rtpbin->sessions);
rtpbin->sessions = NULL;
+ g_slist_foreach (rtpbin->clients, (GFunc) free_client, NULL);
+ g_slist_free (rtpbin->clients);
+ rtpbin->clients = NULL;
G_OBJECT_CLASS (parent_class)->dispose (object);
}
g_mutex_free (rtpbin->priv->bin_lock);
gst_object_unref (rtpbin->provided_clock);
- g_slist_free (rtpbin->sessions);
G_OBJECT_CLASS (parent_class)->finalize (object);
}
jbuf->window[i] = 0;
}
jbuf->window_pos = 0;
+ jbuf->window_size = 100;
jbuf->window_filling = TRUE;
jbuf->window_min = 0;
jbuf->skew = 0;
if (jbuf->window_filling) {
/* we are filling the window */
- GST_DEBUG ("filling %d %" G_GINT64_FORMAT, pos, delta);
+ GST_DEBUG ("filling %d %" G_GINT64_FORMAT ", diff %" G_GUINT64_FORMAT, pos,
+ delta, send_diff);
jbuf->window[pos++] = delta;
/* calc the min delta we observed */
if (pos == 1 || delta < jbuf->window_min)
jbuf->window_min = delta;
- if (pos >= 100) {
+ if (send_diff >= 2 * GST_SECOND || pos >= 100) {
+ jbuf->window_size = pos;
+
/* window filled, fill window with min */
GST_DEBUG ("min %" G_GINT64_FORMAT, jbuf->window_min);
- for (i = 0; i < 100; i++)
+ for (i = 0; i < jbuf->window_size; i++)
jbuf->window[i] = jbuf->window_min;
/* the skew is initially the min */
jbuf->skew = jbuf->window_min;
jbuf->window_filling = FALSE;
+ } else {
+ jbuf->window_size = pos + 1;
}
} else {
/* pick old value and store new value. We keep the previous value in order
gint64 min = G_MAXINT64;
/* if we removed the old min, we have to find a new min */
- for (i = 0; i < 100; i++) {
+ for (i = 0; i < jbuf->window_size; i++) {
/* we found another value equal to the old min, we can stop searching now */
if (jbuf->window[i] == old) {
min = old;
jbuf->window_min, jbuf->skew);
}
/* wrap around in the window */
- if (pos >= 100)
+ if (pos >= jbuf->window_size)
pos = 0;
jbuf->window_pos = pos;
}