Commit 2b4a173e authored by Nicolas Dufresne's avatar Nicolas Dufresne

rawvideoparse: Use GstValueArray for strides and offsets

This allow using those property through gst-launch-1.0. This type
gained a deserilizer recently. The syntax is: <val1, val2, ...>.
Note that we also use the type int instead of uint to avoid having
to cast when specifying the values. The deserilizers assume
int by default.

https://bugzilla.gnome.org/show_bug.cgi?id=780053
parent 6749e81c
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
* *
* If the properties configuration is used, plane strides and offsets will be * If the properties configuration is used, plane strides and offsets will be
* computed by using gst_video_info_set_format(). This can be overridden by passing * computed by using gst_video_info_set_format(). This can be overridden by passing
* GValueArrays to the plane-offsets and plane-strides properties. When this is * GstValueArrays to the plane-offsets and plane-strides properties. When this is
* done, these custom offsets and strides are used later even if new width, * done, these custom offsets and strides are used later even if new width,
* height, format etc. property values might be set. To switch back to computed * height, format etc. property values might be set. To switch back to computed
* plane strides & offsets, pass NULL to one or both of the plane-offset and * plane strides & offsets, pass NULL to one or both of the plane-offset and
...@@ -80,10 +80,6 @@ ...@@ -80,10 +80,6 @@
# include "config.h" # include "config.h"
#endif #endif
/* FIXME: GValueArray is deprecated, but there is currently no viabla alternative
* See https://bugzilla.gnome.org/show_bug.cgi?id=667228 */
#define GLIB_DISABLE_DEPRECATION_WARNINGS
#include <string.h> #include <string.h>
#include "gstrawvideoparse.h" #include "gstrawvideoparse.h"
#include "unalignedvideo.h" #include "unalignedvideo.h"
...@@ -292,26 +288,26 @@ gst_raw_video_parse_class_init (GstRawVideoParseClass * klass) ...@@ -292,26 +288,26 @@ gst_raw_video_parse_class_init (GstRawVideoParseClass * klass)
); );
g_object_class_install_property (object_class, g_object_class_install_property (object_class,
PROP_PLANE_STRIDES, PROP_PLANE_STRIDES,
g_param_spec_value_array ("plane-strides", gst_param_spec_array ("plane-strides",
"Plane strides", "Plane strides",
"Strides of the planes in bytes", "Strides of the planes in bytes (e.g. plane-strides=\"<320,320>\")",
g_param_spec_uint ("plane-stride", g_param_spec_int ("plane-stride",
"Plane stride", "Plane stride",
"Stride of the n-th plane in bytes (0 = stride equals width*bytes-per-pixel)", "Stride of the n-th plane in bytes (0 = stride equals width*bytes-per-pixel)",
0, G_MAXUINT, 0, G_MAXINT,
0, 0,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS), G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS),
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)
); );
g_object_class_install_property (object_class, g_object_class_install_property (object_class,
PROP_PLANE_OFFSETS, PROP_PLANE_OFFSETS,
g_param_spec_value_array ("plane-offsets", gst_param_spec_array ("plane-offsets",
"Plane offsets", "Plane offsets",
"Offsets of the planes in bytes", "Offsets of the planes in bytes (e.g. plane-offset=\"<0,76800>\")",
g_param_spec_uint ("plane-offset", g_param_spec_int ("plane-offset",
"Plane offset", "Plane offset",
"Offset of the n-th plane in bytes", "Offset of the n-th plane in bytes",
0, G_MAXUINT, 0, G_MAXINT,
0, 0,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS), G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS),
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)
...@@ -508,14 +504,13 @@ gst_raw_video_parse_set_property (GObject * object, guint prop_id, ...@@ -508,14 +504,13 @@ gst_raw_video_parse_set_property (GObject * object, guint prop_id,
case PROP_PLANE_STRIDES: case PROP_PLANE_STRIDES:
{ {
GValueArray *valarray = g_value_get_boxed (value);
guint n_planes; guint n_planes;
guint i; guint i;
/* If no valarray is given, then disable custom /* If no array is given, then disable custom
* plane strides & offsets and stick to the * plane strides & offsets and stick to the
* standard computed ones */ * standard computed ones */
if (valarray == NULL) { if (gst_value_array_get_size (value) == 0) {
GST_DEBUG_OBJECT (raw_video_parse, GST_DEBUG_OBJECT (raw_video_parse,
"custom plane strides & offsets disabled"); "custom plane strides & offsets disabled");
props_cfg->custom_plane_strides = FALSE; props_cfg->custom_plane_strides = FALSE;
...@@ -523,30 +518,24 @@ gst_raw_video_parse_set_property (GObject * object, guint prop_id, ...@@ -523,30 +518,24 @@ gst_raw_video_parse_set_property (GObject * object, guint prop_id,
break; break;
} }
/* Sanity check - reject empty arrays */
if ((valarray != NULL) && (valarray->n_values == 0)) {
GST_ELEMENT_ERROR (raw_video_parse, LIBRARY, SETTINGS,
("plane strides property holds an empty array"), (NULL));
break;
}
GST_RAW_BASE_PARSE_CONFIG_MUTEX_LOCK (object); GST_RAW_BASE_PARSE_CONFIG_MUTEX_LOCK (object);
n_planes = GST_VIDEO_INFO_N_PLANES (&(props_cfg->info)); n_planes = GST_VIDEO_INFO_N_PLANES (&(props_cfg->info));
/* Check that the valarray holds the right number of values */ /* Check that the array holds the right number of values */
if (valarray->n_values != n_planes) { if (gst_value_array_get_size (value) < n_planes) {
GST_ELEMENT_ERROR (raw_video_parse, LIBRARY, SETTINGS, GST_ELEMENT_ERROR (raw_video_parse, LIBRARY, SETTINGS,
("incorrect number of elements in plane strides property"), ("incorrect number of elements in plane strides property"),
("expected: %u, got: %u", n_planes, valarray->n_values)); ("expected: %u, got: %u", n_planes,
gst_value_array_get_size (value)));
GST_RAW_BASE_PARSE_CONFIG_MUTEX_UNLOCK (object); GST_RAW_BASE_PARSE_CONFIG_MUTEX_UNLOCK (object);
break; break;
} }
/* Copy the values to the stride array */ /* Copy the values to the stride array */
for (i = 0; i < n_planes; ++i) { for (i = 0; i < n_planes; ++i) {
GValue *val = g_value_array_get_nth (valarray, i); const GValue *val = gst_value_array_get_value (value, i);
props_cfg->plane_strides[i] = g_value_get_uint (val); props_cfg->plane_strides[i] = g_value_get_int (val);
GST_DEBUG_OBJECT (raw_video_parse, "plane #%u stride: %d", i, GST_DEBUG_OBJECT (raw_video_parse, "plane #%u stride: %d", i,
props_cfg->plane_strides[i]); props_cfg->plane_strides[i]);
} }
...@@ -566,14 +555,13 @@ gst_raw_video_parse_set_property (GObject * object, guint prop_id, ...@@ -566,14 +555,13 @@ gst_raw_video_parse_set_property (GObject * object, guint prop_id,
case PROP_PLANE_OFFSETS: case PROP_PLANE_OFFSETS:
{ {
GValueArray *valarray = g_value_get_boxed (value);
guint n_planes; guint n_planes;
guint i; guint i;
/* If no valarray is given, then disable custom /* If no array is given, then disable custom
* plane strides & offsets and stick to the * plane strides & offsets and stick to the
* standard computed ones */ * standard computed ones */
if (valarray == NULL) { if (gst_value_array_get_size (value) == 0) {
GST_DEBUG_OBJECT (raw_video_parse, GST_DEBUG_OBJECT (raw_video_parse,
"custom plane strides & offsets disabled"); "custom plane strides & offsets disabled");
props_cfg->custom_plane_strides = FALSE; props_cfg->custom_plane_strides = FALSE;
...@@ -581,30 +569,24 @@ gst_raw_video_parse_set_property (GObject * object, guint prop_id, ...@@ -581,30 +569,24 @@ gst_raw_video_parse_set_property (GObject * object, guint prop_id,
break; break;
} }
/* Sanity check - reject empty arrays */
if ((valarray != NULL) && (valarray->n_values == 0)) {
GST_ELEMENT_ERROR (raw_video_parse, LIBRARY, SETTINGS,
("plane offsets property holds an empty array"), (NULL));
break;
}
GST_RAW_BASE_PARSE_CONFIG_MUTEX_LOCK (object); GST_RAW_BASE_PARSE_CONFIG_MUTEX_LOCK (object);
n_planes = GST_VIDEO_INFO_N_PLANES (&(props_cfg->info)); n_planes = GST_VIDEO_INFO_N_PLANES (&(props_cfg->info));
/* Check that the valarray holds the right number of values */ /* Check that the alarray holds the right number of values */
if (valarray->n_values != n_planes) { if (gst_value_array_get_size (value) < n_planes) {
GST_ELEMENT_ERROR (raw_video_parse, LIBRARY, SETTINGS, GST_ELEMENT_ERROR (raw_video_parse, LIBRARY, SETTINGS,
("incorrect number of elements in plane offsets property"), ("incorrect number of elements in plane offsets property"),
("expected: %u, got: %u", n_planes, valarray->n_values)); ("expected: %u, got: %u", n_planes,
gst_value_array_get_size (value)));
GST_RAW_BASE_PARSE_CONFIG_MUTEX_UNLOCK (object); GST_RAW_BASE_PARSE_CONFIG_MUTEX_UNLOCK (object);
break; break;
} }
/* Copy the values to the offset array */ /* Copy the values to the offset array */
for (i = 0; i < n_planes; ++i) { for (i = 0; i < n_planes; ++i) {
GValue *val = g_value_array_get_nth (valarray, i); const GValue *val = gst_value_array_get_value (value, i);
props_cfg->plane_offsets[i] = g_value_get_uint (val); props_cfg->plane_offsets[i] = g_value_get_int (val);
GST_DEBUG_OBJECT (raw_video_parse, "plane #%u offset: %" G_GSIZE_FORMAT, GST_DEBUG_OBJECT (raw_video_parse, "plane #%u offset: %" G_GSIZE_FORMAT,
i, props_cfg->plane_offsets[i]); i, props_cfg->plane_offsets[i]);
} }
...@@ -702,26 +684,22 @@ gst_raw_video_parse_get_property (GObject * object, guint prop_id, ...@@ -702,26 +684,22 @@ gst_raw_video_parse_get_property (GObject * object, guint prop_id,
{ {
guint i, n_planes; guint i, n_planes;
GValue val = G_VALUE_INIT; GValue val = G_VALUE_INIT;
GValueArray *valarray;
g_value_reset (value);
GST_RAW_BASE_PARSE_CONFIG_MUTEX_LOCK (object); GST_RAW_BASE_PARSE_CONFIG_MUTEX_LOCK (object);
n_planes = GST_VIDEO_INFO_N_PLANES (&(props_cfg->info)); n_planes = GST_VIDEO_INFO_N_PLANES (&(props_cfg->info));
valarray = g_value_array_new (n_planes); g_value_init (&val, G_TYPE_INT);
g_value_init (&val, G_TYPE_UINT);
for (i = 0; i < n_planes; ++i) { for (i = 0; i < n_planes; ++i) {
g_value_set_uint (&val, props_cfg->plane_strides[i]); g_value_set_int (&val, props_cfg->plane_strides[i]);
g_value_array_insert (valarray, i, &val); gst_value_array_append_value (value, &val);
} }
g_value_unset (&val); g_value_unset (&val);
GST_RAW_BASE_PARSE_CONFIG_MUTEX_UNLOCK (object); GST_RAW_BASE_PARSE_CONFIG_MUTEX_UNLOCK (object);
/* Pass on ownership to the value array,
* since we don't need it anymore */
g_value_take_boxed (value, valarray);
break; break;
} }
...@@ -729,26 +707,22 @@ gst_raw_video_parse_get_property (GObject * object, guint prop_id, ...@@ -729,26 +707,22 @@ gst_raw_video_parse_get_property (GObject * object, guint prop_id,
{ {
guint i, n_planes; guint i, n_planes;
GValue val = G_VALUE_INIT; GValue val = G_VALUE_INIT;
GValueArray *valarray;
g_value_reset (value);
GST_RAW_BASE_PARSE_CONFIG_MUTEX_LOCK (object); GST_RAW_BASE_PARSE_CONFIG_MUTEX_LOCK (object);
n_planes = GST_VIDEO_INFO_N_PLANES (&(props_cfg->info)); n_planes = GST_VIDEO_INFO_N_PLANES (&(props_cfg->info));
valarray = g_value_array_new (n_planes); g_value_init (&val, G_TYPE_INT);
g_value_init (&val, G_TYPE_UINT);
for (i = 0; i < n_planes; ++i) { for (i = 0; i < n_planes; ++i) {
g_value_set_uint (&val, props_cfg->plane_offsets[i]); g_value_set_int (&val, props_cfg->plane_offsets[i]);
g_value_array_insert (valarray, i, &val); gst_value_array_append_value (value, &val);
} }
g_value_unset (&val); g_value_unset (&val);
GST_RAW_BASE_PARSE_CONFIG_MUTEX_UNLOCK (object); GST_RAW_BASE_PARSE_CONFIG_MUTEX_UNLOCK (object);
/* Pass on ownership to the value array,
* since we don't need it anymore */
g_value_take_boxed (value, valarray);
break; break;
} }
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment