From 5dfa3c80091ef76c39bd041dd6e65078b5c1d2d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Fri, 6 Mar 2015 18:49:16 +0100 Subject: [PATCH] Revert "videoaggregator: Create new caps from the video-info" This reverts commit 78215be0dfbb4e8ed4f249e161a94c644328d28d. because it broke glvideomixer with custom caps features. --- gst-libs/gst/video/gstvideoaggregator.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/gst-libs/gst/video/gstvideoaggregator.c b/gst-libs/gst/video/gstvideoaggregator.c index cf33ac3fe6..71458ed9d5 100644 --- a/gst-libs/gst/video/gstvideoaggregator.c +++ b/gst-libs/gst/video/gstvideoaggregator.c @@ -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); }