mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-27 04:01:08 +00:00
multiqueue: Use buffer DTS if present, else PTS
In order to accurately determine the amount (in time) of data travelling in queues, we should use an increasing value. If buffers are encoded and potentially reordered, we should be using their DTS (increasing) and not PTS (reordered) https://bugzilla.gnome.org/show_bug.cgi?id=756507
This commit is contained in:
parent
16458daddb
commit
692c0dc060
1 changed files with 14 additions and 13 deletions
|
@ -1156,14 +1156,14 @@ get_running_time (GstSegment * segment, GstMiniObject * object, gboolean end)
|
|||
|
||||
if (GST_IS_BUFFER (object)) {
|
||||
GstBuffer *buf = GST_BUFFER_CAST (object);
|
||||
GstClockTime btime = GST_BUFFER_DTS_OR_PTS (buf);
|
||||
|
||||
if (GST_BUFFER_TIMESTAMP_IS_VALID (buf)) {
|
||||
time = GST_BUFFER_TIMESTAMP (buf);
|
||||
if (GST_CLOCK_TIME_IS_VALID (btime)) {
|
||||
if (end && GST_BUFFER_DURATION_IS_VALID (buf))
|
||||
time += GST_BUFFER_DURATION (buf);
|
||||
if (time > segment->stop)
|
||||
time = segment->stop;
|
||||
time = gst_segment_to_running_time (segment, GST_FORMAT_TIME, time);
|
||||
btime += GST_BUFFER_DURATION (buf);
|
||||
if (btime > segment->stop)
|
||||
btime = segment->stop;
|
||||
time = gst_segment_to_running_time (segment, GST_FORMAT_TIME, btime);
|
||||
}
|
||||
} else if (GST_IS_BUFFER_LIST (object)) {
|
||||
GstBufferList *list = GST_BUFFER_LIST_CAST (object);
|
||||
|
@ -1172,14 +1172,15 @@ get_running_time (GstSegment * segment, GstMiniObject * object, gboolean end)
|
|||
|
||||
n = gst_buffer_list_length (list);
|
||||
for (i = 0; i < n; i++) {
|
||||
GstClockTime btime;
|
||||
buf = gst_buffer_list_get (list, i);
|
||||
if (GST_BUFFER_TIMESTAMP_IS_VALID (buf)) {
|
||||
time = GST_BUFFER_TIMESTAMP (buf);
|
||||
btime = GST_BUFFER_DTS_OR_PTS (buf);
|
||||
if (GST_CLOCK_TIME_IS_VALID (btime)) {
|
||||
if (end && GST_BUFFER_DURATION_IS_VALID (buf))
|
||||
time += GST_BUFFER_DURATION (buf);
|
||||
btime += GST_BUFFER_DURATION (buf);
|
||||
if (time > segment->stop)
|
||||
time = segment->stop;
|
||||
time = gst_segment_to_running_time (segment, GST_FORMAT_TIME, time);
|
||||
btime = segment->stop;
|
||||
time = gst_segment_to_running_time (segment, GST_FORMAT_TIME, btime);
|
||||
if (!end)
|
||||
goto done;
|
||||
} else if (!end) {
|
||||
|
@ -1217,7 +1218,7 @@ gst_single_queue_push_one (GstMultiQueue * mq, GstSingleQueue * sq,
|
|||
GstClockTime timestamp, duration;
|
||||
|
||||
buffer = GST_BUFFER_CAST (object);
|
||||
timestamp = GST_BUFFER_TIMESTAMP (buffer);
|
||||
timestamp = GST_BUFFER_DTS_OR_PTS (buffer);
|
||||
duration = GST_BUFFER_DURATION (buffer);
|
||||
|
||||
apply_buffer (mq, sq, timestamp, duration, &sq->src_segment);
|
||||
|
@ -1673,7 +1674,7 @@ gst_multi_queue_chain (GstPad * pad, GstObject * parent, GstBuffer * buffer)
|
|||
|
||||
item = gst_multi_queue_buffer_item_new (GST_MINI_OBJECT_CAST (buffer), curid);
|
||||
|
||||
timestamp = GST_BUFFER_TIMESTAMP (buffer);
|
||||
timestamp = GST_BUFFER_DTS_OR_PTS (buffer);
|
||||
duration = GST_BUFFER_DURATION (buffer);
|
||||
|
||||
if (!(gst_data_queue_push (sq->queue, (GstDataQueueItem *) item)))
|
||||
|
|
Loading…
Reference in a new issue