|
[-]
[+]
|
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">f3f0d4192863c41f770087bc53e33cbf7f66eb5e</param>
+ <param name="revision">2381132c01929946fd856d8508be79fe00ed35bb</param>
<param name="token"/>
<param name="debian">N</param>
<param name="dumb">N</param>
|
|
[-]
[+]
|
Changed |
_service:tar_git:gstreamer1.0-droid-0.20170510.0.tar.gz/gst-libs/gst/droid/gstdroidcodec.c
^
|
| @@ -129,7 +129,7 @@
NULL, NULL, NULL, NULL, NULL, NULL},
{GST_DROID_CODEC_DECODER_VIDEO, "video/x-vp8", "video/x-vnd.on2.vp8",
- "video/x-vp8", FALSE, NULL, NULL, NULL, NULL,
+ "video/x-vp8", TRUE, NULL, NULL, NULL, NULL,
create_vp8vdec_codec_data_from_codec_data, NULL, NULL},
/* audio encoders */
|
|
[-]
[+]
|
Changed |
_service:tar_git:gstreamer1.0-droid-0.20170510.0.tar.gz/gst/droidcamsrc/gstdroidcamsrc.c
^
|
| @@ -1712,7 +1712,10 @@
}
vid = g_strdup_printf ("%ix%i", info.width, info.height);
- gst_droidcamsrc_params_set_string (src->dev->params, "video-size", vid);
+ gchar *key =
+ src->dev->
+ params->has_separate_video_size_values ? "video-size" : "preview-size";
+ gst_droidcamsrc_params_set_string (src->dev->params, key, vid);
/* Now we need to find a picture size that is equal to our video size.
* Some devices need to have a picture size otherwise the video mode viewfinder
|
|
[-]
[+]
|
Changed |
_service:tar_git:gstreamer1.0-droid-0.20170510.0.tar.gz/gst/droidcamsrc/gstdroidcamsrcparams.c
^
|
| @@ -195,6 +195,8 @@
gst_droidcamsrc_params_fill_fps_range_arrays_locked (params);
params->is_dirty = FALSE;
+ params->has_separate_video_size_values =
+ g_hash_table_lookup (params->params, "video-size-values") != NULL;
}
GstDroidCamSrcParams *
@@ -389,8 +391,14 @@
GstCaps *caps;
g_mutex_lock (¶ms->lock);
- caps = gst_droidcamsrc_params_get_caps_locked (params, "video-size-values",
+
+ gchar *key =
+ params->has_separate_video_size_values ? "video-size-values" :
+ "preview-size-values";
+
+ caps = gst_droidcamsrc_params_get_caps_locked (params, key,
"video/x-raw", GST_CAPS_FEATURE_MEMORY_DROID_VIDEO_META_DATA, "YV12");
+
g_mutex_unlock (¶ms->lock);
return caps;
|
|
[-]
[+]
|
Changed |
_service:tar_git:gstreamer1.0-droid-0.20170510.0.tar.gz/gst/droidcamsrc/gstdroidcamsrcparams.h
^
|
| @@ -32,6 +32,7 @@
GHashTable *params;
gboolean is_dirty;
GArray *min_fps_range, *max_fps_range;
+ gboolean has_separate_video_size_values;
GMutex lock;
};
|
