mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-25 17:50:36 +00:00
Code Issues 1 Projects Releases Wiki Activity

Revert "v4l2: disable renegotiation"

Browse source 
This reverts commit d1b26e1d59.

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
This commit is contained in:
Olivier Crête 2013-04-15 19:46:12 -04:00
parent 7e3793e378
commit 3340baa374
1 changed files with 0 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
sys/v4l2/gstv4l2src.c
View file

@ -128,7 +128,6 @@ static gboolean gst_v4l2src_decide_allocation (GstBaseSrc * src,
GstQuery * query); GstQuery * query);
static GstFlowReturn gst_v4l2src_fill (GstPushSrc * src, GstBuffer * out); static GstFlowReturn gst_v4l2src_fill (GstPushSrc * src, GstBuffer * out);
static GstCaps *gst_v4l2src_fixate (GstBaseSrc * basesrc, GstCaps * caps); 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 gboolean gst_v4l2src_negotiate (GstBaseSrc * basesrc);
static void gst_v4l2src_set_property (GObject * object, guint prop_id, static void gst_v4l2src_set_property (GObject * object, guint prop_id,
@ -197,7 +196,6 @@ gst_v4l2src_class_init (GstV4l2SrcClass * klass)
basesrc_class->stop = GST_DEBUG_FUNCPTR (gst_v4l2src_stop); basesrc_class->stop = GST_DEBUG_FUNCPTR (gst_v4l2src_stop);
basesrc_class->query = GST_DEBUG_FUNCPTR (gst_v4l2src_query); basesrc_class->query = GST_DEBUG_FUNCPTR (gst_v4l2src_query);
basesrc_class->fixate = GST_DEBUG_FUNCPTR (gst_v4l2src_fixate); 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->negotiate = GST_DEBUG_FUNCPTR (gst_v4l2src_negotiate);
basesrc_class->decide_allocation = basesrc_class->decide_allocation =
GST_DEBUG_FUNCPTR (gst_v4l2src_decide_allocation); GST_DEBUG_FUNCPTR (gst_v4l2src_decide_allocation);
@ -306,22 +304,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 static gboolean
gst_v4l2src_negotiate (GstBaseSrc * basesrc) gst_v4l2src_negotiate (GstBaseSrc * basesrc)
{ {