[-]
[+]
|
Changed |
_service:tar_git:gstreamer1.0-droid.changes
|
|
[-]
[+]
|
Changed |
_service:tar_git:gst-droid.spec
^
|
|
[-]
[+]
|
Changed |
_service
^
|
@@ -2,6 +2,6 @@
<service name="tar_git">
<param name="url">https://github.com/sailfishos/gst-droid.git</param>
<param name="branch">master</param>
- <param name="revision">HEAD</param>
+ <param name="revision">a6ff1ba94af70125e979d3401d6e3e806a3792a4</param>
</service>
</services>
\ No newline at end of file
|
[-]
[+]
|
Changed |
_service:tar_git:gstreamer1.0-droid-0.20170120.1.tar.gz/Makefile.am
^
|
@@ -1,8 +1,3 @@
SUBDIRS = common gst-libs gst tools
-EXTRA_DIST = autogen.sh \
- gstreamer-droid-1.0.pc.in \
- gstreamer-droid-1.0.pc
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = gstreamer-droid-1.0.pc
+EXTRA_DIST = autogen.sh
|
[-]
[+]
|
Changed |
_service:tar_git:gstreamer1.0-droid-0.20170120.1.tar.gz/configure.ac
^
|
@@ -167,7 +167,6 @@
[GStreamer API Version])
AC_CONFIG_FILES([Makefile
- gstreamer-droid-1.0.pc
common/Makefile
common/m4/Makefile
gst-libs/Makefile
|
[-]
[+]
|
Changed |
_service:tar_git:gstreamer1.0-droid-0.20170120.1.tar.gz/gst-libs/gst/droid/gstdroidcodec.c
^
|
@@ -31,7 +31,7 @@
#endif /* GST_USE_UNSTABLE_API */
#include <gst/codecparsers/gsth264parser.h>
-GST_DEBUG_CATEGORY (gst_droid_codec_debug);
+GST_DEBUG_CATEGORY_EXTERN (gst_droid_codec_debug);
#define GST_CAT_DEFAULT gst_droid_codec_debug
static GstBuffer *create_mpeg4venc_codec_data (DroidMediaData * data);
@@ -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", TRUE, NULL, NULL, NULL, NULL,
+ "video/x-vp8", FALSE, NULL, NULL, NULL, NULL,
create_vp8vdec_codec_data_from_codec_data, NULL, NULL},
/* audio encoders */
@@ -1104,14 +1104,11 @@
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;
} else if (!g_strcmp0 (quirks_string[x], USE_CODEC_SUPPLIED_WIDTH_NAME)) {
codec->quirks |= USE_CODEC_SUPPLIED_WIDTH_VALUE;
- } else if (!g_strcmp0 (quirks_string[x], DONT_USE_DROID_CONVERT_NAME)) {
- codec->quirks |= DONT_USE_DROID_CONVERT_VALUE;
}
}
|
[-]
[+]
|
Changed |
_service:tar_git:gstreamer1.0-droid-0.20170120.1.tar.gz/gst-libs/gst/droid/gstdroidcodec.h
^
|
@@ -35,9 +35,6 @@
#define USE_CODEC_SUPPLIED_WIDTH_NAME "use-codec-supplied-width"
#define USE_CODEC_SUPPLIED_WIDTH_VALUE 0x2
-#define DONT_USE_DROID_CONVERT_NAME "dont-use-droid-convert"
-#define DONT_USE_DROID_CONVERT_VALUE 0x4
-
typedef struct _GstDroidCodec GstDroidCodec;
typedef struct _GstDroidCodecInfo GstDroidCodecInfo;
typedef struct _GstDroidCodecPrivate GstDroidCodecPrivate;
|
[-]
[+]
|
Changed |
_service:tar_git:gstreamer1.0-droid-0.20170120.1.tar.gz/gst-libs/gst/droid/gstdroidmediabuffer.h
^
|
@@ -23,7 +23,7 @@
#include <gst/gst.h>
#include <gst/video/video.h>
-#include <droidmedia/droidmedia.h>
+#include "droidmedia.h"
G_BEGIN_DECLS
|
[-]
[+]
|
Changed |
_service:tar_git:gstreamer1.0-droid-0.20170120.1.tar.gz/gst/droidcamsrc/gstdroidcamsrc.c
^
|
@@ -481,7 +481,8 @@
}
if (num > MAX_CAMERAS) {
- GST_WARNING_OBJECT (src, "cannot support %d cameras", num);
+ GST_ERROR_OBJECT (src, "cannot support %d cameras", num);
+ return FALSE;
}
src->info[0].num = src->info[1].num = -1;
@@ -1614,7 +1615,9 @@
our_caps = gst_caps_make_writable (our_caps);
our_caps = gst_droidcamsrc_pick_largest_resolution (src, our_caps);
- gst_droidcamsrc_params_choose_image_framerate (src->dev->params, our_caps);
+
+ /* imgsrc frame rate is not really important so we will just set it to 30 */
+ gst_caps_set_simple (our_caps, "framerate", G_TYPE_INT, 30, NULL);
if (!gst_pad_set_caps (data->pad, our_caps)) {
GST_ERROR_OBJECT (src, "failed to set caps");
@@ -1709,10 +1712,7 @@
}
vid = g_strdup_printf ("%ix%i", info.width, info.height);
- gchar *key =
- src->dev->
- params->has_separate_video_size_values ? "video-size" : "preview-size";
- gst_droidcamsrc_params_set_string (src->dev->params, key, vid);
+ gst_droidcamsrc_params_set_string (src->dev->params, "video-size", 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.20170120.1.tar.gz/gst/droidcamsrc/gstdroidcamsrcparams.c
^
|
@@ -51,12 +51,6 @@
g_strfreev (parts);
}
-gboolean
-gst_droidcamsrc_has_param (GstDroidCamSrcParams * params, const char *key)
-{
- return g_hash_table_contains (params->params, key);
-}
-
static int
gst_droidcamsrc_params_get_int_locked (GstDroidCamSrcParams * params,
const char *key)
@@ -201,8 +195,6 @@
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 *
@@ -397,14 +389,8 @@
GstCaps *caps;
g_mutex_lock (¶ms->lock);
-
- gchar *key =
- params->has_separate_video_size_values ? "video-size-values" :
- "preview-size-values";
-
- caps = gst_droidcamsrc_params_get_caps_locked (params, key,
+ caps = gst_droidcamsrc_params_get_caps_locked (params, "video-size-values",
"video/x-raw", GST_CAPS_FEATURE_MEMORY_DROID_VIDEO_META_DATA, "YV12");
-
g_mutex_unlock (¶ms->lock);
return caps;
@@ -491,8 +477,17 @@
gst_caps_unref (c);
- /* the fps we have is valid. Select it if higher than our current target, or wider */
- if (max > target_max || max == target_max && min < target_min) {
+ /* the fps we have is valid. We are trying to pick the widest range */
+ if (target_min == -1) {
+ target_min = min;
+ }
+
+ if (target_max == -1) {
+ target_max = max;
+ }
+
+ if (min <= target_min && max >= target_max) {
+ /* we need to pick the widest range */
target_min = min;
target_max = max;
}
@@ -542,8 +537,17 @@
gst_caps_unref (c);
- /* the fps we have is valid. Select it if higher than our current target, or narrower */
- if (max > target_max || max == target_max && min > target_min) {
+ /* the fps we have is valid. We are trying to pick the widest range */
+ if (target_min == -1) {
+ target_min = min;
+ }
+
+ if (target_max == -1) {
+ target_max = max;
+ }
+
+ if (min >= target_min && max <= target_max) {
+ /* we need to pick the narrowest range */
target_min = min;
target_max = max;
}
|
[-]
[+]
|
Changed |
_service:tar_git:gstreamer1.0-droid-0.20170120.1.tar.gz/gst/droidcamsrc/gstdroidcamsrcparams.h
^
|
@@ -32,13 +32,11 @@
GHashTable *params;
gboolean is_dirty;
GArray *min_fps_range, *max_fps_range;
- gboolean has_separate_video_size_values;
GMutex lock;
};
GstDroidCamSrcParams * gst_droidcamsrc_params_new (const gchar * params);
void gst_droidcamsrc_params_destroy (GstDroidCamSrcParams *params);
-gboolean gst_droidcamsrc_has_param (GstDroidCamSrcParams * params, const char *key);
void gst_droidcamsrc_params_reload (GstDroidCamSrcParams *params, const gchar * str);
gchar *gst_droidcamsrc_params_to_string (GstDroidCamSrcParams *params);
@@ -48,7 +46,8 @@
GstCaps *gst_droidcamsrc_params_get_video_caps (GstDroidCamSrcParams *params);
GstCaps *gst_droidcamsrc_params_get_image_caps (GstDroidCamSrcParams *params);
-void gst_droidcamsrc_params_set_string (GstDroidCamSrcParams *params, const gchar *key, const gchar *value);
+void gst_droidcamsrc_params_set_string (GstDroidCamSrcParams *params, const gchar *key,
+ const gchar *value);
const gchar *gst_droidcamsrc_params_get_string (GstDroidCamSrcParams * params, const char *key);
int gst_droidcamsrc_params_get_int (GstDroidCamSrcParams * params, const char *key);
float gst_droidcamsrc_params_get_float (GstDroidCamSrcParams * params, const char *key);
|
[-]
[+]
|
Changed |
_service:tar_git:gstreamer1.0-droid-0.20170120.1.tar.gz/gst/droidcamsrc/gstdroidcamsrcphotography.c
^
|
@@ -76,7 +76,6 @@
GList *scene;
GList *wb;
GList *iso;
- gchar *iso_key;
GList *flicker;
};
@@ -808,8 +807,6 @@
}
}
- g_strfreev(keys);
-
return list;
}
@@ -1043,25 +1040,12 @@
GST_WARNING_OBJECT (src, "setting iso to %d is not supported", iso_speed);
return FALSE;
}
- // find iso param key if not set
- if (src->photo->iso_key == NULL) {
- if (src->dev == NULL || src->dev->params == NULL) {
- GST_WARNING_OBJECT (src, "Params are NULL! Cannot find iso param key.");
- return FALSE;
- }
- if (gst_droidcamsrc_has_param (src->dev->params, "iso")) {
- src->photo->iso_key = "iso";
- } else if (gst_droidcamsrc_has_param (src->dev->params, "iso-speed")) {
- src->photo->iso_key = "iso-speed";
- } else {
- GST_WARNING_OBJECT (src, "ISO setting param key not found. Cannot set");
- return FALSE;
- }
- }
+
GST_OBJECT_LOCK (src);
src->photo->settings.iso_speed = iso_speed;
GST_OBJECT_UNLOCK (src);
- return gst_droidcamsrc_set_and_apply (src, src->photo->iso_key, value);
+
+ return gst_droidcamsrc_set_and_apply (src, "iso", value);
}
static gboolean
@@ -1422,23 +1406,8 @@
src->photo->settings.iso_speed);
return;
}
- // find iso param key if not set
- if (src->photo->iso_key == NULL) {
- if (src->dev == NULL || src->dev->params == NULL) {
- GST_WARNING_OBJECT (src, "Params are NULL! Cannot find iso param key.");
- return FALSE;
- }
- if (gst_droidcamsrc_has_param (src->dev->params, "iso")) {
- src->photo->iso_key = "iso";
- } else if (gst_droidcamsrc_has_param (src->dev->params, "iso-speed")) {
- src->photo->iso_key = "iso-speed";
- } else {
- GST_WARNING_OBJECT (src, "ISO setting param key not found. Cannot set");
- return FALSE;
- }
- }
- gst_droidcamsrc_params_set_string (src->dev->params, src->photo->iso_key,
- value);
+
+ gst_droidcamsrc_params_set_string (src->dev->params, "iso", value);
}
static void
|
[-]
[+]
|
Changed |
_service:tar_git:gstreamer1.0-droid-0.20170120.1.tar.gz/gst/droidcamsrc/gstdroidcamsrcrecorder.c
^
|
@@ -67,6 +67,9 @@
recorder->md.bitrate = target_bitrate;
+ /* set the color format */
+ recorder->md.color_format = droid_media_camera_get_video_color_format (cam);
+
recorder->recorder = droid_media_recorder_create (cam, &recorder->md);
if (!recorder->recorder) {
@@ -85,10 +88,6 @@
gst_droidcamsrc_recorder_update_vid (GstDroidCamSrcRecorder * recorder,
GstVideoInfo * info, GstCaps * caps)
{
- if (recorder->codec) {
- gst_droid_codec_unref (recorder->codec);
- }
-
recorder->codec =
gst_droid_codec_new_from_caps (caps, GST_DROID_CODEC_ENCODER_VIDEO);
recorder->md.parent.width = info->width;
|
[-]
[+]
|
Changed |
_service:tar_git:gstreamer1.0-droid-0.20170120.1.tar.gz/gst/droidcodec/gstdroidaenc.c
^
|
@@ -115,14 +115,6 @@
md.max_input_size = info.bpf * enc->rate;
enc->codec = droid_media_codec_create_encoder (&md);
- // Reset timestamp clock
- GstClock *clock = GST_ELEMENT_CLOCK (enc);
- if (clock) {
- gst_object_ref (clock);
- GST_ELEMENT_CAST (enc)->base_time = gst_clock_get_time (clock);
- gst_object_unref (clock);
- }
-
if (!enc->codec) {
GST_ELEMENT_ERROR (enc, LIBRARY, SETTINGS, NULL,
("Failed to create encoder"));
@@ -515,23 +507,8 @@
data.data.size = info.size;
data.data.data = g_malloc (info.size);
data.sync = false;
+ data.ts = GST_TIME_AS_USECONDS (buffer->pts);
-/* Check if the buffer has a valid timestamp, and if not then set it from the
- * encoder's clock, as some versions of libstagefright throw away frames if
- * it doesn't increase
- */
- GstClockTime ts = GST_BUFFER_TIMESTAMP (buffer);
- if (!GST_CLOCK_TIME_IS_VALID (ts)) {
- GST_DEBUG_OBJECT (enc, "Replacing invalid timestamp: %" GST_TIME_FORMAT,
- GST_TIME_ARGS (ts));
- GstClock *clock = gst_element_get_clock (enc);
- if (clock) {
- ts = gst_clock_get_time (clock) - GST_ELEMENT_CAST (enc)->base_time;
- GST_DEBUG_OBJECT (enc, "New timestamp: %" GST_TIME_FORMAT,
- GST_TIME_ARGS (ts));
- }
- }
- data.ts = GST_TIME_AS_USECONDS (ts);
memcpy (data.data.data, info.data, info.size);
gst_buffer_unmap (buffer, &info);
|
[-]
[+]
|
Changed |
_service:tar_git:gstreamer1.0-droid-0.20170120.1.tar.gz/gst/droidcodec/gstdroidvdec.c
^
|
@@ -27,7 +27,6 @@
#include "gst/droid/gstdroidmediabuffer.h"
#include "gst/droid/gstdroidbufferpool.h"
#include "plugin.h"
-#include "droidmediaconstants.h"
#include <EGL/egl.h>
#include <EGL/eglext.h>
#include <string.h> /* memset() */
@@ -216,39 +215,6 @@
GST_FIXME ("Not sure what to do here really");
}
-static void
-gst_droidvec_copy_plane (guint8 * out, gint stride_out, guint8 * in,
- gint stride_in, gint width, gint height)
-{
- int i;
- for (i = 0; i < height; i++) {
- orc_memcpy (out, in, width);
- out += stride_out;
- in += stride_in;
- }
-}
-
-static void
-gst_droidvec_copy_packed_planes (guint8 * out0, guint8 * out1, gint stride_out,
- guint8 * in, gint stride_in, gint width, gint height)
-{
- int x, y;
- for (y = 0; y < height; y++) {
- guint8 *row = in;
- for (x = 0; x < width; x++) {
- out0[x] = row[0];
- out1[x] = row[1];
- row += 2;
- }
-
- out0 += stride_out;
- out1 += stride_out;
- in += stride_in;
- }
-}
-
-#define ALIGN_SIZE(size, to) (((size) + to - 1) & ~(to - 1))
-
static gboolean
gst_droidvdec_convert_buffer (GstDroidVDec * dec,
GstBuffer * out, DroidMediaData * in, GstVideoInfo * info)
@@ -256,7 +222,6 @@
gsize height = info->height;
gsize width = info->width;
gsize size;
- gboolean use_droid_convert;
gboolean use_external_buffer;
guint8 *data = NULL;
gboolean ret;
@@ -266,7 +231,7 @@
if (dec->codec_type->quirks & USE_CODEC_SUPPLIED_WIDTH_VALUE) {
width = dec->codec_reported_width;
- GST_INFO_OBJECT (dec, "using codec supplied width %d", width);
+ GST_INFO_OBJECT (dec, "using codec supplied width %d", height);
}
if (dec->codec_type->quirks & USE_CODEC_SUPPLIED_HEIGHT_VALUE) {
@@ -275,137 +240,60 @@
}
size = width * height * 3 / 2;
- use_droid_convert = dec->convert;
- use_external_buffer = use_droid_convert && gst_buffer_get_size (out) != size;
+ use_external_buffer = gst_buffer_get_size (out) != size;
map_info.data = NULL;
- if (dec->codec_type->quirks & DONT_USE_DROID_CONVERT_VALUE) {
- use_droid_convert = false;
- GST_INFO_OBJECT (dec, "not using droid convert binary");
- }
-
if (!gst_buffer_map (out, &map_info, GST_MAP_WRITE)) {
GST_ERROR_OBJECT (dec, "failed to map buffer");
ret = FALSE;
goto out;
}
- if (use_droid_convert) {
- if (use_external_buffer) {
- GST_DEBUG_OBJECT (dec, "using an external buffer for I420 conversion.");
- data = g_malloc (size);
- } else {
- data = map_info.data;
- }
+ if (use_external_buffer) {
+ GST_DEBUG_OBJECT (dec, "using an external buffer for I420 conversion.");
+ data = g_malloc (size);
+ } else {
+ data = map_info.data;
+ }
- if (droid_media_convert_to_i420 (dec->convert, in, data) != true) {
- GST_ELEMENT_ERROR (dec, LIBRARY, FAILED, (NULL),
- ("failed to convert frame"));
+ if (droid_media_convert_to_i420 (dec->convert, in, data) != true) {
+ GST_ELEMENT_ERROR (dec, LIBRARY, FAILED, (NULL),
+ ("failed to convert frame"));
- ret = FALSE;
- goto out;
- }
+ ret = FALSE;
+ goto out;
+ }
- if (use_external_buffer) {
- /* fix up the buffer */
- /* Code is based on gst-colorconv qcom backend */
-
- gint stride = GST_VIDEO_INFO_COMP_STRIDE (info, 0);
- gint strideUV = GST_VIDEO_INFO_COMP_STRIDE (info, 1);
- guint8 *p = data;
- guint8 *dst = map_info.data;
- int i;
- int x;
-
- /* Y */
- for (i = 0; i < info->height; i++) {
- orc_memcpy (dst, p, info->width);
- dst += stride;
- p += width;
+ if (use_external_buffer) {
+ /* fix up the buffer */
+ /* Code is based on gst-colorconv qcom backend */
+
+ gint stride = GST_VIDEO_INFO_COMP_STRIDE (info, 0);
+ gint strideUV = GST_VIDEO_INFO_COMP_STRIDE (info, 1);
+ guint8 *p = data;
+ guint8 *dst = map_info.data;
+ int i;
+ int x;
+
+ /* Y */
+ for (i = 0; i < info->height; i++) {
+ orc_memcpy (dst, p, info->width);
+ dst += stride;
+ p += width;
+ }
+
+ /* NOP if height == info->height */
+ p += (height - info->height) * width;
+ /* U and V */
+ for (x = 0; x < 2; x++) {
+ for (i = 0; i < info->height / 2; i++) {
+ orc_memcpy (dst, p, info->width / 2);
+ dst += strideUV;
+ p += width / 2;
}
/* NOP if height == info->height */
- p += (height - info->height) * width;
- /* U and V */
- for (x = 0; x < 2; x++) {
- for (i = 0; i < info->height / 2; i++) {
- orc_memcpy (dst, p, info->width / 2);
- dst += strideUV;
- p += width / 2;
- }
-
- /* NOP if height == info->height */
- p += (height - info->height) / 2 * width / 2;
- }
- }
- } else {
- DroidMediaColourFormatConstants c;
- droid_media_colour_format_constants_init (&c);
- if (dec->hal_format == c.OMX_COLOR_FormatYUV420Planar) {
- /* Buffer is already I420, so we can copy it straight over */
- /* though we need to handle the cropping */
-
- GST_DEBUG_OBJECT (dec, "Copying I420 buffer");
- gint top = dec->crop_rect.top;
- gint left = dec->crop_rect.left;
- gint crop_width = dec->crop_rect.right - left;
- gint crop_height = dec->crop_rect.bottom - top;
-
- guint8 *y = in->data + (top * width) + left;
- guint8 *u = in->data + (width * height) + (top * width / 2) + (left / 2);
- guint8 *v =
- in->data + (width * height) + (width * height / 4) +
- (top * width / 2) + (left / 2);
-
- gst_droidvec_copy_plane (map_info.data + info->offset[0],
- info->stride[0], y, width, crop_width, crop_height);
- gst_droidvec_copy_plane (map_info.data + info->offset[1],
- info->stride[1], u, width / 2, crop_width / 2, crop_height / 2);
- gst_droidvec_copy_plane (map_info.data + info->offset[2],
- info->stride[2], v, width / 2, crop_width / 2, crop_height / 2);
-
- } else if (dec->hal_format == c.QOMX_COLOR_FormatYUV420PackedSemiPlanar32m) {
- /* copy to the output buffer swapping the u and v planes and cropping if necessary */
- /* NV12 format with 128 byte alignment */
|
[-]
[+]
|
Changed |
_service:tar_git:gstreamer1.0-droid-0.20170120.1.tar.gz/gst/droidcodec/gstdroidvdec.h
^
|
@@ -81,7 +81,6 @@
GstVideoCodecState *in_state;
GstVideoCodecState *out_state;
DroidMediaConvert *convert;
- gint32 hal_format;
};
struct _GstDroidVDecClass
|
[-]
[+]
|
Changed |
_service:tar_git:gstreamer1.0-droid-0.20170120.1.tar.gz/tools/gstdroidcamsrcconf.c
^
|
@@ -56,7 +56,6 @@
ADD_ENTRY (GST_PHOTOGRAPHY_FLASH_MODE_AUTO, "auto"),
ADD_ENTRY (GST_PHOTOGRAPHY_FLASH_MODE_OFF, "off"),
ADD_ENTRY (GST_PHOTOGRAPHY_FLASH_MODE_ON, "on"),
- ADD_ENTRY (GST_PHOTOGRAPHY_FLASH_MODE_RED_EYE, "red-eye"),
{NULL, -1}
}},
{"focus-mode-values", "focus-mode", {
@@ -68,19 +67,19 @@
ADD_ENTRY (GST_PHOTOGRAPHY_FOCUS_MODE_EXTENDED, "edof"),
ADD_ENTRY (GST_PHOTOGRAPHY_FOCUS_MODE_CONTINUOUS_NORMAL, "continuous"),
ADD_ENTRY (GST_PHOTOGRAPHY_FOCUS_MODE_CONTINUOUS_EXTENDED, "continuous"),
- ADD_ENTRY (GST_PHOTOGRAPHY_FOCUS_MODE_MANUAL, "manual"),
+ ADD_ENTRY (GST_PHOTOGRAPHY_FOCUS_MODE_MANUAL, NULL),
{NULL, -1}
}},
{"whitebalance-values", "white-balance-mode", {
ADD_ENTRY (GST_PHOTOGRAPHY_WB_MODE_AUTO, "auto"),
ADD_ENTRY (GST_PHOTOGRAPHY_WB_MODE_DAYLIGHT, "daylight"),
ADD_ENTRY (GST_PHOTOGRAPHY_WB_MODE_CLOUDY, "cloudy-daylight"),
- ADD_ENTRY (GST_PHOTOGRAPHY_WB_MODE_SUNSET, "twilight"),
+ ADD_ENTRY (GST_PHOTOGRAPHY_WB_MODE_SUNSET, NULL),
ADD_ENTRY (GST_PHOTOGRAPHY_WB_MODE_TUNGSTEN, "incandescent"),
ADD_ENTRY (GST_PHOTOGRAPHY_WB_MODE_FLUORESCENT, "fluorescent"),
ADD_ENTRY (GST_PHOTOGRAPHY_WB_MODE_MANUAL, NULL),
- ADD_ENTRY (GST_PHOTOGRAPHY_WB_MODE_WARM_FLUORESCENT, "warm-fluorescent"),
- ADD_ENTRY (GST_PHOTOGRAPHY_WB_MODE_SHADE, "shade"),
+ ADD_ENTRY (GST_PHOTOGRAPHY_WB_MODE_WARM_FLUORESCENT, NULL),
+ ADD_ENTRY (GST_PHOTOGRAPHY_WB_MODE_SHADE, NULL),
{NULL, -1}
}},
{"scene-mode-values", "scene-mode", {
@@ -123,7 +122,6 @@
ADD_ENTRY (GST_PHOTOGRAPHY_COLOR_TONE_MODE_AQUA, "aqua"),
{NULL, -1}
}},
- // Qualcomm ISO values (e.g. ISO100) and Intel (iso-100)
{"iso-values", "iso-speed", {
ADD_ENTRY (0, "auto"),
ADD_ENTRY (0, "iso-auto"),
@@ -139,16 +137,6 @@
ADD_ENTRY (3200, "ISO3200"),
{NULL, -1}
}},
- // Mediatek ISO values
- {"iso-speed-values", "iso-speed", {
- ADD_ENTRY (0, "auto"),
- ADD_ENTRY (100, "100"),
- ADD_ENTRY (200, "200"),
- ADD_ENTRY (400, "400"),
- ADD_ENTRY (800, "800"),
- ADD_ENTRY (1600, "1600"),
- {NULL, -1}
- }},
{"antibanding-values", "flicker-mode", {
ADD_ENTRY (GST_PHOTOGRAPHY_FLICKER_REDUCTION_OFF, "off"),
ADD_ENTRY (GST_PHOTOGRAPHY_FLICKER_REDUCTION_50HZ, "50hz"),
|
[-]
[+]
|
Deleted |
_service:tar_git:gstreamer1.0-droid-0.20180924.0.tar.gz/gstreamer-droid-1.0.pc.in
^
|
@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@/gstreamer-1.0
-
-Name: GstDroid library
-Description: GstDroid library
-Requires: gstreamer-1.0 gstreamer-base-1.0 android-headers
-Version: @VERSION@
-Libs: -L${libdir} -lgstdroid-1.0
-Cflags: -I${includedir}
|