From 18ef4f18d0941b6bc2694e656b4ec2fc53ad66be Mon Sep 17 00:00:00 2001 From: Thibault Saunier Date: Sat, 18 May 2013 15:06:49 -0400 Subject: [PATCH] videomixer: Send a reconfigure event upstream if sinkpad caps are not usable https://bugzilla.gnome.org/show_bug.cgi?id=684237 --- gst/videomixer/videomixer2.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gst/videomixer/videomixer2.c b/gst/videomixer/videomixer2.c index e3c1ddc13b..6d034e0f72 100644 --- a/gst/videomixer/videomixer2.c +++ b/gst/videomixer/videomixer2.c @@ -317,9 +317,11 @@ gst_videomixer2_pad_sink_setcaps (GstPad * pad, GstObject * parent, if (GST_VIDEO_INFO_FORMAT (&mix->info) != GST_VIDEO_INFO_FORMAT (&info) || GST_VIDEO_INFO_PAR_N (&mix->info) != GST_VIDEO_INFO_PAR_N (&info) || GST_VIDEO_INFO_PAR_D (&mix->info) != GST_VIDEO_INFO_PAR_D (&info)) { - GST_ERROR_OBJECT (pad, "Caps not compatible with other pads' caps"); GST_VIDEO_MIXER2_UNLOCK (mix); - goto beach; + GST_DEBUG_OBJECT (pad, "got input caps %" GST_PTR_FORMAT ", but " + "current caps are %" GST_PTR_FORMAT, caps, mix->current_caps); + gst_pad_push_event (pad, gst_event_new_reconfigure ()); + return FALSE; } }