FaSTTUBe/GST-Tensordecoder-ov_ep
37
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

qroverlay: Cleanup the way we build the json using json-glib

Browse Source 
And reindent the .h file removing tabs

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1730>
This commit is contained in:
Thibault Saunier 2020-07-09 14:14:45 -04:00 committed by GStreamer Merge Bot
parent bf811616e0
commit dc88d3ece9
3 changed files with 62 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

163
ext/qroverlay/gstqroverlay.c
View File

@ -47,6 +47,7 @@
#include <gst/gst.h> #include <gst/gst.h>
#include <gst/base/gstbasetransform.h> #include <gst/base/gstbasetransform.h>
#include <json-glib/json-glib.h>
#include <qrencode.h> #include <qrencode.h>
#include <string.h> #include <string.h>
@ -220,11 +221,8 @@ gst_qr_overlay_init (GstQROverlay * filter)
filter->y_percent = 50.0; filter->y_percent = 50.0;
filter->qrcode_quality = DEFAULT_PROP_QUALITY; filter->qrcode_quality = DEFAULT_PROP_QUALITY;
filter->level = QR_ECLEVEL_M; filter->level = QR_ECLEVEL_M;
filter->extra_data_name = 0;
filter->extra_data_array = 0;
filter->extra_data_enabled = FALSE;
filter->array_counter = 0; filter->array_counter = 0;
filter->array_size = 1; filter->array_size = 0;
filter->extra_data_interval_buffers = 60; filter->extra_data_interval_buffers = 60;
filter->extra_data_span_buffers = 1; filter->extra_data_span_buffers = 1;
filter->span_frame = 0; filter->span_frame = 0;
@ -260,8 +258,16 @@ gst_qr_overlay_set_property (GObject * object, guint prop_id,
filter->extra_data_name = g_value_dup_string (value); filter->extra_data_name = g_value_dup_string (value);
break; break;
case PROP_EXTRA_DATA_ARRAY: case PROP_EXTRA_DATA_ARRAY:
filter->extra_data_array = g_value_dup_string (value); {
g_clear_pointer (&filter->extra_data_str, g_free);
g_clear_pointer (&filter->extra_data_array, g_strfreev);
filter->extra_data_str = g_value_dup_string (value);
if (filter->extra_data_str) {
filter->extra_data_array = g_strsplit (filter->extra_data_str, ",", -1);
filter->array_size = g_strv_length (filter->extra_data_array);
}
break; break;
}
default: default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break; break;
@ -297,7 +303,7 @@ gst_qr_overlay_get_property (GObject * object, guint prop_id,
g_value_set_string (value, filter->extra_data_name); g_value_set_string (value, filter->extra_data_name);
break; break;
case PROP_EXTRA_DATA_ARRAY: case PROP_EXTRA_DATA_ARRAY:
g_value_set_string (value, filter->extra_data_array); g_value_set_string (value, filter->extra_data_str);
break; break;
default: default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@ -311,7 +317,6 @@ gst_qr_overlay_set_caps (GstBaseTransform * trans, GstCaps * in, GstCaps * out)
GstQROverlay *filter = GST_QR_OVERLAY (trans); GstQROverlay *filter = GST_QR_OVERLAY (trans);
GstStructure *structure; GstStructure *structure;
const GValue *framerate_value; const GValue *framerate_value;
guint i;
structure = gst_caps_get_structure (in, 0); structure = gst_caps_get_structure (in, 0);
framerate_value = gst_structure_get_value (structure, "framerate"); framerate_value = gst_structure_get_value (structure, "framerate");
@ -339,129 +344,34 @@ gst_qr_overlay_set_caps (GstBaseTransform * trans, GstCaps * in, GstCaps * out)
GST_ERROR_OBJECT (filter, "Invalid level"); GST_ERROR_OBJECT (filter, "Invalid level");
break; break;
} }
if (filter->extra_data_array && filter->extra_data_name
&& strlen (filter->extra_data_array) > 3
&& strlen (filter->extra_data_name) > 0) {
filter->extra_data_enabled = TRUE;
for (i = 0; filter->extra_data_array[i]; i++)
if (filter->extra_data_array[i] == ',')
filter->array_size++;
}
return TRUE; return TRUE;
} }
static gchar * static gchar *
parse_data_array (GstQROverlay * filter, gchar * value_in_array) build_string (GstBaseTransform * base, GstBuffer * outbuf)
{ {
guint value_size; GString *res = g_string_new (NULL);
guint i, j, k, count; JsonGenerator *jgen;
GST_LOG_OBJECT (filter, "Select data in array");
for (i = 0, count = 0; filter->extra_data_array[i]; i++) {
if (filter->extra_data_array[i] == ',')
count++;
if (count == filter->array_counter)
break;
}
for (j = i, value_size = 0; filter->extra_data_array[j]; j++) {
value_size++;
if (j > i && (filter->extra_data_array[j] == ','
|| filter->extra_data_array[j] == '"'))
break;
}
if (!(value_in_array = malloc (value_size + 1 * sizeof (char *))))
GST_ERROR_OBJECT (filter, "can't alloc memory to value in array");
for (j = i, k = 0; filter->extra_data_array[j]; j++) {
if (j > i && (filter->extra_data_array[j] == ','
|| filter->extra_data_array[j] == '"'))
break;
else if (filter->extra_data_array[j] != ','
&& filter->extra_data_array[j] != '"') {
value_in_array[k] = filter->extra_data_array[j];
k++;
}
}
value_in_array[k] = '\0';
return value_in_array;
}
static gchar *
build_string (GstBaseTransform * base, GstBuffer * outbuf,
gchar * encode_string)
{
gchar *timestamp;
gchar *value;
gchar *buffer_count;
gchar *framerate;
gchar *element_name;
gchar *name;
gchar *extra_data_value = NULL;
int size_string;
GstQROverlay *filter = GST_QR_OVERLAY (base); GstQROverlay *filter = GST_QR_OVERLAY (base);
GST_DEBUG_OBJECT (filter, "Build string will be encoded"); JsonObject *jobj = json_object_new ();
/* Convert timestamp to string */ JsonNode *root = json_node_new (JSON_NODE_OBJECT);
if (!(timestamp = malloc (35 * sizeof (char *))))
GST_ERROR_OBJECT (filter, "can't alloc memory to timestamp"); json_object_set_int_member (jobj, "TIMESTAMP",
if (!(value = malloc (20 * sizeof (char *)))) (gint64) GST_BUFFER_TIMESTAMP (outbuf));
GST_ERROR_OBJECT (filter, "can't alloc memory to timestamp value"); json_object_set_int_member (jobj, "BUFFERCOUNT",
sprintf (value, "%llu", (gint64) filter->frame_number);
(long long unsigned int) GST_BUFFER_TIMESTAMP (outbuf)); json_object_set_string_member (jobj, "FRAMERATE", filter->framerate_string);
strcpy (timestamp, "\"timestamp\":"); json_object_set_string_member (jobj, "NAME", GST_ELEMENT_NAME (base));
timestamp = strcat (timestamp, value);
timestamp = strcat (timestamp, ","); if (filter->extra_data_array && filter->extra_data_name &&
strcpy (encode_string, "{");
GST_LOG_OBJECT (filter, "Build timestamp string");
encode_string = strcat (encode_string, timestamp);
g_free (value);
g_free (timestamp);
/* Convert frame number to string */
if (!(buffer_count = malloc (23 * sizeof (char *))))
GST_ERROR_OBJECT (filter, "can't alloc memory to buffer count");
if (!(value = malloc (7 * sizeof (char *))))
GST_ERROR_OBJECT (filter, "can't alloc memory to buffer counr value");
strcpy (buffer_count, "\"buffercount\":");
sprintf (value, "%d", filter->frame_number);
buffer_count = strcat (buffer_count, value);
buffer_count = strcat (buffer_count, ",");
GST_LOG_OBJECT (filter, "Build buffer count string");
encode_string = strcat (encode_string, buffer_count);
g_free (value);
g_free (buffer_count);
/* Convert framerate to string */
size_string = strlen (filter->framerate_string);
if (!(framerate = malloc ((18 + size_string) * sizeof (char *))))
GST_ERROR_OBJECT (filter, "can't alloc memory to framerate");
strcpy (framerate, "\"framerate\":\"");
framerate = strcat (framerate, filter->framerate_string);
framerate = strcat (framerate, "\",");
GST_LOG_OBJECT (filter, "Build framerate string");
encode_string = strcat (encode_string, framerate);
g_free (framerate);
/* element name string */
name = GST_ELEMENT_NAME (base);
size_string = strlen (name);
if (!(element_name = malloc ((14 + size_string) * sizeof (char *))))
GST_ERROR_OBJECT (filter, "can't alloc memory to element name");
strcpy (element_name, "\"name\":\"");
element_name = strcat (element_name, name);
element_name = strcat (element_name, "\",");
GST_LOG_OBJECT (filter, "Build element name string");
encode_string = strcat (encode_string, element_name);
g_free (element_name);
if (filter->extra_data_enabled &&
(filter->frame_number == 1 (filter->frame_number == 1
|| filter->frame_number % filter->extra_data_interval_buffers == 1 || filter->frame_number % filter->extra_data_interval_buffers == 1
|| (filter->span_frame > 0 || (filter->span_frame > 0
&& filter->span_frame < filter->extra_data_span_buffers))) { && filter->span_frame < filter->extra_data_span_buffers))) {
extra_data_value = parse_data_array (filter, extra_data_value); json_object_set_string_member (jobj, filter->extra_data_name,
GST_LOG_OBJECT (filter, "Build extra data string"); filter->extra_data_array[filter->array_counter]);
encode_string = strcat (encode_string, "\"");
encode_string = strcat (encode_string, filter->extra_data_name);
encode_string = strcat (encode_string, "\":\"");
encode_string = strcat (encode_string, extra_data_value);
encode_string = strcat (encode_string, "\",");
g_free (extra_data_value);
filter->span_frame++; filter->span_frame++;
if (filter->span_frame == filter->extra_data_span_buffers) { if (filter->span_frame == filter->extra_data_span_buffers) {
filter->array_counter++; filter->array_counter++;
@ -470,9 +380,14 @@ build_string (GstBaseTransform * base, GstBuffer * outbuf,
filter->array_counter = 0; filter->array_counter = 0;
} }
} }
encode_string = strcat (encode_string, "}");
GST_LOG_OBJECT (filter, "String built"); jgen = json_generator_new ();
return encode_string; json_node_set_object (root, jobj);
json_generator_set_root (jgen, root);
res = json_generator_to_gstring (jgen, res);
g_object_unref (jgen);
return g_strdup (g_string_free (res, FALSE));
} }
static void static void
@ -546,9 +461,7 @@ gst_qr_overlay_transform_ip (GstBaseTransform * base, GstBuffer * outbuf)
if (GST_CLOCK_TIME_IS_VALID (GST_BUFFER_TIMESTAMP (outbuf))) if (GST_CLOCK_TIME_IS_VALID (GST_BUFFER_TIMESTAMP (outbuf)))
gst_object_sync_values (GST_OBJECT (filter), GST_BUFFER_TIMESTAMP (outbuf)); gst_object_sync_values (GST_OBJECT (filter), GST_BUFFER_TIMESTAMP (outbuf));
if (!(encode_string = malloc (150 * sizeof (char *)))) encode_string = build_string (base, outbuf);
GST_ERROR_OBJECT (filter, "can't alloc memory to timestamp");
encode_string = build_string (base, outbuf, encode_string);
GST_INFO_OBJECT (filter, "String will be encoded : %s", encode_string); GST_INFO_OBJECT (filter, "String will be encoded : %s", encode_string);
qrcode = qrcode =
QRcode_encodeString ((const char *) encode_string, 0, QRcode_encodeString ((const char *) encode_string, 0,

44
ext/qroverlay/gstqroverlay.h
View File

@ -26,34 +26,34 @@
#include <gst/base/gstbasetransform.h> #include <gst/base/gstbasetransform.h>
G_BEGIN_DECLS G_BEGIN_DECLS
#define GST_TYPE_QR_OVERLAY (gst_qr_overlay_get_type()) #define GST_TYPE_QR_OVERLAY (gst_qr_overlay_get_type())
G_DECLARE_FINAL_TYPE (GstQROverlay, gst_qr_overlay, GST, QR_OVERLAY,
GstBaseTransform);
G_DECLARE_FINAL_TYPE(GstQROverlay, gst_qr_overlay, GST, QR_OVERLAY, GstBaseTransform); struct _GstQROverlay
{
struct _GstQROverlay {
GstBaseTransform element; GstBaseTransform element;
guint32 frame_number; guint32 frame_number;
guint32 width; guint32 width;
guint32 height; guint32 height;
gfloat qrcode_size; gfloat qrcode_size;
guint qrcode_quality; guint qrcode_quality;
guint array_counter; guint array_counter;
guint array_size; guint array_size;
guint span_frame; guint span_frame;
guint64 extra_data_interval_buffers; guint64 extra_data_interval_buffers;
guint64 extra_data_span_buffers; guint64 extra_data_span_buffers;
QRecLevel level; QRecLevel level;
gchar *framerate_string; gchar *framerate_string;
const gchar *extra_data_name; gchar *extra_data_name;
const gchar *extra_data_array; gchar *extra_data_str;
gfloat x_percent; gchar **extra_data_array;
gfloat y_percent; gfloat x_percent;
gboolean silent; gfloat y_percent;
gboolean extra_data_enabled; gboolean silent;
gboolean extra_data_enabled;
}; };
G_END_DECLS G_END_DECLS
#endif /* __GST_QR_OVERLAY_H__ */ #endif /* __GST_QR_OVERLAY_H__ */

3
ext/qroverlay/meson.build
View File

@ -1,9 +1,10 @@
qrencode_dep = dependency('libqrencode', required: get_option('qroverlay')) qrencode_dep = dependency('libqrencode', required: get_option('qroverlay'))
json_dep = dependency('json-glib-1.0', fallback : ['json-glib', 'json_glib_dep'])
if qrencode_dep.found() if qrencode_dep.found()
gstqroverlay = library('gstqroverlay', ['gstqroverlay.c'], gstqroverlay = library('gstqroverlay', ['gstqroverlay.c'],
c_args : gst_plugins_bad_args, c_args : gst_plugins_bad_args,
include_directories : [configinc], include_directories : [configinc],
dependencies : [gstbase_dep, qrencode_dep], dependencies : [gstbase_dep, qrencode_dep, json_dep],
install : true, install : true,
install_dir : plugins_install_dir, install_dir : plugins_install_dir,
) )