diff options
| author | Olivier Crête <olivier.crete@collabora.com> | 2013-04-15 19:46:12 -0400 |
|---|---|---|
| committer | Olivier Crête <olivier.crete@collabora.com> | 2013-07-26 10:59:05 +0200 |
| commit | c23ba428d3914e1e044f2932ff93f39a44077977 (patch) | |
| tree | 54daca970dd1b89f2df3a8a727ecdd84813269be | |
| parent | 82c342f83bfdc8e57ee29e72aad848ba200443fc (diff) | |
| download | gst-plugins-good-c23ba428d3914e1e044f2932ff93f39a44077977.tar.gz gst-plugins-good-c23ba428d3914e1e044f2932ff93f39a44077977.tar.xz | |
Revert "v4l2: disable renegotiation"
This reverts commit d1b26e1d594ab2b63324e43a36330475e98cdf18.
This causes the initial negotiation to never happen if a reconfigure
event is received after gst_base_src_start_complete() but before the loop
starts.
https://bugzilla.gnome.org/show_bug.cgi?id=695981
| -rw-r--r-- | sys/v4l2/gstv4l2src.c | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/sys/v4l2/gstv4l2src.c b/sys/v4l2/gstv4l2src.c index ce92d36ab..859fcee23 100644 --- a/sys/v4l2/gstv4l2src.c +++ b/sys/v4l2/gstv4l2src.c @@ -128,7 +128,6 @@ static gboolean gst_v4l2src_decide_allocation (GstBaseSrc * src, GstQuery * query); static GstFlowReturn gst_v4l2src_fill (GstPushSrc * src, GstBuffer * out); static GstCaps *gst_v4l2src_fixate (GstBaseSrc * basesrc, GstCaps * caps); -static gboolean gst_v4l2src_event (GstBaseSrc * src, GstEvent * event); static gboolean gst_v4l2src_negotiate (GstBaseSrc * basesrc); static void gst_v4l2src_set_property (GObject * object, guint prop_id, @@ -201,7 +200,6 @@ gst_v4l2src_class_init (GstV4l2SrcClass * klass) basesrc_class->stop = GST_DEBUG_FUNCPTR (gst_v4l2src_stop); basesrc_class->query = GST_DEBUG_FUNCPTR (gst_v4l2src_query); basesrc_class->fixate = GST_DEBUG_FUNCPTR (gst_v4l2src_fixate); - basesrc_class->event = GST_DEBUG_FUNCPTR (gst_v4l2src_event); basesrc_class->negotiate = GST_DEBUG_FUNCPTR (gst_v4l2src_negotiate); basesrc_class->decide_allocation = GST_DEBUG_FUNCPTR (gst_v4l2src_decide_allocation); @@ -311,22 +309,6 @@ gst_v4l2src_fixate (GstBaseSrc * basesrc, GstCaps * caps) static gboolean -gst_v4l2src_event (GstBaseSrc * src, GstEvent * event) -{ - GST_DEBUG_OBJECT (src, "handle event %" GST_PTR_FORMAT, event); - - switch (GST_EVENT_TYPE (event)) { - case GST_EVENT_RECONFIGURE: - gst_pad_check_reconfigure (GST_BASE_SRC_PAD (src)); - break; - default: - break; - } - return GST_BASE_SRC_CLASS (parent_class)->event (src, event); -} - - -static gboolean gst_v4l2src_negotiate (GstBaseSrc * basesrc) { GstCaps *thiscaps; |