mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-28 20:51:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

adapter: fix distance when getting prev pts/dts at offset

Browse source 
https://bugzilla.gnome.org/show_bug.cgi?id=765662
This commit is contained in:
Nicolas Huet 2016-04-27 10:57:29 +02:00 committed by Tim-Philipp Müller
parent 03286b7b7e
commit 9cd2677791
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
libs/gst/base/gstadapter.c
View file

@ -1550,6 +1550,7 @@ gst_adapter_prev_pts_at_offset (GstAdapter * adapter, gsize offset,
GstBuffer *cur; GstBuffer *cur;
GSList *g; GSList *g;
gsize read_offset = 0; gsize read_offset = 0;
gsize pts_offset = 0;
GstClockTime pts = adapter->pts; GstClockTime pts = adapter->pts;
g_return_val_if_fail (GST_IS_ADAPTER (adapter), GST_CLOCK_TIME_NONE); g_return_val_if_fail (GST_IS_ADAPTER (adapter), GST_CLOCK_TIME_NONE);
@ -1559,16 +1560,17 @@ gst_adapter_prev_pts_at_offset (GstAdapter * adapter, gsize offset,
while (g && read_offset < offset + adapter->skip) { while (g && read_offset < offset + adapter->skip) {
cur = g->data; cur = g->data;
read_offset += gst_buffer_get_size (cur);
if (GST_CLOCK_TIME_IS_VALID (GST_BUFFER_PTS (cur))) { if (GST_CLOCK_TIME_IS_VALID (GST_BUFFER_PTS (cur))) {
pts = GST_BUFFER_PTS (cur); pts = GST_BUFFER_PTS (cur);
pts_offset = read_offset;
} }
read_offset += gst_buffer_get_size (cur);
g = g_slist_next (g); g = g_slist_next (g);
} }
if (distance) if (distance)
*distance = adapter->pts_distance + offset; *distance = adapter->pts_distance + offset - pts_offset;
return pts; return pts;
} }
@ -1598,6 +1600,7 @@ gst_adapter_prev_dts_at_offset (GstAdapter * adapter, gsize offset,
GstBuffer *cur; GstBuffer *cur;
GSList *g; GSList *g;
gsize read_offset = 0; gsize read_offset = 0;
gsize dts_offset = 0;
GstClockTime dts = adapter->dts; GstClockTime dts = adapter->dts;
g_return_val_if_fail (GST_IS_ADAPTER (adapter), GST_CLOCK_TIME_NONE); g_return_val_if_fail (GST_IS_ADAPTER (adapter), GST_CLOCK_TIME_NONE);
@ -1607,16 +1610,17 @@ gst_adapter_prev_dts_at_offset (GstAdapter * adapter, gsize offset,
while (g && read_offset < offset + adapter->skip) { while (g && read_offset < offset + adapter->skip) {
cur = g->data; cur = g->data;
read_offset += gst_buffer_get_size (cur);
if (GST_CLOCK_TIME_IS_VALID (GST_BUFFER_DTS (cur))) { if (GST_CLOCK_TIME_IS_VALID (GST_BUFFER_DTS (cur))) {
dts = GST_BUFFER_DTS (cur); dts = GST_BUFFER_DTS (cur);
dts_offset = read_offset;
} }
read_offset += gst_buffer_get_size (cur);
g = g_slist_next (g); g = g_slist_next (g);
} }
if (distance) if (distance)
*distance = adapter->dts_distance + offset; *distance = adapter->dts_distance + offset - dts_offset;
return dts; return dts;
} }