mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-23 10:11:08 +00:00
Code Issues 1 Projects Releases Wiki Activity

dvdemux: Remember if upstream had a time segment and if not properly create time segments

Browse source 
Previously the segment.time was wrong, and the position was not updated
correctly, resulting in seeks in PUSH mode with upstream providing a BYTES
segment to not work at all.

https://bugzilla.gnome.org/show_bug.cgi?id=767157
This commit is contained in:
Sebastian Dröge 2016-06-03 10:36:32 +03:00
parent 479a3bab18
commit 26b37c7acb
2 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
ext/dv/gstdvdemux.c
View file

@ -268,6 +268,7 @@ gst_dvdemux_reset (GstDVDemux * dvdemux)
dvdemux->wide = FALSE; dvdemux->wide = FALSE;
gst_segment_init (&dvdemux->byte_segment, GST_FORMAT_BYTES); gst_segment_init (&dvdemux->byte_segment, GST_FORMAT_BYTES);
gst_segment_init (&dvdemux->time_segment, GST_FORMAT_TIME); gst_segment_init (&dvdemux->time_segment, GST_FORMAT_TIME);
dvdemux->upstream_time_segment = FALSE;
dvdemux->have_group_id = FALSE; dvdemux->have_group_id = FALSE;
dvdemux->group_id = G_MAXUINT; dvdemux->group_id = G_MAXUINT;
} }
@ -797,6 +798,8 @@ gst_dvdemux_handle_sink_event (GstPad * pad, GstObject * parent,
case GST_FORMAT_TIME: case GST_FORMAT_TIME:
gst_segment_copy_into (segment, &dvdemux->time_segment); gst_segment_copy_into (segment, &dvdemux->time_segment);
dvdemux->upstream_time_segment = TRUE;
/* and we can just forward this time event */ /* and we can just forward this time event */
res = gst_dvdemux_push_event (dvdemux, event); res = gst_dvdemux_push_event (dvdemux, event);
break; break;
@ -1484,9 +1487,11 @@ gst_dvdemux_demux_frame (GstDVDemux * dvdemux, GstBuffer * buffer)
GstSMPTETimeCode timecode; GstSMPTETimeCode timecode;
int frame_number; int frame_number;
if (G_UNLIKELY (dvdemux->need_segment)) { if (dvdemux->need_segment) {
GstFormat format; GstFormat format;
g_assert (!dvdemux->upstream_time_segment);
/* convert to time and store as start/end_timestamp */ /* convert to time and store as start/end_timestamp */
format = GST_FORMAT_TIME; format = GST_FORMAT_TIME;
if (!(gst_dvdemux_convert_sink_pair (dvdemux, if (!(gst_dvdemux_convert_sink_pair (dvdemux,
@ -1496,8 +1501,12 @@ gst_dvdemux_demux_frame (GstDVDemux * dvdemux, GstBuffer * buffer)
(gint64 *) & dvdemux->time_segment.stop))) (gint64 *) & dvdemux->time_segment.stop)))
goto segment_error; goto segment_error;
dvdemux->time_segment.time = dvdemux->time_segment.start;
dvdemux->time_segment.rate = dvdemux->byte_segment.rate; dvdemux->time_segment.rate = dvdemux->byte_segment.rate;
dvdemux->time_segment.position = dvdemux->time_segment.start;
gst_dvdemux_sink_convert (dvdemux,
GST_FORMAT_BYTES, dvdemux->byte_segment.position,
GST_FORMAT_TIME, (gint64 *) & dvdemux->time_segment.position);
gst_dvdemux_update_frame_offsets (dvdemux, dvdemux->time_segment.position); gst_dvdemux_update_frame_offsets (dvdemux, dvdemux->time_segment.position);
@ -1652,6 +1661,10 @@ gst_dvdemux_chain (GstPad * pad, GstObject * parent, GstBuffer * buffer)
if (G_UNLIKELY (GST_BUFFER_FLAG_IS_SET (buffer, GST_BUFFER_FLAG_DISCONT))) { if (G_UNLIKELY (GST_BUFFER_FLAG_IS_SET (buffer, GST_BUFFER_FLAG_DISCONT))) {
gst_adapter_clear (dvdemux->adapter); gst_adapter_clear (dvdemux->adapter);
dvdemux->discont = TRUE; dvdemux->discont = TRUE;
/* Should recheck where we are */
if (!dvdemux->upstream_time_segment)
dvdemux->need_segment = TRUE;
} }
/* a timestamp always should be respected */ /* a timestamp always should be respected */
@ -1662,6 +1675,11 @@ gst_dvdemux_chain (GstPad * pad, GstObject * parent, GstBuffer * buffer)
if (dvdemux->discont) if (dvdemux->discont)
gst_dvdemux_update_frame_offsets (dvdemux, gst_dvdemux_update_frame_offsets (dvdemux,
dvdemux->time_segment.position); dvdemux->time_segment.position);
} else if (dvdemux->upstream_time_segment && dvdemux->discont) {
/* This will probably fail later to provide correct
* timestamps and/or durations but also should not happen */
GST_ERROR_OBJECT (dvdemux,
"Upstream provides TIME segment but no PTS after discont");
} }
gst_adapter_push (dvdemux->adapter, buffer); gst_adapter_push (dvdemux->adapter, buffer);

1
ext/dv/gstdvdemux.h
View file

@ -76,6 +76,7 @@ struct _GstDVDemux {
GstDVDemuxSeekHandler seek_handler; GstDVDemuxSeekHandler seek_handler;
GstSegment byte_segment; GstSegment byte_segment;
gboolean upstream_time_segment;
GstSegment time_segment; GstSegment time_segment;
gboolean need_segment; gboolean need_segment;
gboolean new_media; gboolean new_media;