mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-11 09:55:36 +00:00
Code Issues 1 Projects Releases Wiki Activity

dvdemux: Pass-through buffer DISCONT flags

Browse source 
https://bugzilla.gnome.org/show_bug.cgi?id=767157
This commit is contained in:
Sebastian Dröge 2016-06-02 13:53:44 +03:00
parent 91a2a790e9
commit 30c8aafea9
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
ext/dv/gstdvdemux.c
View file

@ -255,6 +255,7 @@ gst_dvdemux_reset (GstDVDemux * dvdemux)
dvdemux->frame_offset = 0; dvdemux->frame_offset = 0;
dvdemux->audio_offset = 0; dvdemux->audio_offset = 0;
dvdemux->video_offset = 0; dvdemux->video_offset = 0;
dvdemux->discont = TRUE;
g_atomic_int_set (&dvdemux->found_header, 0); g_atomic_int_set (&dvdemux->found_header, 0);
dvdemux->frame_len = -1; dvdemux->frame_len = -1;
dvdemux->need_segment = FALSE; dvdemux->need_segment = FALSE;
@ -728,6 +729,7 @@ gst_dvdemux_handle_sink_event (GstPad * pad, GstObject * parent,
GST_DEBUG ("cleared adapter"); GST_DEBUG ("cleared adapter");
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->discont = TRUE;
res = gst_dvdemux_push_event (dvdemux, event); res = gst_dvdemux_push_event (dvdemux, event);
break; break;
case GST_EVENT_SEGMENT: case GST_EVENT_SEGMENT:
@ -964,6 +966,8 @@ gst_dvdemux_do_seek (GstDVDemux * demux, GstSegment * segment)
/* every DV frame corresponts with one video frame */ /* every DV frame corresponts with one video frame */
demux->frame_offset = demux->video_offset; demux->frame_offset = demux->video_offset;
demux->discont = TRUE;
done: done:
return res; return res;
} }
@ -1241,7 +1245,7 @@ gst_dvdemux_demux_audio (GstDVDemux * dvdemux, GstBuffer * buffer,
dvdemux->audio_offset += num_samples; dvdemux->audio_offset += num_samples;
GST_BUFFER_OFFSET_END (outbuf) = dvdemux->audio_offset; GST_BUFFER_OFFSET_END (outbuf) = dvdemux->audio_offset;
if (dvdemux->new_media) if (dvdemux->new_media || dvdemux->discont)
GST_BUFFER_FLAG_SET (outbuf, GST_BUFFER_FLAG_DISCONT); GST_BUFFER_FLAG_SET (outbuf, GST_BUFFER_FLAG_DISCONT);
ret = gst_pad_push (dvdemux->audiosrcpad, outbuf); ret = gst_pad_push (dvdemux->audiosrcpad, outbuf);
@ -1321,7 +1325,7 @@ gst_dvdemux_demux_video (GstDVDemux * dvdemux, GstBuffer * buffer,
GST_BUFFER_OFFSET_END (outbuf) = dvdemux->video_offset + 1; GST_BUFFER_OFFSET_END (outbuf) = dvdemux->video_offset + 1;
GST_BUFFER_DURATION (outbuf) = duration; GST_BUFFER_DURATION (outbuf) = duration;
if (dvdemux->new_media) if (dvdemux->new_media || dvdemux->discont)
GST_BUFFER_FLAG_SET (outbuf, GST_BUFFER_FLAG_DISCONT); GST_BUFFER_FLAG_SET (outbuf, GST_BUFFER_FLAG_DISCONT);
GST_DEBUG ("pushing video %" GST_TIME_FORMAT, GST_DEBUG ("pushing video %" GST_TIME_FORMAT,
@ -1497,6 +1501,7 @@ gst_dvdemux_demux_frame (GstDVDemux * dvdemux, GstBuffer * buffer)
goto done; goto done;
} }
dvdemux->discont = FALSE;
dvdemux->time_segment.position = next_ts; dvdemux->time_segment.position = next_ts;
dvdemux->frame_offset++; dvdemux->frame_offset++;
@ -1592,8 +1597,10 @@ gst_dvdemux_chain (GstPad * pad, GstObject * parent, GstBuffer * buffer)
/* a discontinuity in the stream, we need to get rid of /* a discontinuity in the stream, we need to get rid of
* accumulated data in the adapter and assume a new frame * accumulated data in the adapter and assume a new frame
* starts after the discontinuity */ * starts after the discontinuity */
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;
}
/* a timestamp always should be respected */ /* a timestamp always should be respected */
timestamp = GST_BUFFER_TIMESTAMP (buffer); timestamp = GST_BUFFER_TIMESTAMP (buffer);

1
ext/dv/gstdvdemux.h
View file

@ -69,6 +69,7 @@ struct _GstDVDemux {
gint frequency; gint frequency;
gint channels; gint channels;
gboolean discont;
gint64 frame_offset; gint64 frame_offset;
gint64 audio_offset; gint64 audio_offset;
gint64 video_offset; gint64 video_offset;