From acadc94279062d9558fa92b11e0786c551e7de2d Mon Sep 17 00:00:00 2001 From: Jan Schmidt Date: Sun, 2 Sep 2012 22:59:58 -0700 Subject: [PATCH] Revert "videodecoder: Send serialised events immediately, after we're pre-rolled." This reverts commit ef5316fbb0f6d5ffad7be18ed36903a89341c4de. --- gst-libs/gst/video/gstvideodecoder.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/gst-libs/gst/video/gstvideodecoder.c b/gst-libs/gst/video/gstvideodecoder.c index cde6ada..39f6195 100644 --- a/gst-libs/gst/video/gstvideodecoder.c +++ b/gst-libs/gst/video/gstvideodecoder.c @@ -328,9 +328,6 @@ struct _GstVideoDecoderPrivate /* Whether input is considered packetized or not */ gboolean packetized; - /* Whether we have pushed out at least one frame since last flush */ - gboolean have_prerolled; - /* Error handling */ gint max_errors; gint error_count; @@ -858,9 +855,6 @@ gst_video_decoder_flush (GstVideoDecoder * dec, gboolean hard) (GDestroyNotify) gst_event_unref); priv->current_frame_events = NULL; } - - priv->have_prerolled = FALSE; - /* and get (re)set for the sequel */ gst_video_decoder_reset (dec, FALSE); @@ -1052,8 +1046,7 @@ gst_video_decoder_sink_event_default (GstVideoDecoder * decoder, if (event) { if (!GST_EVENT_IS_SERIALIZED (event) || GST_EVENT_TYPE (event) == GST_EVENT_EOS - || GST_EVENT_TYPE (event) == GST_EVENT_FLUSH_STOP - || decoder->priv->have_prerolled) { + || GST_EVENT_TYPE (event) == GST_EVENT_FLUSH_STOP) { ret = gst_video_decoder_push_event (decoder, event); } else { GST_VIDEO_DECODER_STREAM_LOCK (decoder); @@ -2369,8 +2362,6 @@ gst_video_decoder_clip_and_push_buf (GstVideoDecoder * decoder, GstBuffer * buf) ret = gst_pad_push (decoder->srcpad, buf); - priv->have_prerolled = TRUE; - done: return ret; } -- 2.7.4