[-]
[+]
|
Changed |
_service:tar_git:gstreamer1.0-droid.changes
|
|
[-]
[+]
|
Changed |
_service:tar_git:gst-droid.spec
^
|
|
[-]
[+]
|
Changed |
_service:tar_git:gstreamer1.0-droid-0.20190805.0.tar.gz/gst-libs/gst/droid/gstdroidcodec.c
^
|
@@ -1072,6 +1072,7 @@
|| codec->info->type ==
GST_DROID_CODEC_DECODER_VIDEO) ? "decoder-quirks" : "encoder-quirks";
gsize quirks_length = 0;
+ codec->quirks = 0;
int x;
g_key_file_load_from_file (file, path, G_KEY_FILE_NONE, NULL);
@@ -1090,7 +1091,6 @@
goto out;
}
- codec->quirks = 0;
for (x = 0; x < quirks_length; x++) {
if (!g_strcmp0 (quirks_string[x], USE_CODEC_SUPPLIED_HEIGHT_NAME)) {
codec->quirks |= USE_CODEC_SUPPLIED_HEIGHT_VALUE;
|
[-]
[+]
|
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)) {
|