From 3979184d956d2702357529af4d02d7506b577f07 Mon Sep 17 00:00:00 2001 From: Olivier Crête Date: Mon, 15 Apr 2013 19:53:28 -0400 Subject: v4l2src: Disable renegotiation in the negotiate method This way, we don't block the initial negotiation. Thanks to Jeremy Whiting for doing all the testing. https://bugzilla.gnome.org/show_bug.cgi?id=695981 --- sys/v4l2/gstv4l2src.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sys/v4l2/gstv4l2src.c b/sys/v4l2/gstv4l2src.c index 859fcee23..d9349ac4d 100644 --- a/sys/v4l2/gstv4l2src.c +++ b/sys/v4l2/gstv4l2src.c @@ -311,11 +311,20 @@ gst_v4l2src_fixate (GstBaseSrc * basesrc, GstCaps * caps) static gboolean gst_v4l2src_negotiate (GstBaseSrc * basesrc) { + GstV4l2Src *v4l2src; + GstV4l2Object *obj; GstCaps *thiscaps; GstCaps *caps = NULL; GstCaps *peercaps = NULL; gboolean result = FALSE; + v4l2src = GST_V4L2SRC (basesrc); + obj = v4l2src->v4l2object; + + /* We don't allow renegotiation, just return TRUE in that case */ + if (GST_V4L2_IS_ACTIVE (obj)) + return TRUE; + /* first see what is possible on our source pad */ thiscaps = gst_pad_query_caps (GST_BASE_SRC_PAD (basesrc), NULL); GST_DEBUG_OBJECT (basesrc, "caps of src: %" GST_PTR_FORMAT, thiscaps); -- cgit v1.2.3