dvdemux->wide = FALSE;
gst_segment_init (&dvdemux->byte_segment, GST_FORMAT_BYTES);
gst_segment_init (&dvdemux->time_segment, GST_FORMAT_TIME);
+ dvdemux->upstream_time_segment = FALSE;
dvdemux->have_group_id = FALSE;
dvdemux->group_id = G_MAXUINT;
}
case GST_FORMAT_TIME:
gst_segment_copy_into (segment, &dvdemux->time_segment);
+ dvdemux->upstream_time_segment = TRUE;
+
/* and we can just forward this time event */
res = gst_dvdemux_push_event (dvdemux, event);
break;
GstSMPTETimeCode timecode;
int frame_number;
- if (G_UNLIKELY (dvdemux->need_segment)) {
+ if (dvdemux->need_segment) {
GstFormat format;
+ g_assert (!dvdemux->upstream_time_segment);
+
/* convert to time and store as start/end_timestamp */
format = GST_FORMAT_TIME;
if (!(gst_dvdemux_convert_sink_pair (dvdemux,
(gint64 *) & dvdemux->time_segment.stop)))
goto segment_error;
+ dvdemux->time_segment.time = dvdemux->time_segment.start;
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);
if (G_UNLIKELY (GST_BUFFER_FLAG_IS_SET (buffer, GST_BUFFER_FLAG_DISCONT))) {
gst_adapter_clear (dvdemux->adapter);
dvdemux->discont = TRUE;
+
+ /* Should recheck where we are */
+ if (!dvdemux->upstream_time_segment)
+ dvdemux->need_segment = TRUE;
}
/* a timestamp always should be respected */
if (dvdemux->discont)
gst_dvdemux_update_frame_offsets (dvdemux,
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);