[-]
[+]
|
Changed |
_service:tar_git:gstreamer1.0-droid.changes
|
|
[-]
[+]
|
Changed |
_service:tar_git:gst-droid.spec
^
|
|
[-]
[+]
|
Changed |
_service
^
|
@@ -2,7 +2,7 @@
<service name="tar_git">
<param name="url">https://github.com/sailfishos/gst-droid.git</param>
<param name="branch">master</param>
- <param name="revision">3496801854feb8ae1d095d5bdc2ea77a7a17bdfe</param>
+ <param name="revision">8d5dab39c11b6f815a0fb36f704d63694065aa5d</param>
<param name="token"/>
<param name="debian">N</param>
<param name="dumb">N</param>
|
[-]
[+]
|
Changed |
_service:tar_git:gstreamer1.0-droid-0.20190805.0.tar.gz/gst/droidcamsrc/gstdroidcamsrcdev.c
^
|
@@ -563,6 +563,13 @@
dev->info = info;
dev->cam = droid_media_camera_connect (dev->info->num);
+ if (!dev->cam) {
+ g_rec_mutex_unlock (dev->lock);
+
+ GST_ELEMENT_ERROR (src, LIBRARY, INIT, (NULL), ("error opening camera"));
+ return FALSE;
+ }
+
hal_format = droid_media_camera_get_video_color_format (dev->cam);
if (hal_format == constants.OMX_COLOR_FormatYUV420Planar) {
@@ -580,13 +587,6 @@
dev->viewfinder_format = GST_VIDEO_FORMAT_ENCODED;
}
- if (!dev->cam) {
- g_rec_mutex_unlock (dev->lock);
-
- GST_ELEMENT_ERROR (src, LIBRARY, INIT, (NULL), ("error opening camera"));
- return FALSE;
- }
-
dev->queue = droid_media_camera_get_buffer_queue (dev->cam);
if (!droid_media_camera_lock (dev->cam)) {
|