mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-09-30 07:42:32 +00:00
Code Issues 1 Projects Releases Wiki Activity

baseparse: more inter-timestamp tracking

Browse source 
Fixes https://bugzilla.gnome.org/show_bug.cgi?id=691481
This commit is contained in:
Mark Nauwelaerts 2013-02-26 19:58:49 +01:00
parent ec16d6b0a4
commit 76acdee908
2 changed files with 34 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -248,6 +248,7 @@ struct _GstBaseParsePrivate
guint min_frame_size;
gboolean passthrough;
gboolean pts_interpolate;
gboolean infer_ts;
gboolean syncable;
gboolean has_timing_info;
guint fps_num, fps_den;
@ -736,6 +737,7 @@ gst_base_parse_reset (GstBaseParse * parse)
parse->priv->syncable = TRUE;
parse->priv->passthrough = FALSE;
parse->priv->pts_interpolate = TRUE;
parse->priv->infer_ts = TRUE;
parse->priv->has_timing_info = FALSE;
parse->priv->post_min_bitrate = TRUE;
parse->priv->post_avg_bitrate = TRUE;
@ -1036,6 +1038,8 @@ gst_base_parse_sink_event_default (GstBaseParse * parse, GstEvent * event)
parse->priv->next_dts = next_dts;
parse->priv->last_pts = GST_CLOCK_TIME_NONE;
parse->priv->last_dts = GST_CLOCK_TIME_NONE;
parse->priv->prev_pts = GST_CLOCK_TIME_NONE;
parse->priv->prev_dts = GST_CLOCK_TIME_NONE;
parse->priv->discont = TRUE;
parse->priv->seen_keyframe = FALSE;
break;
@ -1984,8 +1988,7 @@ gst_base_parse_handle_and_push_frame (GstBaseParse * parse,
/* interpolating and no valid pts yet,
* start with dts and carry on from there */
if (parse->priv->pts_interpolate &&
!GST_CLOCK_TIME_IS_VALID (parse->priv->next_pts))
if (parse->priv->infer_ts && !GST_CLOCK_TIME_IS_VALID (parse->priv->next_pts))
parse->priv->next_pts = parse->priv->next_dts;
/* again use default handler to add missing metadata;
@ -2729,6 +2732,15 @@ gst_base_parse_chain (GstPad * pad, GstObject * parent, GstBuffer * buffer)
if (GST_CLOCK_TIME_IS_VALID (dts) && (parse->priv->prev_dts != dts))
parse->priv->prev_dts = parse->priv->next_dts = dts;
/* we can mess with, erm interpolate, timestamps,
* and incoming stuff has PTS but no DTS seen so far,
* then pick up DTS from PTS and hope for the best ... */
if (parse->priv->infer_ts &&
!GST_CLOCK_TIME_IS_VALID (dts) &&
!GST_CLOCK_TIME_IS_VALID (parse->priv->prev_dts) &&
GST_CLOCK_TIME_IS_VALID (pts))
parse->priv->next_dts = pts;
/* always pass all available data */
data = gst_adapter_map (parse->priv->adapter, av);
/* arrange for actual data to be copied if subclass tries to,
@ -3449,6 +3461,23 @@ gst_base_parse_set_pts_interpolation (GstBaseParse * parse,
(pts_interpolate) ? "yes" : "no");
}
/**
* gst_base_parse_set_infer_ts:
* @parse: a #GstBaseParse
* @infer_ts: %TRUE if parser should infer DTS/PTS from each other
*
* By default, the base class might try to infer PTS from DTS and vice
* versa. While this is generally correct for audio data, it may not
* be otherwise. Sub-classes implementing such formats should disable
* timestamp infering.
*/
void
gst_base_parse_set_infer_ts (GstBaseParse * parse, gboolean infer_ts)
{
parse->priv->infer_ts = infer_ts;
GST_INFO_OBJECT (parse, "TS infering: %s", (infer_ts) ? "yes" : "no");
}
/**
* gst_base_parse_set_latency:
* @parse: a #GstBaseParse

3
libs/gst/base/gstbaseparse.h
View file

@ -315,6 +315,9 @@ void gst_base_parse_set_passthrough (GstBaseParse * parse,
void gst_base_parse_set_pts_interpolation (GstBaseParse * parse,
gboolean pts_interpolate);
void gst_base_parse_set_infer_ts (GstBaseParse * parse,
gboolean infer_ts);
void gst_base_parse_set_frame_rate (GstBaseParse * parse,
guint fps_num,
guint fps_den,