mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-23 10:11:08 +00:00
Code Issues 1 Projects Releases Wiki Activity

marker-list: Add flags (de)serialization

Browse source 
Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-editing-services/-/merge_requests/260>
This commit is contained in:
Piotrek Brzeziński 2021-07-09 16:14:19 +02:00
parent 20c6668f5a
commit 9c03f99e58
2 changed files with 35 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
ges/ges-marker-list.c
View file

@ -497,19 +497,21 @@ ges_marker_list_deserialize (GValue * dest, const gchar * s)
gboolean ret = FALSE; gboolean ret = FALSE;
GstCaps *caps = NULL; GstCaps *caps = NULL;
GESMarkerList *list = ges_marker_list_new (); GESMarkerList *list = ges_marker_list_new ();
guint i, l; guint caps_len, i = 0;
gsize len; gsize string_len;
gchar *escaped, *caps_str; gchar *escaped, *caps_str;
GstStructure *data_s;
gint flags;
len = strlen (s); string_len = strlen (s);
if (G_UNLIKELY (*s != '"' || len < 2 || s[len - 1] != '"')) { if (G_UNLIKELY (*s != '"' || string_len < 2 || s[string_len - 1] != '"')) {
/* "\"" is not an accepted string, so len must be at least 2 */ /* "\"" is not an accepted string, so len must be at least 2 */
GST_ERROR ("Failed deserializing marker list: expected string to start " GST_ERROR ("Failed deserializing marker list: expected string to start "
"and end with '\"'"); "and end with '\"'");
goto done; goto done;
} }
escaped = g_strdup (s + 1); escaped = g_strdup (s + 1);
escaped[len - 2] = '\0'; escaped[string_len - 2] = '\0';
/* removed trailing '"' */ /* removed trailing '"' */
caps_str = g_strcompress (escaped); caps_str = g_strcompress (escaped);
g_free (escaped); g_free (escaped);
@ -521,19 +523,30 @@ ges_marker_list_deserialize (GValue * dest, const gchar * s)
goto done; goto done;
} }
l = gst_caps_get_size (caps); caps_len = gst_caps_get_size (caps);
if (l == 0) { if (G_UNLIKELY (caps_len == 0)) {
GST_DEBUG ("Got empty caps: %s", s); GST_DEBUG ("Got empty caps: %s", s);
goto done; goto done;
} }
if (G_UNLIKELY (l % 2)) { data_s = gst_caps_get_structure (caps, i);
GST_ERROR ("Failed deserializing marker list: expected evenly-sized caps"); if (gst_structure_has_name (data_s, "marker-list-flags")) {
if (!gst_structure_get_int (data_s, "flags", &flags)) {
GST_ERROR_OBJECT (dest,
"Failed deserializing marker list: unexpected structure %"
GST_PTR_FORMAT, data_s);
goto done; goto done;
} }
for (i = 0; i < l - 1; i += 2) { list->flags = flags;
i += 1;
}
if (G_UNLIKELY ((caps_len - i) % 2)) {
GST_ERROR ("Failed deserializing marker list: incomplete marker caps");
}
for (; i < caps_len - 1; i += 2) {
const GstStructure *pos_s = gst_caps_get_structure (caps, i); const GstStructure *pos_s = gst_caps_get_structure (caps, i);
const GstStructure *meta_s = gst_caps_get_structure (caps, i + 1); const GstStructure *meta_s = gst_caps_get_structure (caps, i + 1);
GstClockTime position; GstClockTime position;
@ -560,7 +573,6 @@ ges_marker_list_deserialize (GValue * dest, const gchar * s)
ges_meta_container_add_metas_from_string (GES_META_CONTAINER (marker), ges_meta_container_add_metas_from_string (GES_META_CONTAINER (marker),
metas); metas);
g_free (metas); g_free (metas);
} }
ret = TRUE; ret = TRUE;
@ -584,12 +596,16 @@ ges_marker_list_serialize (const GValue * v)
GSequenceIter *iter; GSequenceIter *iter;
GstCaps *caps = gst_caps_new_empty (); GstCaps *caps = gst_caps_new_empty ();
gchar *caps_str, *escaped, *res; gchar *caps_str, *escaped, *res;
GstStructure *s;
s = gst_structure_new ("marker-list-flags", "flags", G_TYPE_INT,
list->flags, NULL);
gst_caps_append_structure (caps, s);
iter = g_sequence_get_begin_iter (list->markers); iter = g_sequence_get_begin_iter (list->markers);
while (!g_sequence_iter_is_end (iter)) { while (!g_sequence_iter_is_end (iter)) {
GESMarker *marker = (GESMarker *) g_sequence_get (iter); GESMarker *marker = (GESMarker *) g_sequence_get (iter);
GstStructure *s;
gchar *metas; gchar *metas;
metas = ges_meta_container_metas_to_string (GES_META_CONTAINER (marker)); metas = ges_meta_container_metas_to_string (GES_META_CONTAINER (marker));

5
tests/check/ges/markerlist.c
View file

@ -354,6 +354,7 @@ GST_START_TEST (test_serialize_deserialize_in_value)
GList *markers; GList *markers;
guint64 position; guint64 position;
GValue val1 = G_VALUE_INIT, val2 = G_VALUE_INIT; GValue val1 = G_VALUE_INIT, val2 = G_VALUE_INIT;
GESMarkerFlags flags;
ges_init (); ges_init ();
@ -361,6 +362,7 @@ GST_START_TEST (test_serialize_deserialize_in_value)
g_value_init (&val2, GES_TYPE_MARKER_LIST); g_value_init (&val2, GES_TYPE_MARKER_LIST);
markerlist1 = ges_marker_list_new (); markerlist1 = ges_marker_list_new ();
g_object_set (markerlist1, "flags", GES_MARKER_FLAG_SNAPPABLE, NULL);
marker = ges_marker_list_add (markerlist1, 0); marker = ges_marker_list_add (markerlist1, 0);
fail_unless (ges_meta_container_set_string (GES_META_CONTAINER (marker), fail_unless (ges_meta_container_set_string (GES_META_CONTAINER (marker),
"str-val", test_string)); "str-val", test_string));
@ -385,6 +387,9 @@ GST_START_TEST (test_serialize_deserialize_in_value)
markerlist2 = GES_MARKER_LIST (g_value_get_object (&val2)); markerlist2 = GES_MARKER_LIST (g_value_get_object (&val2));
ASSERT_OBJECT_REFCOUNT (markerlist2, "GValue", 1); ASSERT_OBJECT_REFCOUNT (markerlist2, "GValue", 1);
g_object_get (markerlist2, "flags", &flags, NULL);
fail_unless (flags == GES_MARKER_FLAG_SNAPPABLE);
fail_unless_equals_int (ges_marker_list_size (markerlist2), 2); fail_unless_equals_int (ges_marker_list_size (markerlist2), 2);
markers = ges_marker_list_get_markers (markerlist2); markers = ges_marker_list_get_markers (markerlist2);
marker = GES_MARKER (markers->data); marker = GES_MARKER (markers->data);