From 511ab5e1d8da6d72c9eb6d4bf1d3dd2e586a8baa Mon Sep 17 00:00:00 2001 From: Edward Hervey Date: Fri, 16 Aug 2013 14:24:12 +0200 Subject: [PATCH] pad-monitor: Update raw audio caps checks --- validate/gst/validate/gst-validate-pad-monitor.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/validate/gst/validate/gst-validate-pad-monitor.c b/validate/gst/validate/gst-validate-pad-monitor.c index 157a77c15a..3c54761cf5 100644 --- a/validate/gst/validate/gst-validate-pad-monitor.c +++ b/validate/gst/validate/gst-validate-pad-monitor.c @@ -181,13 +181,15 @@ static void gst_validate_pad_monitor_check_raw_audio_caps_complete (GstValidatePadMonitor * monitor, GstStructure * structure) { + _check_field_type (monitor, structure, "format", G_TYPE_STRING, GST_TYPE_LIST, + 0); + _check_field_type (monitor, structure, "layout", G_TYPE_STRING, GST_TYPE_LIST, + 0); _check_field_type (monitor, structure, "rate", G_TYPE_INT, GST_TYPE_LIST, GST_TYPE_INT_RANGE, 0); - _check_field_type (monitor, structure, "channels", G_TYPE_INT, - GST_TYPE_LIST, GST_TYPE_INT_RANGE, 0); - _check_field_type (monitor, structure, "endianness", G_TYPE_INT, - GST_TYPE_LIST, 0); - _check_field_type (monitor, structure, "channel-positions", GST_TYPE_ARRAY, + _check_field_type (monitor, structure, "channels", G_TYPE_INT, GST_TYPE_LIST, + GST_TYPE_INT_RANGE, 0); + _check_field_type (monitor, structure, "channel-mask", GST_TYPE_BITMASK, GST_TYPE_LIST, 0); } @@ -198,6 +200,8 @@ gst_validate_pad_monitor_check_caps_complete (GstValidatePadMonitor * monitor, GstStructure *structure; gint i; + GST_DEBUG_OBJECT (monitor, "Checking caps %" GST_PTR_FORMAT, caps); + for (i = 0; i < gst_caps_get_size (caps); i++) { structure = gst_caps_get_structure (caps, i);