mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-24 09:10:36 +00:00
Code Issues 1 Projects Releases Wiki Activity

collectpads: take DTS into account

Browse source 
Importantly, this patch converts DTS to running time.  Less importantly,
and possibly a problem for some muxers, is that it orders buffers by
DTS (if it is valid, otherwise PTS).  This is generally correct, but
might be somewhat surprising to muxers.

Also note that once converted to running time, DTS can end up negative.
This commit is contained in:
David Schleef 2013-02-22 14:56:49 -08:00
parent a0cff35ae8
commit f671bd2754
1 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
libs/gst/base/gstcollectpads.c
View file

@ -498,7 +498,7 @@ gst_collect_pads_clip_running_time (GstCollectPads * pads,
GstClockTime time; GstClockTime time;
*outbuf = buf; *outbuf = buf;
time = GST_BUFFER_TIMESTAMP (buf); time = GST_BUFFER_PTS (buf);
/* invalid left alone and passed */ /* invalid left alone and passed */
if (G_LIKELY (GST_CLOCK_TIME_IS_VALID (time))) { if (G_LIKELY (GST_CLOCK_TIME_IS_VALID (time))) {
@ -510,9 +510,11 @@ gst_collect_pads_clip_running_time (GstCollectPads * pads,
} else { } else {
GST_LOG_OBJECT (cdata->pad, "buffer ts %" GST_TIME_FORMAT " -> %" GST_LOG_OBJECT (cdata->pad, "buffer ts %" GST_TIME_FORMAT " -> %"
GST_TIME_FORMAT " running time", GST_TIME_FORMAT " running time",
GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (buf)), GST_TIME_ARGS (time)); GST_TIME_ARGS (GST_BUFFER_PTS (buf)), GST_TIME_ARGS (time));
*outbuf = gst_buffer_make_writable (buf); *outbuf = gst_buffer_make_writable (buf);
GST_BUFFER_TIMESTAMP (*outbuf) = time; GST_BUFFER_PTS (*outbuf) = time;
GST_BUFFER_DTS (*outbuf) = gst_segment_to_running_time (&cdata->segment,
GST_FORMAT_TIME, GST_BUFFER_DTS (*outbuf));
} }
} }
@ -1405,7 +1407,10 @@ gst_collect_pads_find_best_pad (GstCollectPads * pads,
buffer = gst_collect_pads_peek (pads, data); buffer = gst_collect_pads_peek (pads, data);
/* if we have a buffer check if it is better then the current best one */ /* if we have a buffer check if it is better then the current best one */
if (buffer != NULL) { if (buffer != NULL) {
timestamp = GST_BUFFER_TIMESTAMP (buffer); timestamp = GST_BUFFER_DTS (buffer);
if (!GST_CLOCK_TIME_IS_VALID (timestamp)) {
timestamp = GST_BUFFER_PTS (buffer);
}
gst_buffer_unref (buffer); gst_buffer_unref (buffer);
if (best == NULL || pads->priv->compare_func (pads, data, timestamp, if (best == NULL || pads->priv->compare_func (pads, data, timestamp,
best, best_time, pads->priv->compare_user_data) < 0) { best, best_time, pads->priv->compare_user_data) < 0) {
@ -1569,10 +1574,11 @@ gst_collect_pads_clip_time (GstCollectPads * pads, GstCollectData * data,
if (pads->priv->clip_func) { if (pads->priv->clip_func) {
in = gst_buffer_new (); in = gst_buffer_new ();
GST_BUFFER_TIMESTAMP (in) = time; GST_BUFFER_PTS (in) = time;
GST_BUFFER_DTS (in) = time;
pads->priv->clip_func (pads, data, in, &out, pads->priv->clip_user_data); pads->priv->clip_func (pads, data, in, &out, pads->priv->clip_user_data);
if (out) { if (out) {
otime = GST_BUFFER_TIMESTAMP (out); otime = GST_BUFFER_PTS (out);
gst_buffer_unref (out); gst_buffer_unref (out);
} else { } else {
/* FIXME should distinguish between ahead or after segment, /* FIXME should distinguish between ahead or after segment,
@ -1996,7 +2002,11 @@ gst_collect_pads_chain (GstPad * pad, GstObject * parent, GstBuffer * buffer)
/* update segment last position if in TIME */ /* update segment last position if in TIME */
if (G_LIKELY (data->segment.format == GST_FORMAT_TIME)) { if (G_LIKELY (data->segment.format == GST_FORMAT_TIME)) {
GstClockTime timestamp = GST_BUFFER_TIMESTAMP (buffer); GstClockTime timestamp;
timestamp = GST_BUFFER_DTS (buffer);
if (!GST_CLOCK_TIME_IS_VALID (timestamp))
timestamp = GST_BUFFER_PTS (buffer);
if (GST_CLOCK_TIME_IS_VALID (timestamp)) if (GST_CLOCK_TIME_IS_VALID (timestamp))
data->segment.position = timestamp; data->segment.position = timestamp;