debug: add specific format debug

spa/include/spa/debug/format.h

@@ -25,20 +25,172 @@ extern "C" {
 #endif
 
 #include <spa/support/type-map.h>
-#include <spa/debug/mem.h>
+#include <spa/pod/parser.h>
-#include <spa/debug/pod.h>
 
-#ifndef spa_debug
+static inline int
-#define spa_debug(...)	({ fprintf(stderr, __VA_ARGS__);fputc('\n', stderr); })
+spa_debug_format_value(struct spa_type_map *map,
-#endif
+		uint32_t type, void *body, uint32_t size)
+{
+	switch (type) {
+	case SPA_POD_TYPE_BOOL:
+		fprintf(stderr, "%s", *(int32_t *) body ? "true" : "false");
+		break;
+	case SPA_POD_TYPE_ID:
+	{
+		const char *str = map ? spa_type_map_get_type(map, *(int32_t *) body) : NULL;
+		if (str) {
+			const char *h = rindex(str, ':');
+			if (h)
+				str = h + 1;
+		} else {
+			str = "unknown";
+		}
+		fprintf(stderr, "%s", str);
+		break;
+	}
+	case SPA_POD_TYPE_INT:
+		fprintf(stderr, "%" PRIi32, *(int32_t *) body);
+		break;
+	case SPA_POD_TYPE_LONG:
+		fprintf(stderr, "%" PRIi64, *(int64_t *) body);
+		break;
+	case SPA_POD_TYPE_FLOAT:
+		fprintf(stderr, "%f", *(float *) body);
+		break;
+	case SPA_POD_TYPE_DOUBLE:
+		fprintf(stderr, "%g", *(double *) body);
+		break;
+	case SPA_POD_TYPE_STRING:
+		fprintf(stderr, "%s", (char *) body);
+		break;
+	case SPA_POD_TYPE_RECTANGLE:
+	{
+		struct spa_rectangle *r = body;
+		fprintf(stderr, "%" PRIu32 "x%" PRIu32, r->width, r->height);
+		break;
+	}
+	case SPA_POD_TYPE_FRACTION:
+	{
+		struct spa_fraction *f = body;
+		fprintf(stderr, "%" PRIu32 "/%" PRIu32, f->num, f->denom);
+		break;
+	}
+	case SPA_POD_TYPE_BITMAP:
+		fprintf(stderr, "Bitmap");
+		break;
+	case SPA_POD_TYPE_BYTES:
+		fprintf(stderr, "Bytes");
+		break;
+	default:
+		break;
+	}
+	return 0;
+}
 
 static inline int spa_debug_format(int indent,
-		struct spa_type_map *map, const struct spa_pod *pod)
+		struct spa_type_map *map, const struct spa_pod *format)
 {
-	return spa_debug_pod_value(indent, map,
+	int i;
-			SPA_POD_TYPE(pod),
+	const char *media_type;
-			SPA_POD_BODY(pod),
+	const char *media_subtype;
-			SPA_POD_BODY_SIZE(pod));
+	struct spa_pod *pod;
+	uint32_t mtype, mstype;
+	const char *pod_type_names[] = {
+		[SPA_POD_TYPE_INVALID] = "invalid",
+		[SPA_POD_TYPE_NONE] = "none",
+		[SPA_POD_TYPE_BOOL] = "bool",
+		[SPA_POD_TYPE_ID] = "id",
+		[SPA_POD_TYPE_INT] = "int",
+		[SPA_POD_TYPE_LONG] = "long",
+		[SPA_POD_TYPE_FLOAT] = "float",
+		[SPA_POD_TYPE_DOUBLE] = "double",
+		[SPA_POD_TYPE_STRING] = "string",
+		[SPA_POD_TYPE_BYTES] = "bytes",
+		[SPA_POD_TYPE_RECTANGLE] = "rectangle",
+		[SPA_POD_TYPE_FRACTION] = "fraction",
+		[SPA_POD_TYPE_BITMAP] = "bitmap",
+		[SPA_POD_TYPE_ARRAY] = "array",
+		[SPA_POD_TYPE_STRUCT] = "struct",
+		[SPA_POD_TYPE_OBJECT] = "object",
+		[SPA_POD_TYPE_POINTER] = "pointer",
+		[SPA_POD_TYPE_FD] = "fd",
+		[SPA_POD_TYPE_PROP] = "prop",
+		[SPA_POD_TYPE_POD] = "pod"
+	};
+
+	if (format == NULL || SPA_POD_TYPE(format) != SPA_POD_TYPE_OBJECT)
+		return -EINVAL;
+
+	if (spa_pod_object_parse(format, "I", &mtype,
+					 "I", &mstype) < 0)
+		return -EINVAL;
+
+	media_type = spa_type_map_get_type(map, mtype);
+	media_subtype = spa_type_map_get_type(map, mstype);
+
+	fprintf(stderr, "%-6s %s/%s\n", "", rindex(media_type, ':') + 1,
+		rindex(media_subtype, ':') + 1);
+
+	SPA_POD_OBJECT_FOREACH((struct spa_pod_object*)format, pod) {
+		struct spa_pod_prop *prop;
+		const char *key;
+
+		if (pod->type != SPA_POD_TYPE_PROP)
+			continue;
+
+		prop = (struct spa_pod_prop *)pod;
+
+		if ((prop->body.flags & SPA_POD_PROP_FLAG_UNSET) &&
+		    (prop->body.flags & SPA_POD_PROP_FLAG_OPTIONAL))
+			continue;
+
+		key = spa_type_map_get_type(map, prop->body.key);
+
+		fprintf(stderr, "  %20s : (%s) ", rindex(key, ':') + 1,
+			pod_type_names[prop->body.value.type]);
+
+		if (!(prop->body.flags & SPA_POD_PROP_FLAG_UNSET)) {
+			spa_debug_format_value(map,
+					prop->body.value.type,
+					SPA_POD_BODY(&prop->body.value),
+					prop->body.value.size);
+		} else {
+			const char *ssep, *esep, *sep;
+			void *alt;
+
+			switch (prop->body.flags & SPA_POD_PROP_RANGE_MASK) {
+			case SPA_POD_PROP_RANGE_MIN_MAX:
+			case SPA_POD_PROP_RANGE_STEP:
+				ssep = "[ ";
+				sep = ", ";
+				esep = " ]";
+				break;
+			default:
+			case SPA_POD_PROP_RANGE_ENUM:
+			case SPA_POD_PROP_RANGE_FLAGS:
+				ssep = "{ ";
+				sep = ", ";
+				esep = " }";
+				break;
+			}
+
+			fprintf(stderr, "%s", ssep);
+
+			i = 0;
+			SPA_POD_PROP_ALTERNATIVE_FOREACH(&prop->body, prop->pod.size, alt) {
+				if (i > 0)
+					fprintf(stderr, "%s", sep);
+				spa_debug_format_value(map,
+						prop->body.value.type,
+						alt,
+						prop->body.value.size);
+				i++;
+			}
+			fprintf(stderr, "%s", esep);
+		}
+		fprintf(stderr, "\n");
+	}
+	return 0;
 }
 
 #ifdef __cplusplus

spa/tools/spa-inspect.c

@@ -32,6 +32,7 @@
 #include <spa/param/param.h>
 #include <spa/param/format.h>
 #include <spa/debug/dict.h>
+#include <spa/debug/pod.h>
 #include <spa/debug/format.h>
 
 static SPA_TYPE_MAP_IMPL(default_map, 4096);

src/pipewire/link.c

@@ -32,6 +32,7 @@
 #include "work-queue.h"
 
 #include <spa/debug/node.h>
+#include <spa/debug/pod.h>
 #include <spa/debug/format.h>
 
 #define MAX_BUFFERS     64

src/tools/pipewire-cli.c

@@ -25,6 +25,7 @@
 #include <signal.h>
 #include <string.h>
 
+#include <spa/debug/pod.h>
 #include <spa/debug/format.h>
 
 #include <pipewire/pipewire.h>

src/tools/pipewire-monitor.c

@@ -20,6 +20,7 @@
 #include <stdio.h>
 #include <signal.h>
 
+#include <spa/debug/pod.h>
 #include <spa/debug/format.h>
 
 #include <pipewire/pipewire.h>