From 8047a37b02e2941a2ac113966b8aecc871c110ea Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Wed, 18 Jun 2025 15:23:16 +0200
Subject: [PATCH] spa: remove control type from formats

We just want to negotiate the control stream, we don't really care
about what is in the control stream.
---
 spa/plugins/audioconvert/audioconvert.c        | 8 ++------
 spa/plugins/bluez5/midi-node.c                 | 6 ++----
 spa/plugins/videoconvert/videoconvert-ffmpeg.c | 8 ++------
 3 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/spa/plugins/audioconvert/audioconvert.c b/spa/plugins/audioconvert/audioconvert.c
index 04069a44a..14a2935f4 100644
--- a/spa/plugins/audioconvert/audioconvert.c
+++ b/spa/plugins/audioconvert/audioconvert.c
@@ -2615,9 +2615,7 @@ static int port_param_enum_formats(struct impl *impl, struct port *port, uint32_
 			*param = spa_pod_builder_add_object(b,
 				SPA_TYPE_OBJECT_Format, id,
 				SPA_FORMAT_mediaType,      SPA_POD_Id(SPA_MEDIA_TYPE_application),
-				SPA_FORMAT_mediaSubtype,   SPA_POD_Id(SPA_MEDIA_SUBTYPE_control),
-				SPA_FORMAT_CONTROL_types,  SPA_POD_CHOICE_FLAGS_Int(
-					(1u<<SPA_CONTROL_UMP) | (1u<<SPA_CONTROL_Properties)));
+				SPA_FORMAT_mediaSubtype,   SPA_POD_Id(SPA_MEDIA_SUBTYPE_control));
 		} else {
 			struct spa_pod_frame f[1];
 			uint32_t rate = impl->io_position ?
@@ -2688,9 +2686,7 @@ static int port_param_format(struct impl *impl, struct port *port, uint32_t id,
 		*param = spa_pod_builder_add_object(b,
 			SPA_TYPE_OBJECT_Format,  id,
 			SPA_FORMAT_mediaType,    SPA_POD_Id(SPA_MEDIA_TYPE_application),
-			SPA_FORMAT_mediaSubtype, SPA_POD_Id(SPA_MEDIA_SUBTYPE_control),
-			SPA_FORMAT_CONTROL_types,  SPA_POD_Int(
-				(1u<<SPA_CONTROL_UMP) | (1u<<SPA_CONTROL_Properties)));
+			SPA_FORMAT_mediaSubtype, SPA_POD_Id(SPA_MEDIA_SUBTYPE_control));
 	else
 		*param = spa_format_audio_raw_build(b, id, &port->format.info.raw);
 
diff --git a/spa/plugins/bluez5/midi-node.c b/spa/plugins/bluez5/midi-node.c
index 0436f12bc..9be26dd59 100644
--- a/spa/plugins/bluez5/midi-node.c
+++ b/spa/plugins/bluez5/midi-node.c
@@ -1567,8 +1567,7 @@ next:
 		param = spa_pod_builder_add_object(&b,
 				SPA_TYPE_OBJECT_Format, SPA_PARAM_EnumFormat,
 				SPA_FORMAT_mediaType,	   SPA_POD_Id(SPA_MEDIA_TYPE_application),
-				SPA_FORMAT_mediaSubtype,   SPA_POD_Id(SPA_MEDIA_SUBTYPE_control),
-				SPA_FORMAT_CONTROL_types,  SPA_POD_CHOICE_FLAGS_Int(1u<<SPA_CONTROL_UMP));
+				SPA_FORMAT_mediaSubtype,   SPA_POD_Id(SPA_MEDIA_SUBTYPE_control));
 		break;
 
 	case SPA_PARAM_Format:
@@ -1580,8 +1579,7 @@ next:
 		param = spa_pod_builder_add_object(&b,
 				SPA_TYPE_OBJECT_Format, SPA_PARAM_Format,
 				SPA_FORMAT_mediaType,	   SPA_POD_Id(SPA_MEDIA_TYPE_application),
-				SPA_FORMAT_mediaSubtype,   SPA_POD_Id(SPA_MEDIA_SUBTYPE_control),
-				SPA_FORMAT_CONTROL_types,  SPA_POD_Int(1u<<SPA_CONTROL_UMP));
+				SPA_FORMAT_mediaSubtype,   SPA_POD_Id(SPA_MEDIA_SUBTYPE_control));
 		break;
 
 	case SPA_PARAM_Buffers:
diff --git a/spa/plugins/videoconvert/videoconvert-ffmpeg.c b/spa/plugins/videoconvert/videoconvert-ffmpeg.c
index e8253e883..9ab8fddeb 100644
--- a/spa/plugins/videoconvert/videoconvert-ffmpeg.c
+++ b/spa/plugins/videoconvert/videoconvert-ffmpeg.c
@@ -1414,9 +1414,7 @@ static int port_param_enum_format(struct impl *this, struct port *port, uint32_t
 			*param = spa_pod_builder_add_object(b,
 					SPA_TYPE_OBJECT_Format, id,
 					SPA_FORMAT_mediaType,      SPA_POD_Id(SPA_MEDIA_TYPE_application),
-					SPA_FORMAT_mediaSubtype,   SPA_POD_Id(SPA_MEDIA_SUBTYPE_control),
-					SPA_FORMAT_CONTROL_types,  SPA_POD_CHOICE_FLAGS_Int(
-						(1u<<SPA_CONTROL_UMP) | (1u<<SPA_CONTROL_Properties)));
+					SPA_FORMAT_mediaSubtype,   SPA_POD_Id(SPA_MEDIA_SUBTYPE_control));
 			return 1;
 		} else if (other->have_format) {
 			/* peer format */
@@ -1477,9 +1475,7 @@ static int port_param_format(struct impl *this, struct port *port, uint32_t id,
 		*param = spa_pod_builder_add_object(b,
 			SPA_TYPE_OBJECT_Format,  id,
 			SPA_FORMAT_mediaType,    SPA_POD_Id(SPA_MEDIA_TYPE_application),
-			SPA_FORMAT_mediaSubtype, SPA_POD_Id(SPA_MEDIA_SUBTYPE_control),
-			SPA_FORMAT_CONTROL_types,  SPA_POD_Int(
-				(1u<<SPA_CONTROL_UMP) | (1u<<SPA_CONTROL_Properties)));
+			SPA_FORMAT_mediaSubtype, SPA_POD_Id(SPA_MEDIA_SUBTYPE_control));
 	} else {
 		*param = spa_format_video_build(b, id, &port->format);
 	}