mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-17 03:35:21 +00:00
Code Issues 1 Projects Releases Wiki Activity

basecamerasrc: null caps are not valid in 1.0

Browse source 
Use any caps for the preview-caps property, as NULL caps are
not valid caps in 1.0 anymore
This commit is contained in:
Thiago Santos 2012-05-02 09:43:33 -03:00
parent b5ba142b06
commit a944578ef9
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
gst-libs/gst/basecamerabinsrc/gstbasecamerasrc.c
View file

@ -287,14 +287,22 @@ gst_base_camera_src_set_property (GObject * object,
self->post_preview = g_value_get_boolean (value); self->post_preview = g_value_get_boolean (value);
break; break;
case PROP_PREVIEW_CAPS:{ case PROP_PREVIEW_CAPS:{
GstCaps *new_caps = NULL; GstCaps *new_caps;
new_caps = (GstCaps *) gst_value_get_caps (value); new_caps = (GstCaps *) gst_value_get_caps (value);
if (new_caps == NULL) {
new_caps = gst_caps_new_any ();
} else {
new_caps = gst_caps_ref (new_caps);
}
if (!gst_caps_is_equal (self->preview_caps, new_caps)) { if (!gst_caps_is_equal (self->preview_caps, new_caps)) {
gst_caps_replace (&self->preview_caps, new_caps); gst_caps_replace (&self->preview_caps, new_caps);
gst_base_camera_src_setup_preview (self, new_caps); gst_base_camera_src_setup_preview (self, new_caps);
} else { } else {
GST_DEBUG_OBJECT (self, "New preview caps equal current preview caps"); GST_DEBUG_OBJECT (self, "New preview caps equal current preview caps");
} }
gst_caps_unref (new_caps);
} }
break; break;
case PROP_PREVIEW_FILTER: case PROP_PREVIEW_FILTER:
@ -477,7 +485,7 @@ gst_base_camera_src_class_init (GstBaseCameraSrcClass * klass)
g_object_class_install_property (gobject_class, PROP_PREVIEW_CAPS, g_object_class_install_property (gobject_class, PROP_PREVIEW_CAPS,
g_param_spec_boxed ("preview-caps", "Preview caps", g_param_spec_boxed ("preview-caps", "Preview caps",
"The caps of the preview image to be posted", "The caps of the preview image to be posted (NULL means ANY)",
GST_TYPE_CAPS, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); GST_TYPE_CAPS, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class, PROP_PREVIEW_FILTER, g_object_class_install_property (gobject_class, PROP_PREVIEW_FILTER,
@ -546,6 +554,7 @@ gst_base_camera_src_init (GstBaseCameraSrc * self)
g_mutex_init (&self->capturing_mutex); g_mutex_init (&self->capturing_mutex);
self->post_preview = DEFAULT_POST_PREVIEW; self->post_preview = DEFAULT_POST_PREVIEW;
self->preview_caps = gst_caps_new_any ();
self->preview_pipeline = self->preview_pipeline =
gst_camerabin_create_preview_pipeline (GST_ELEMENT_CAST (self), NULL); gst_camerabin_create_preview_pipeline (GST_ELEMENT_CAST (self), NULL);