mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-23 14:36:24 +00:00
Code Issues 1 Projects Releases Wiki Activity

Merge branch 'master' into 0.11

Browse source
This commit is contained in:
Wim Taymans 2011-10-06 17:27:47 +02:00
commit c6f005fef1
1 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
libs/gst/base/gstbaseparse.c
View file

@ -231,6 +231,7 @@ struct _GstBaseParsePrivate
gint64 duration; gint64 duration;
GstFormat duration_fmt; GstFormat duration_fmt;
gint64 estimated_duration; gint64 estimated_duration;
gint64 estimated_drift;
guint min_frame_size; guint min_frame_size;
gboolean passthrough; gboolean passthrough;
@ -685,6 +686,7 @@ gst_base_parse_reset (GstBaseParse * parse)
parse->priv->first_frame_ts = GST_CLOCK_TIME_NONE; parse->priv->first_frame_ts = GST_CLOCK_TIME_NONE;
parse->priv->first_frame_offset = -1; parse->priv->first_frame_offset = -1;
parse->priv->estimated_duration = -1; parse->priv->estimated_duration = -1;
parse->priv->estimated_drift = 0;
parse->priv->next_ts = 0; parse->priv->next_ts = 0;
parse->priv->syncable = TRUE; parse->priv->syncable = TRUE;
parse->priv->passthrough = FALSE; parse->priv->passthrough = FALSE;
@ -1266,6 +1268,17 @@ gst_base_parse_update_duration (GstBaseParse * baseparse)
if (qres) { if (qres) {
if (gst_base_parse_convert (parse, GST_FORMAT_BYTES, ptot, if (gst_base_parse_convert (parse, GST_FORMAT_BYTES, ptot,
GST_FORMAT_TIME, &dest_value)) { GST_FORMAT_TIME, &dest_value)) {
/* inform if duration changed, but try to avoid spamming */
parse->priv->estimated_drift +=
dest_value - parse->priv->estimated_duration;
if (parse->priv->estimated_drift > GST_SECOND ||
parse->priv->estimated_drift < -GST_SECOND) {
gst_element_post_message (GST_ELEMENT (parse),
gst_message_new_duration (GST_OBJECT (parse),
GST_FORMAT_TIME, dest_value));
parse->priv->estimated_drift = 0;
}
parse->priv->estimated_duration = dest_value; parse->priv->estimated_duration = dest_value;
GST_LOG_OBJECT (parse, GST_LOG_OBJECT (parse,
"updated estimated duration to %" GST_TIME_FORMAT, "updated estimated duration to %" GST_TIME_FORMAT,