mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-07 07:58:51 +00:00
Code Issues 1 Projects Releases Wiki Activity

videodecoder: drain current segment upon new one to ensure correct flow return

Browse source 
See also https://bugzilla.gnome.org/show_bug.cgi?id=709224
This commit is contained in:
Mark Nauwelaerts 2015-02-21 17:42:08 +01:00
parent 696b8cdc40
commit cc1b4eaf9e
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
gst-libs/gst/video/gstvideodecoder.c
View file

@ -1123,6 +1123,16 @@ gst_video_decoder_sink_event_default (GstVideoDecoder * decoder,
{ {
GstSegment segment; GstSegment segment;
/* need to drain here because:
* - done in case of GAP and this is no less invasive
* - upstream now thinks in terms of a new segment so it will get
* confused if remaining data of the old segment is delay decoded, then
* dropped with EOS return due to clipping
* - it is said in @finish documentation subclass should expect this upon
* end of a segment and be able to handle this
*/
gst_video_decoder_drain_out (decoder, TRUE);
gst_event_copy_segment (event, &segment); gst_event_copy_segment (event, &segment);
if (segment.format == GST_FORMAT_TIME) { if (segment.format == GST_FORMAT_TIME) {
@ -2829,12 +2839,14 @@ gst_video_decoder_clip_and_push_buf (GstVideoDecoder * decoder, GstBuffer * buf)
GST_TIME_ARGS (start), GST_TIME_ARGS (stop), GST_TIME_ARGS (start), GST_TIME_ARGS (stop),
GST_TIME_ARGS (segment->start), GST_TIME_ARGS (segment->start),
GST_TIME_ARGS (segment->stop), GST_TIME_ARGS (segment->time)); GST_TIME_ARGS (segment->stop), GST_TIME_ARGS (segment->time));
#if 1
if (segment->rate >= 0) { if (segment->rate >= 0) {
if (GST_BUFFER_PTS (buf) >= segment->stop) if (GST_BUFFER_PTS (buf) >= segment->stop)
ret = GST_FLOW_EOS; ret = GST_FLOW_EOS;
} else if (GST_BUFFER_PTS (buf) < segment->start) { } else if (GST_BUFFER_PTS (buf) < segment->start) {
ret = GST_FLOW_EOS; ret = GST_FLOW_EOS;
} }
#endif
gst_buffer_unref (buf); gst_buffer_unref (buf);
goto done; goto done;
} }