From bf9236ec8ded13be64367b5dda55cb45dfe3f1ce Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Thu, 2 Mar 2023 12:33:40 +0100
Subject: [PATCH] module-rtp: improve node name and description

Don't auto connect audio either. There are more meant as source/sink
pairs.
---
 src/modules/module-rtp-session.c | 21 +++++++--------------
 src/modules/module-rtp/stream.c  |  1 -
 2 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/src/modules/module-rtp-session.c b/src/modules/module-rtp-session.c
index dd845cacc..4621ae000 100644
--- a/src/modules/module-rtp-session.c
+++ b/src/modules/module-rtp-session.c
@@ -826,7 +826,7 @@ short_packet:
 	pw_log_warn("short packet received");
 	return;
 unknown_ssrc:
-	pw_log_warn("unknown SSRC %08x", ssrc);
+	pw_log_debug("unknown SSRC %08x", ssrc);
 	return;
 }
 
@@ -1069,7 +1069,7 @@ static struct service *make_service(struct impl *impl, const struct service_info
 	struct service *s = NULL;
 	char at[AVAHI_ADDRESS_STR_MAX];
 	struct session *sess;
-	int res;
+	int res, ipv;
 	struct pw_properties *props = NULL;
 	const char *service_name, *str;
 	AvahiStringList *l;
@@ -1143,22 +1143,15 @@ static struct service *make_service(struct impl *impl, const struct service_info
 	avahi_address_snprint(at, sizeof(at), &s->info.address);
 	pw_log_info("create session: %s %s:%u %s", s->info.name, at, s->info.port, s->info.type);
 
+	ipv = s->info.protocol == AVAHI_PROTO_INET ? 4 : 6;
 	pw_properties_set(props, "sess.name", s->info.name);
-	pw_properties_setf(props, "node.name", "%s (%s IP%d)",
-			s->info.name, s->info.host_name,
-			s->info.protocol == AVAHI_PROTO_INET ? 4 : 6);
+	pw_properties_setf(props, PW_KEY_NODE_NAME, "rtp_session.%s.%s.ipv%d",
+			s->info.name, s->info.host_name, ipv);
+	pw_properties_setf(props, PW_KEY_NODE_DESCRIPTION, "%s (IPv%d)",
+			s->info.name, ipv);
 	pw_properties_setf(props, "destination.ip", "%s", at);
 	pw_properties_setf(props, "destination.port", "%u", s->info.port);
 
-	if ((str = strstr(s->info.name, "@"))) {
-		str++;
-		if (strlen(str) > 0)
-			pw_properties_set(props, PW_KEY_NODE_DESCRIPTION, str);
-		else
-			pw_properties_setf(props, PW_KEY_NODE_DESCRIPTION,
-					"rtp-midi on %s", s->info.host_name);
-	}
-
 	sess = make_session(impl, props);
 	props = NULL;
 	if (sess == NULL) {
diff --git a/src/modules/module-rtp/stream.c b/src/modules/module-rtp/stream.c
index 9e59240e9..fdb97446b 100644
--- a/src/modules/module-rtp/stream.c
+++ b/src/modules/module-rtp/stream.c
@@ -385,7 +385,6 @@ struct rtp_stream *rtp_stream_new(struct pw_core *core,
 	case SPA_MEDIA_TYPE_audio:
 		params[n_params++] = spa_format_audio_build(&b,
 				SPA_PARAM_EnumFormat, &impl->info);
-		flags |= PW_STREAM_FLAG_AUTOCONNECT;
 		if (direction == SPA_DIRECTION_INPUT)
 			impl->stream_events.process = process_audio_capture;
 		else