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

videodecoder: Make sure to not push any post-caps events before we have caps

Browse Source 
and that we push pre-caps events before we push caps, even if we don't
have a GstVideoFrame yet.
This commit is contained in:
Sebastian Dröge 2013-05-09 15:34:10 +02:00
parent b0ec886cb9
commit 82f1572205
1 changed files with 43 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -341,6 +341,8 @@ struct _GstVideoDecoderPrivate
GstVideoCodecFrame *current_frame; GstVideoCodecFrame *current_frame;
/* events that should apply to the current frame */ /* events that should apply to the current frame */
GList *current_frame_events; GList *current_frame_events;
/* events that should be pushed before the next frame */
GList *pending_events;
/* relative offset of input data */ /* relative offset of input data */
guint64 input_offset; guint64 input_offset;
@ -877,6 +879,8 @@ gst_video_decoder_flush (GstVideoDecoder * dec, gboolean hard)
g_list_free_full (priv->current_frame_events, g_list_free_full (priv->current_frame_events,
(GDestroyNotify) gst_event_unref); (GDestroyNotify) gst_event_unref);
priv->current_frame_events = NULL; priv->current_frame_events = NULL;
g_list_free_full (priv->pending_events, (GDestroyNotify) gst_event_unref);
priv->pending_events = NULL;
} }
/* 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);
@ -2007,7 +2011,7 @@ gst_video_decoder_chain (GstPad * pad, GstObject * parent, GstBuffer * buf)
not_negotiated: not_negotiated:
{ {
GST_ELEMENT_ERROR (decoder, CORE, NEGOTIATION, (NULL), GST_ELEMENT_ERROR (decoder, CORE, NEGOTIATION, (NULL),
("encoder not initialized")); ("decoder not initialized"));
gst_buffer_unref (buf); gst_buffer_unref (buf);
return GST_FLOW_NOT_NEGOTIATED; return GST_FLOW_NOT_NEGOTIATED;
} }
@ -2050,6 +2054,9 @@ gst_video_decoder_change_state (GstElement * element, GstStateChange transition)
g_list_free_full (decoder->priv->current_frame_events, g_list_free_full (decoder->priv->current_frame_events,
(GDestroyNotify) gst_event_unref); (GDestroyNotify) gst_event_unref);
decoder->priv->current_frame_events = NULL; decoder->priv->current_frame_events = NULL;
g_list_free_full (decoder->priv->pending_events,
(GDestroyNotify) gst_event_unref);
decoder->priv->pending_events = NULL;
GST_VIDEO_DECODER_STREAM_UNLOCK (decoder); GST_VIDEO_DECODER_STREAM_UNLOCK (decoder);
break; break;
case GST_STATE_CHANGE_READY_TO_NULL: case GST_STATE_CHANGE_READY_TO_NULL:
@ -2156,11 +2163,27 @@ gst_video_decoder_prepare_finish_frame (GstVideoDecoder *
break; break;
} }
for (l = g_list_last (events); l; l = g_list_previous (l)) { if (dropping || !decoder->priv->output_state) {
GST_LOG_OBJECT (decoder, "pushing %s event", GST_EVENT_TYPE_NAME (l->data)); /* Push before the next frame that is not dropped */
gst_video_decoder_push_event (decoder, l->data); decoder->priv->pending_events =
g_list_concat (decoder->priv->pending_events, events);
} else {
for (l = g_list_last (decoder->priv->pending_events); l;
l = g_list_previous (l)) {
GST_LOG_OBJECT (decoder, "pushing %s event",
GST_EVENT_TYPE_NAME (l->data));
gst_video_decoder_push_event (decoder, l->data);
}
g_list_free (decoder->priv->pending_events);
decoder->priv->pending_events = NULL;
for (l = g_list_last (events); l; l = g_list_previous (l)) {
GST_LOG_OBJECT (decoder, "pushing %s event",
GST_EVENT_TYPE_NAME (l->data));
gst_video_decoder_push_event (decoder, l->data);
}
g_list_free (events);
} }
g_list_free (events);
/* Check if the data should not be displayed. For example altref/invisible /* Check if the data should not be displayed. For example altref/invisible
* frame in vp8. In this case we should not update the timestamps. */ * frame in vp8. In this case we should not update the timestamps. */
@ -2992,22 +3015,32 @@ gst_video_decoder_negotiate_default (GstVideoDecoder * decoder)
/* Push all pending pre-caps events of the oldest frame before /* Push all pending pre-caps events of the oldest frame before
* setting caps */ * setting caps */
frame = decoder->priv->frames ? decoder->priv->frames->data : NULL; frame = decoder->priv->frames ? decoder->priv->frames->data : NULL;
if (frame && frame->events) { if (frame || decoder->priv->current_frame_events) {
GList *l; GList **events, *l;
gboolean set_caps = FALSE; gboolean set_caps = FALSE;
if (frame) {
events = &frame->events;
frame->events = NULL;
} else {
events = &decoder->priv->current_frame_events;
}
ret = FALSE; ret = FALSE;
for (l = g_list_last (frame->events); l; l = l->prev) { for (l = g_list_last (*events); l;) {
GstEvent *event = GST_EVENT (l->data); GstEvent *event = GST_EVENT (l->data);
GList *tmp;
if (GST_EVENT_TYPE (event) > GST_EVENT_CAPS && !set_caps) { if (GST_EVENT_TYPE (event) > GST_EVENT_CAPS && !set_caps) {
ret = gst_pad_set_caps (decoder->srcpad, state->caps); ret = gst_pad_set_caps (decoder->srcpad, state->caps);
set_caps = TRUE; set_caps = TRUE;
break;
} }
gst_video_decoder_push_event (decoder, event); gst_video_decoder_push_event (decoder, event);
tmp = l;
l = l->prev;
*events = g_list_delete_link (*events, tmp);
} }
g_list_free (frame->events);
frame->events = NULL;
if (!set_caps) { if (!set_caps) {
ret = gst_pad_set_caps (decoder->srcpad, state->caps); ret = gst_pad_set_caps (decoder->srcpad, state->caps);
} }