gstvalue: Use quark-based structure usage for segment (de)serialization

Instead of string-based one. Smaller and faster code

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/453>

diff --git a/gst/gstquark.c b/gst/gstquark.c
index fe00e7b..e7a7bfc 100644 (file)
--- a/gst/gstquark.c
+++ b/gst/gstquark.c
@@ -79,7 +79,7 @@ static const gchar *_quark_strings[] = {
   "GstMessageDeviceChanged", "device-changed", "trickmode-interval",
   "GstEventInstantRateChange",
   "GstEventInstantRateSyncTime", "GstMessageInstantRateRequest",
-  "upstream-running-time"
+  "upstream-running-time", "base", "offset",
 };
 
 GQuark _priv_gst_quark_table[GST_QUARK_MAX];

diff --git a/gst/gstquark.h b/gst/gstquark.h
index 3a90f85..608ae84 100644 (file)
--- a/gst/gstquark.h
+++ b/gst/gstquark.h
@@ -226,7 +226,9 @@ typedef enum _GstQuarkId
   GST_QUARK_EVENT_INSTANT_RATE_SYNC_TIME = 195,
   GST_QUARK_MESSAGE_INSTANT_RATE_REQUEST = 196,
   GST_QUARK_UPSTREAM_RUNNING_TIME = 197,
-  GST_QUARK_MAX = 198
+  GST_QUARK_BASE = 198,
+  GST_QUARK_OFFSET = 199,
+  GST_QUARK_MAX = 200
 } GstQuarkId;
 
 extern GQuark _priv_gst_quark_table[GST_QUARK_MAX];

diff --git a/gst/gstvalue.c b/gst/gstvalue.c
index 2f4c1ee..1bfe31d 100644 (file)
--- a/gst/gstvalue.c
+++ b/gst/gstvalue.c
@@ -46,6 +46,7 @@
 #include <gst/gst.h>
 #include <gobject/gvaluecollector.h>
 #include "gstutils.h"
+#include "gstquark.h"
 
 /* GstValueUnionFunc:
  * @dest: a #GValue for the result
@@ -2764,18 +2765,15 @@ gst_value_serialize_segment_internal (const GValue * value, gboolean escape)
   gchar *t, *res;
   GstStructure *s;
 
-  s = gst_structure_new ("GstSegment",
-      "flags", GST_TYPE_SEGMENT_FLAGS, seg->flags,
-      "rate", G_TYPE_DOUBLE, seg->rate,
-      "applied-rate", G_TYPE_DOUBLE, seg->applied_rate,
-      "format", GST_TYPE_FORMAT, seg->format,
-      "base", G_TYPE_UINT64, seg->base,
-      "offset", G_TYPE_UINT64, seg->offset,
-      "start", G_TYPE_UINT64, seg->start,
-      "stop", G_TYPE_UINT64, seg->stop,
-      "time", G_TYPE_UINT64, seg->time,
-      "position", G_TYPE_UINT64, seg->position,
-      "duration", G_TYPE_UINT64, seg->duration, NULL);
+  s = gst_structure_new_id (GST_QUARK_SEGMENT, GST_QUARK_FLAGS,
+      GST_TYPE_SEGMENT_FLAGS, seg->flags, GST_QUARK_RATE, G_TYPE_DOUBLE,
+      seg->rate, GST_QUARK_APPLIED_RATE, G_TYPE_DOUBLE, seg->applied_rate,
+      GST_QUARK_FORMAT, GST_TYPE_FORMAT, seg->format, GST_QUARK_BASE,
+      G_TYPE_UINT64, seg->base, GST_QUARK_OFFSET, G_TYPE_UINT64, seg->offset,
+      GST_QUARK_START, G_TYPE_UINT64, seg->start, GST_QUARK_STOP, G_TYPE_UINT64,
+      seg->stop, GST_QUARK_TIME, G_TYPE_UINT64, seg->time, GST_QUARK_POSITION,
+      G_TYPE_UINT64, seg->position, GST_QUARK_DURATION, G_TYPE_UINT64,
+      seg->duration, NULL);
   t = gst_structure_to_string (s);
   if (escape) {
     res = g_strdup_printf ("\"%s\"", t);
@@ -2805,18 +2803,18 @@ gst_value_deserialize_segment (GValue * dest, const gchar * s)
   if (str == NULL)
     return FALSE;
 
-  res = gst_structure_get (str,
-      "flags", GST_TYPE_SEGMENT_FLAGS, &seg.flags,
-      "rate", G_TYPE_DOUBLE, &seg.rate,
-      "applied-rate", G_TYPE_DOUBLE, &seg.applied_rate,
-      "format", GST_TYPE_FORMAT, &seg.format,
-      "base", G_TYPE_UINT64, &seg.base,
-      "offset", G_TYPE_UINT64, &seg.offset,
-      "start", G_TYPE_UINT64, &seg.start,
-      "stop", G_TYPE_UINT64, &seg.stop,
-      "time", G_TYPE_UINT64, &seg.time,
-      "position", G_TYPE_UINT64, &seg.position,
-      "duration", G_TYPE_UINT64, &seg.duration, NULL);
+  res = gst_structure_id_get (str,
+      GST_QUARK_FLAGS, GST_TYPE_SEGMENT_FLAGS, &seg.flags,
+      GST_QUARK_RATE, G_TYPE_DOUBLE, &seg.rate,
+      GST_QUARK_APPLIED_RATE, G_TYPE_DOUBLE, &seg.applied_rate,
+      GST_QUARK_FORMAT, GST_TYPE_FORMAT, &seg.format,
+      GST_QUARK_BASE, G_TYPE_UINT64, &seg.base,
+      GST_QUARK_OFFSET, G_TYPE_UINT64, &seg.offset,
+      GST_QUARK_START, G_TYPE_UINT64, &seg.start,
+      GST_QUARK_STOP, G_TYPE_UINT64, &seg.stop,
+      GST_QUARK_TIME, G_TYPE_UINT64, &seg.time,
+      GST_QUARK_POSITION, G_TYPE_UINT64, &seg.position,
+      GST_QUARK_DURATION, G_TYPE_UINT64, &seg.duration, NULL);
   gst_structure_free (str);
 
   if (res)