mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-23 18:21:04 +00:00
Code Issues 1 Projects Releases Wiki Activity

camerabin: Avoid crashing when setting zoom in NULL

Browse source 
Avoid setting zoom in NULL state because the source is not
set yet and this leads to a crash. It is set on READY > PAUSED
anyway.
This commit is contained in:
Thiago Santos 2010-04-19 19:04:24 -03:00
parent bf586d7966
commit c4aaab2d59
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gst/camerabin/gstcamerabin.c
View file

@ -552,6 +552,7 @@ camerabin_setup_src_elements (GstCameraBin * camera)
gst_caps_unref (new_caps); gst_caps_unref (new_caps);
/* Set caps for view finder mode */ /* Set caps for view finder mode */
/* This also sets zoom */
gst_camerabin_set_capsfilter_caps (camera, camera->view_finder_caps); gst_camerabin_set_capsfilter_caps (camera, camera->view_finder_caps);
} }
@ -736,7 +737,7 @@ camerabin_create_elements (GstCameraBin * camera)
GstPadLinkReturn link_ret = GST_PAD_LINK_REFUSED; GstPadLinkReturn link_ret = GST_PAD_LINK_REFUSED;
GstPad *unconnected_pad; GstPad *unconnected_pad;
GST_LOG_OBJECT (camera, "creating elems"); GST_LOG_OBJECT (camera, "creating elements");
/* Create "src" elements */ /* Create "src" elements */
if (!camerabin_create_src_elements (camera)) { if (!camerabin_create_src_elements (camera)) {
@ -1052,6 +1053,7 @@ static gboolean
gst_camerabin_set_videosrc_zoom (GstCameraBin * camera, gint zoom) gst_camerabin_set_videosrc_zoom (GstCameraBin * camera, gint zoom)
{ {
gboolean ret = FALSE; gboolean ret = FALSE;
if (g_object_class_find_property (G_OBJECT_GET_CLASS (camera->src_vid_src), if (g_object_class_find_property (G_OBJECT_GET_CLASS (camera->src_vid_src),
"zoom")) { "zoom")) {
g_object_set (G_OBJECT (camera->src_vid_src), "zoom", g_object_set (G_OBJECT (camera->src_vid_src), "zoom",
@ -3231,7 +3233,9 @@ gst_camerabin_set_property (GObject * object, guint prop_id,
break; break;
case ARG_ZOOM: case ARG_ZOOM:
g_atomic_int_set (&camera->zoom, g_value_get_int (value)); g_atomic_int_set (&camera->zoom, g_value_get_int (value));
gst_camerabin_setup_zoom (camera); /* does not set it if in NULL, the src is not created yet */
if (GST_STATE (camera) != GST_STATE_NULL)
gst_camerabin_setup_zoom (camera);
break; break;
case ARG_MODE: case ARG_MODE:
gst_camerabin_change_mode (camera, g_value_get_enum (value)); gst_camerabin_change_mode (camera, g_value_get_enum (value));