mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-05 06:58:56 +00:00
Code Issues 1 Projects Releases Wiki Activity

videoaggregator: push the caps event as soon as we receive it

Browse source 
Along with the required mandatory dependent events.

Some elements need to perform an allocation query inside
::negotiated_caps().  Without the caps event being sent prior,
downstream elements will be unable to answer and will return
an error.

https://bugzilla.gnome.org/show_bug.cgi?id=732662
This commit is contained in:
Matthew Waters 2014-08-07 19:54:36 +10:00
parent b9105792da
commit 7c016752d7
2 changed files with 15 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
gst-libs/gst/base/gstaggregator.c
View file

@ -277,19 +277,6 @@ _check_all_pads_with_data_or_eos (GstAggregator * self,
return FALSE; return FALSE;
} }
/**
* gst_aggregator_set_src_caps:
* @self: The #GstAggregator
* @caps: The #GstCaps to set later on the src pad.
*
* Sets the caps to be used on the src pad.
*/
void
gst_aggregator_set_src_caps (GstAggregator * self, GstCaps * caps)
{
gst_caps_replace (&self->priv->srccaps, caps);
}
static void static void
_reset_flow_values (GstAggregator * self) _reset_flow_values (GstAggregator * self)
{ {
@ -350,6 +337,20 @@ _push_mandatory_events (GstAggregator * self)
} }
} }
/**
* gst_aggregator_set_src_caps:
* @self: The #GstAggregator
* @caps: The #GstCaps to set later on the src pad.
*
* Sets the caps to be used on the src pad.
*/
void
gst_aggregator_set_src_caps (GstAggregator * self, GstCaps * caps)
{
gst_caps_replace (&self->priv->srccaps, caps);
_push_mandatory_events (self);
}
/** /**
* gst_aggregator_finish_buffer: * gst_aggregator_finish_buffer:
* @self: The #GstAggregator * @self: The #GstAggregator

9
gst-libs/gst/video/gstvideoaggregator.c
View file

@ -283,7 +283,6 @@ struct _GstVideoAggregatorPrivate
/* current caps */ /* current caps */
GstCaps *current_caps; GstCaps *current_caps;
gboolean send_caps;
}; };
G_DEFINE_ABSTRACT_TYPE_WITH_CODE (GstVideoAggregator, gst_videoaggregator, G_DEFINE_ABSTRACT_TYPE_WITH_CODE (GstVideoAggregator, gst_videoaggregator,
@ -502,7 +501,7 @@ gst_videoaggregator_src_setcaps (GstVideoAggregator * vagg, GstCaps * caps)
if (vagg->priv->current_caps == NULL || if (vagg->priv->current_caps == NULL ||
gst_caps_is_equal (caps, vagg->priv->current_caps) == FALSE) { gst_caps_is_equal (caps, vagg->priv->current_caps) == FALSE) {
gst_caps_replace (&vagg->priv->current_caps, caps); gst_caps_replace (&vagg->priv->current_caps, caps);
vagg->priv->send_caps = TRUE; gst_aggregator_set_src_caps (agg, caps);
} }
done: done:
@ -1188,11 +1187,6 @@ gst_videoaggregator_aggregate (GstAggregator * agg)
if (gst_pad_check_reconfigure (agg->srcpad)) if (gst_pad_check_reconfigure (agg->srcpad))
gst_videoaggregator_update_src_caps (vagg); gst_videoaggregator_update_src_caps (vagg);
if (vagg->priv->send_caps) {
gst_aggregator_set_src_caps (agg, vagg->priv->current_caps);
vagg->priv->send_caps = FALSE;
}
GST_VIDEO_AGGREGATOR_LOCK (vagg); GST_VIDEO_AGGREGATOR_LOCK (vagg);
if (agg->segment.position == -1) if (agg->segment.position == -1)
@ -1652,7 +1646,6 @@ gst_videoaggregator_start (GstAggregator * agg)
if (!GST_AGGREGATOR_CLASS (gst_videoaggregator_parent_class)->start (agg)) if (!GST_AGGREGATOR_CLASS (gst_videoaggregator_parent_class)->start (agg))
return FALSE; return FALSE;
vagg->priv->send_caps = TRUE;
gst_segment_init (&agg->segment, GST_FORMAT_TIME); gst_segment_init (&agg->segment, GST_FORMAT_TIME);
gst_caps_replace (&vagg->priv->current_caps, NULL); gst_caps_replace (&vagg->priv->current_caps, NULL);