FaSTTUBe/GST-Tensordecoder-ov_ep
37
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Revert "videodecoder: Send serialised events immediately, after we're pre-rolled."

Browse Source 
This reverts commit ef5316fbb0f6d5ffad7be18ed36903a89341c4de.
This commit is contained in:
Jan Schmidt 2012-09-02 22:59:58 -07:00
parent 45f7c585b3
commit acadc94279
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gst-libs/gst/video/gstvideodecoder.c
View File

@ -328,9 +328,6 @@ struct _GstVideoDecoderPrivate
/* Whether input is considered packetized or not */ /* Whether input is considered packetized or not */
gboolean packetized; gboolean packetized;
/* Whether we have pushed out at least one frame since last flush */
gboolean have_prerolled;
/* Error handling */ /* Error handling */
gint max_errors; gint max_errors;
gint error_count; gint error_count;
@ -858,9 +855,6 @@ gst_video_decoder_flush (GstVideoDecoder * dec, gboolean hard)
(GDestroyNotify) gst_event_unref); (GDestroyNotify) gst_event_unref);
priv->current_frame_events = NULL; priv->current_frame_events = NULL;
} }
priv->have_prerolled = FALSE;
/* and get (re)set for the sequel */ /* and get (re)set for the sequel */
gst_video_decoder_reset (dec, FALSE); gst_video_decoder_reset (dec, FALSE);
@ -1052,8 +1046,7 @@ gst_video_decoder_sink_event_default (GstVideoDecoder * decoder,
if (event) { if (event) {
if (!GST_EVENT_IS_SERIALIZED (event) if (!GST_EVENT_IS_SERIALIZED (event)
|| GST_EVENT_TYPE (event) == GST_EVENT_EOS || GST_EVENT_TYPE (event) == GST_EVENT_EOS
|| GST_EVENT_TYPE (event) == GST_EVENT_FLUSH_STOP || GST_EVENT_TYPE (event) == GST_EVENT_FLUSH_STOP) {
|| decoder->priv->have_prerolled) {
ret = gst_video_decoder_push_event (decoder, event); ret = gst_video_decoder_push_event (decoder, event);
} else { } else {
GST_VIDEO_DECODER_STREAM_LOCK (decoder); 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); ret = gst_pad_push (decoder->srcpad, buf);
priv->have_prerolled = TRUE;
done: done:
return ret; return ret;
} }