validate: flow: Handle ignored fields for caps

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4341>
This commit is contained in:
Thibault Saunier 2023-04-04 18:34:26 -04:00 committed by GStreamer Marge Bot
parent 9be36adaa3
commit 6646184791
2 changed files with 6 additions and 4 deletions

View file

@ -192,7 +192,8 @@ validate_flow_structure_cleanup (const GstStructure * structure,
}
gchar *
validate_flow_format_caps (const GstCaps * caps, gchar ** wanted_fields)
validate_flow_format_caps (const GstCaps * caps, gchar ** wanted_fields,
gchar ** ignored_fields)
{
guint i;
GstCaps *new_caps = gst_caps_new_empty ();
@ -203,7 +204,7 @@ validate_flow_format_caps (const GstCaps * caps, gchar ** wanted_fields)
for (i = 0; i < gst_caps_get_size (caps); i++) {
GstStructure *structure =
validate_flow_structure_cleanup (gst_caps_get_structure (caps, i),
wanted_fields, NULL);
wanted_fields, ignored_fields);
gst_caps_append_structure_full (new_caps, structure,
gst_caps_features_copy (gst_caps_get_features (caps, i)));
@ -419,7 +420,8 @@ validate_flow_format_event (GstEvent * event,
structure_string =
validate_flow_format_caps (caps,
logged_fields ? logged_fields : (gchar **) caps_properties);
logged_fields ? logged_fields : (gchar **) caps_properties,
ignored_fields);
/* FIXME: Remove spurious `;` and regenerate all the expectation files */
event_string = g_strdup_printf ("%s: %s;", event_type, structure_string);
goto done;

View file

@ -33,7 +33,7 @@ void format_time(gchar* dest_str, guint64 time);
gchar* validate_flow_format_segment(const GstSegment* segment, gchar** logged_fields, gchar** ignored_fields);
gchar* validate_flow_format_caps (const GstCaps* caps, gchar **wanted_fields);
gchar* validate_flow_format_caps (const GstCaps* caps, gchar **wanted_fields, gchar **ignored_fields);
gchar* validate_flow_format_buffer(GstBuffer* buffer, gboolean add_checksum, GstStructure* logged_fields_struct, GstStructure* ignored_fields_struct);