mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-03 13:02:29 +00:00
Code Issues 1 Projects Releases Wiki Activity

videoencoder: Make sure to push any pre-caps events before the caps are set

Browse source
This commit is contained in:
Sebastian Dröge 2013-05-09 15:42:49 +02:00
parent 82f1572205
commit 2cc6a62b31
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
gst-libs/gst/video/gstvideoencoder.c
View file

@ -1481,22 +1481,31 @@ gst_video_encoder_negotiate_default (GstVideoEncoder * encoder)
/* 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 = encoder->priv->frames ? encoder->priv->frames->data : NULL; frame = encoder->priv->frames ? encoder->priv->frames->data : NULL;
if (frame && frame->events) { if (frame || encoder->priv->current_frame_events) {
GList *l; GList **events, *l;
gboolean set_caps = FALSE; gboolean set_caps = FALSE;
if (frame) {
events = &frame->events;
} else {
events = &encoder->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 (encoder->srcpad, state->caps); ret = gst_pad_set_caps (encoder->srcpad, state->caps);
set_caps = TRUE; set_caps = TRUE;
break;
} }
gst_video_encoder_push_event (encoder, event); gst_video_encoder_push_event (encoder, 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 (encoder->srcpad, state->caps); ret = gst_pad_set_caps (encoder->srcpad, state->caps);
} }
@ -1707,7 +1716,6 @@ gst_video_encoder_finish_frame (GstVideoEncoder * encoder,
&& gst_pad_check_reconfigure (encoder->srcpad)))) && gst_pad_check_reconfigure (encoder->srcpad))))
gst_video_encoder_negotiate (encoder); gst_video_encoder_negotiate (encoder);
if (G_UNLIKELY (priv->output_state == NULL)) if (G_UNLIKELY (priv->output_state == NULL))
goto no_output_state; goto no_output_state;