summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Nauwelaerts <mnauw@users.sourceforge.net>2015-02-22 16:57:57 +0100
committerMark Nauwelaerts <mnauw@users.sourceforge.net>2015-02-22 16:59:08 +0100
commitccee86a7ddf86c4cf4a255f60e7f5f56defcb09b (patch)
tree9e2fb942fdf552f963407d0803bd1e1e0c167b99
parentc321b6bd81df2cc93609a6023d64cffb11046c00 (diff)
Revert "videodecoder: drain current segment upon new one to ensure correct flow return"
This reverts commit cc1b4eaf9ebe4568f9c2c64338cef1b2edbdca3f. See https://bugzilla.gnome.org/show_bug.cgi?id=734617
-rw-r--r--gst-libs/gst/video/gstvideodecoder.c12
1 files changed, 0 insertions, 12 deletions
diff --git a/gst-libs/gst/video/gstvideodecoder.c b/gst-libs/gst/video/gstvideodecoder.c
index c7e637d63..f4b41364c 100644
--- a/gst-libs/gst/video/gstvideodecoder.c
+++ b/gst-libs/gst/video/gstvideodecoder.c
@@ -1123,16 +1123,6 @@ gst_video_decoder_sink_event_default (GstVideoDecoder * decoder,
{
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);
if (segment.format == GST_FORMAT_TIME) {
@@ -2839,14 +2829,12 @@ gst_video_decoder_clip_and_push_buf (GstVideoDecoder * decoder, GstBuffer * buf)
GST_TIME_ARGS (start), GST_TIME_ARGS (stop),
GST_TIME_ARGS (segment->start),
GST_TIME_ARGS (segment->stop), GST_TIME_ARGS (segment->time));
-#if 1
if (segment->rate >= 0) {
if (GST_BUFFER_PTS (buf) >= segment->stop)
ret = GST_FLOW_EOS;
} else if (GST_BUFFER_PTS (buf) < segment->start) {
ret = GST_FLOW_EOS;
}
-#endif
gst_buffer_unref (buf);
goto done;
}