|
[-]
[+]
|
Changed |
_service:tar_git:gstreamer1.0-droid.changes
|
|
|
|
[-]
[+]
|
Changed |
_service:tar_git:gst-droid.spec
^
|
|
|
|
[-]
[+]
|
Changed |
_service
^
|
| @@ -2,6 +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">4bb59235ccf226353d4ae736c16397874a1377f3</param>
<param name="token"/>
<param name="debian">N</param>
<param name="dumb">N</param>
|
|
[-]
[+]
|
Changed |
_service:tar_git:gstreamer1.0-droid-0.20181128.0.tar.gz/gst/droidcamsrc/gstdroidcamsrc.c
^
|
| @@ -1050,37 +1050,6 @@
"Target bitrate", 0, G_MAXINT,
DEFAULT_TARGET_BITRATE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
- g_object_class_install_property (gobject_class,
- PROP_SUPPORTED_WB_MODES,
- g_param_spec_variant ("supported-wb-modes",
- "Supported white balance modes", "Supported white balance modes",
- G_VARIANT_TYPE_VARIANT, NULL, G_PARAM_READABLE));
-
- g_object_class_install_property (gobject_class, PROP_SUPPORTED_COLOR_TONES,
- g_param_spec_variant ("supported-color-tones", "Supported color tones",
- "Supported color tones", G_VARIANT_TYPE_VARIANT, NULL,
- G_PARAM_READABLE));
-
- g_object_class_install_property (gobject_class, PROP_SUPPORTED_SCENE_MODES,
- g_param_spec_variant ("supported-scene-modes",
- "Supported scene modes", "Supported scene modes",
- G_VARIANT_TYPE_VARIANT, NULL, G_PARAM_READABLE));
-
- g_object_class_install_property (gobject_class, PROP_SUPPORTED_FLASH_MODES,
- g_param_spec_variant ("supported-flash-modes", "Supported flash modes",
- "Supported flash modes", G_VARIANT_TYPE_VARIANT, NULL,
- G_PARAM_READABLE));
-
- g_object_class_install_property (gobject_class, PROP_SUPPORTED_FOCUS_MODES,
- g_param_spec_variant ("supported-focus-modes", "Supported focus modes",
- "Supported focus modes", G_VARIANT_TYPE_VARIANT, NULL,
- G_PARAM_READABLE));
-
- g_object_class_install_property (gobject_class, PROP_SUPPORTED_ISO_SPEEDS,
- g_param_spec_variant ("supported-iso-speeds", "Supported ISO speeds",
- "Supported ISO speeds", G_VARIANT_TYPE_VARIANT, NULL,
- G_PARAM_READABLE));
-
gst_droidcamsrc_photography_add_overrides (gobject_class);
/* Signals */
@@ -1754,8 +1723,8 @@
vid = g_strdup_printf ("%ix%i", info.width, info.height);
gchar *key =
- src->dev->params->
- has_separate_video_size_values ? "video-size" : "preview-size";
+ 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.
|
|
[-]
[+]
|
Changed |
_service:tar_git:gstreamer1.0-droid-0.20181128.0.tar.gz/gst/droidcamsrc/gstdroidcamsrcphotography.c
^
|
| @@ -147,8 +147,7 @@
{GST_PHOTOGRAPHY_SCENE_MODE_LANDSCAPE, "landscape"},
{GST_PHOTOGRAPHY_SCENE_MODE_SPORT, "sports"},
{GST_PHOTOGRAPHY_SCENE_MODE_NIGHT, "night"},
- {GST_PHOTOGRAPHY_SCENE_MODE_MANUAL, "auto"},
- {GST_PHOTOGRAPHY_SCENE_MODE_AUTO, "asd"},
+ {GST_PHOTOGRAPHY_SCENE_MODE_AUTO, "auto"},
{GST_PHOTOGRAPHY_SCENE_MODE_ACTION, "action"},
{GST_PHOTOGRAPHY_SCENE_MODE_NIGHT_PORTRAIT, "night-portrait"},
{GST_PHOTOGRAPHY_SCENE_MODE_THEATRE, "theatre"},
@@ -327,31 +326,6 @@
capture_caps, user_data);
}
-GVariant *
-gst_droid_camsrc_glist_to_array (GList * list)
-{
- int len = g_list_length (list);
-
- if (len == 0) {
- return 0;
- }
-
- GVariant *modes;
- GVariantBuilder *builder;
- builder = g_variant_builder_new (G_VARIANT_TYPE ("ai"));
-
- struct DataEntry *entry;
- GList *l;
- for (l = list; l != NULL; l = l->next) {
- entry = l->data;
- g_variant_builder_add (builder, "i", entry->key);
- }
-
- modes = g_variant_new ("ai", builder);
- g_variant_builder_unref (builder);
- return modes;
-}
-
static void
gst_droidcamsrc_photography_set_autofocus (GstPhotography * photo, gboolean on)
{
@@ -635,49 +609,24 @@
return TRUE;
- case PROP_SUPPORTED_WB_MODES:
- {
- GVariant *wb_modes = gst_droid_camsrc_glist_to_array (src->photo->wb);
- g_value_set_variant (value, wb_modes);
- }
- return TRUE;
-
- case PROP_SUPPORTED_COLOR_TONES:
- {
- GVariant *effects =
- gst_droid_camsrc_glist_to_array (src->photo->color_tone);
- g_value_set_variant (value, effects);
- }
- return TRUE;
-
- case PROP_SUPPORTED_SCENE_MODES:
+ case PROP_SUPPORTED_EXPOSURE_MODES:
{
- GVariant *exposure_modes =
- gst_droid_camsrc_glist_to_array (src->photo->scene);
- g_value_set_variant (value, exposure_modes);
- }
- return TRUE;
+ int len = g_list_length (src->photo->scene);
+ if (len == 0) {
+ GST_WARNING_OBJECT (src, "params for scene not yet available.");
+ return TRUE;
+ }
- case PROP_SUPPORTED_FLASH_MODES:
- {
- GVariant *flash_modes =
- gst_droid_camsrc_glist_to_array (src->photo->flash);
- g_value_set_variant (value, flash_modes);
- }
- return TRUE;
+ struct DataEntry *entry;
- case PROP_SUPPORTED_FOCUS_MODES:
- {
- GVariant *focus_modes =
- gst_droid_camsrc_glist_to_array (src->photo->focus);
- g_value_set_variant (value, focus_modes);
- }
- return TRUE;
+ GList *l;
+ gchar *modes = "";
+ for (l = src->photo->scene; l != NULL; l = l->next) {
+ entry = l->data;
+ modes = g_strconcat (modes, ",", entry->value, NULL);
+ }
- case PROP_SUPPORTED_ISO_SPEEDS:
- {
- GVariant *iso_modes = gst_droid_camsrc_glist_to_array (src->photo->iso);
- g_value_set_variant (value, iso_modes);
+ g_value_set_string (value, modes);
}
return TRUE;
}
@@ -796,7 +745,7 @@
src->photo = g_slice_new0 (GstDroidCamSrcPhotography);
src->photo->settings.wb_mode = GST_PHOTOGRAPHY_WB_MODE_AUTO;
src->photo->settings.tone_mode = GST_PHOTOGRAPHY_COLOR_TONE_MODE_NORMAL;
- src->photo->settings.scene_mode = GST_PHOTOGRAPHY_SCENE_MODE_MANUAL;
+ src->photo->settings.scene_mode = GST_PHOTOGRAPHY_SCENE_MODE_AUTO;
src->photo->settings.flash_mode = GST_PHOTOGRAPHY_FLASH_MODE_AUTO;
src->photo->settings.ev_compensation = 0.0;
src->photo->settings.iso_speed = 0;
|
|
[-]
[+]
|
Changed |
_service:tar_git:gstreamer1.0-droid-0.20181128.0.tar.gz/gst/droidcamsrc/gstdroidcamsrcphotography.h
^
|
| @@ -47,12 +47,6 @@
PROP_SENSOR_ORIENTATION,
PROP_SENSOR_MOUNT_ANGLE,
PROP_TARGET_BITRATE,
- PROP_SUPPORTED_WB_MODES,
- PROP_SUPPORTED_COLOR_TONES,
- PROP_SUPPORTED_SCENE_MODES,
- PROP_SUPPORTED_FLASH_MODES,
- PROP_SUPPORTED_FOCUS_MODES,
- PROP_SUPPORTED_ISO_SPEEDS,
/* photography interface */
PROP_WB_MODE,
@@ -76,7 +70,8 @@
PROP_MIN_EXPOSURE_TIME,
PROP_MAX_EXPOSURE_TIME,
PROP_NOISE_REDUCTION,
- PROP_EXPOSURE_MODE
+ PROP_EXPOSURE_MODE,
+ PROP_SUPPORTED_EXPOSURE_MODES
} GstDroidCamSrcProperties;
void gst_droidcamsrc_photography_register (gpointer g_iface, gpointer iface_data);
|
|
[-]
[+]
|
Changed |
_service:tar_git:gstreamer1.0-droid-0.20181128.0.tar.gz/tools/gstdroidcamsrcconf.c
^
|
| @@ -84,13 +84,13 @@
{NULL, -1}
}},
{"scene-mode-values", "scene-mode", {
- ADD_ENTRY (GST_PHOTOGRAPHY_SCENE_MODE_MANUAL, "auto"),
+ ADD_ENTRY (GST_PHOTOGRAPHY_SCENE_MODE_MANUAL, NULL),
ADD_ENTRY (GST_PHOTOGRAPHY_SCENE_MODE_CLOSEUP, NULL),
ADD_ENTRY (GST_PHOTOGRAPHY_SCENE_MODE_PORTRAIT, "portrait"),
ADD_ENTRY (GST_PHOTOGRAPHY_SCENE_MODE_LANDSCAPE, "landscape"),
ADD_ENTRY (GST_PHOTOGRAPHY_SCENE_MODE_SPORT, "sports"),
ADD_ENTRY (GST_PHOTOGRAPHY_SCENE_MODE_NIGHT, "night"),
- ADD_ENTRY (GST_PHOTOGRAPHY_SCENE_MODE_AUTO, "asd"),
+ ADD_ENTRY (GST_PHOTOGRAPHY_SCENE_MODE_AUTO, "auto"),
ADD_ENTRY (GST_PHOTOGRAPHY_SCENE_MODE_ACTION, "action"),
ADD_ENTRY (GST_PHOTOGRAPHY_SCENE_MODE_NIGHT_PORTRAIT, "night-portrait"),
ADD_ENTRY (GST_PHOTOGRAPHY_SCENE_MODE_THEATRE, "theatre"),
@@ -102,10 +102,6 @@
ADD_ENTRY (GST_PHOTOGRAPHY_SCENE_MODE_PARTY, "party"),
ADD_ENTRY (GST_PHOTOGRAPHY_SCENE_MODE_CANDLELIGHT, "candlelight"),
ADD_ENTRY (GST_PHOTOGRAPHY_SCENE_MODE_BARCODE, "barcode"),
- ADD_ENTRY (GST_PHOTOGRAPHY_SCENE_MODE_BACKLIGHT, "backlight"),
- ADD_ENTRY (GST_PHOTOGRAPHY_SCENE_MODE_FLOWERS, "flowers"),
- ADD_ENTRY (GST_PHOTOGRAPHY_SCENE_MODE_AR, "AR"),
- ADD_ENTRY (GST_PHOTOGRAPHY_SCENE_MODE_HDR, "hdr"),
{NULL, -1}
}},
{"effect-values", "color-tone-mode", {
@@ -125,9 +121,6 @@
ADD_ENTRY (GST_PHOTOGRAPHY_COLOR_TONE_MODE_WHITEBOARD, "whiteboard"),
ADD_ENTRY (GST_PHOTOGRAPHY_COLOR_TONE_MODE_BLACKBOARD, "blackboard"),
ADD_ENTRY (GST_PHOTOGRAPHY_COLOR_TONE_MODE_AQUA, "aqua"),
- ADD_ENTRY (GST_PHOTOGRAPHY_COLOR_TONE_MODE_EMBOSS, "emboss"),
- ADD_ENTRY (GST_PHOTOGRAPHY_COLOR_TONE_MODE_SKETCH, "sketch"),
- ADD_ENTRY (GST_PHOTOGRAPHY_COLOR_TONE_MODE_NEON, "neon"),
{NULL, -1}
}},
// Qualcomm ISO values (e.g. ISO100) and Intel (iso-100)
|
