mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-06 14:32:31 +00:00
Code Issues 1 Projects Releases Wiki Activity

androidcamera: Send proper error when unable to open camera

Browse source
This commit is contained in:
Youness Alaoui 2012-10-31 14:21:47 -04:00 committed by Nicolas Dufresne
parent 02f36d92bc
commit 2e745fa1b1
1 changed files with 12 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
sys/androidcamera/gstahcsrc.c
View file

@ -748,8 +748,17 @@ gst_ahc_src_open (GstAHCSrc * self)
gst_ah_camera_set_preview_texture (self->camera, self->texture); gst_ah_camera_set_preview_texture (self->camera, self->texture);
self->buffer_size = 0; self->buffer_size = 0;
} else { } else {
gint num_cams = gst_ah_camera_get_number_of_cameras ();
if (num_cams > 0 && self->device < num_cams) {
GST_ELEMENT_ERROR (self, RESOURCE, NOT_FOUND, GST_ELEMENT_ERROR (self, RESOURCE, NOT_FOUND,
("Unable to open device '%d'.", 0), GST_ERROR_SYSTEM); ("Unable to open device '%d'.", self->device), GST_ERROR_SYSTEM);
} else if (num_cams > 0) {
GST_ELEMENT_ERROR (self, RESOURCE, NOT_FOUND,
("Device '%d' does not exist.", self->device), GST_ERROR_SYSTEM);
} else {
GST_ELEMENT_ERROR (self, RESOURCE, NOT_FOUND,
("There are no cameras available on this device."), GST_ERROR_SYSTEM);
}
} }
return (self->camera != NULL); return (self->camera != NULL);
@ -778,19 +787,8 @@ gst_ahc_src_change_state (GstElement * element, GstStateChange transition)
switch (transition) { switch (transition) {
case GST_STATE_CHANGE_NULL_TO_READY: case GST_STATE_CHANGE_NULL_TO_READY:
{
gint num_cams = gst_ah_camera_get_number_of_cameras ();
if (num_cams > 0) {
if (!gst_ahc_src_open (self)) if (!gst_ahc_src_open (self))
return GST_STATE_CHANGE_FAILURE; return GST_STATE_CHANGE_FAILURE;
} else {
GST_ELEMENT_ERROR (self, RESOURCE, NOT_FOUND,
("There are no cameras available on this device."),
GST_ERROR_SYSTEM);
return GST_STATE_CHANGE_FAILURE;
}
}
break; break;
default: default:
break; break;