mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-19 06:46:38 +00:00
Code Issues 1 Projects Releases Wiki Activity

Revert "videoaggregator: Create new caps from the video-info"

Browse source 
This reverts commit 78215be0df.

because it broke glvideomixer with custom caps features.
This commit is contained in:
Sebastian Dröge 2015-03-06 18:49:16 +01:00
parent 90967b3d45
commit 50d2d9ac08
1 changed files with 2 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -599,24 +599,14 @@ gst_videoaggregator_src_setcaps (GstVideoAggregator * vagg, GstCaps * caps)
if (vagg->priv->current_caps == NULL ||
gst_caps_is_equal (caps, vagg->priv->current_caps) == FALSE) {
GstClockTime latency;
GstCaps *full_caps;
/* Create new caps from the video-info, in case the original caps
* were missing some optional fields like interlace-mode. We assume
* default values for those everywhere, but they can still cause
* negotiation to fail if a downstream element expects the field to be
* there and at a specific value.
*/
full_caps = gst_video_info_to_caps (&info);
gst_caps_replace (&vagg->priv->current_caps, full_caps);
gst_caps_replace (&vagg->priv->current_caps, caps);
GST_VIDEO_AGGREGATOR_UNLOCK (vagg);
gst_aggregator_set_src_caps (agg, full_caps);
gst_aggregator_set_src_caps (agg, caps);
latency = gst_util_uint64_scale (GST_SECOND,
GST_VIDEO_INFO_FPS_D (&info), GST_VIDEO_INFO_FPS_N (&info));
gst_aggregator_set_latency (agg, latency, latency);
gst_caps_unref (full_caps);
GST_VIDEO_AGGREGATOR_LOCK (vagg);
}