mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-04 13:30:12 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

module-rtp: add opus to mDNS

Browse source
This commit is contained in:
Wim Taymans 2023-03-13 12:48:13 +01:00
parent bc6c19ccdf
commit d2f7d5efe7
1 changed files with 24 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/modules/module-rtp-session.c
View file

@ -64,7 +64,7 @@
* - `sess.name = <str>`: a session name * - `sess.name = <str>`: a session name
* - `sess.ts-offset = <int>`: an offset to apply to the timestamp, default -1 = random offset * - `sess.ts-offset = <int>`: an offset to apply to the timestamp, default -1 = random offset
* - `sess.ts-refclk = <string>`: the name of a reference clock * - `sess.ts-refclk = <string>`: the name of a reference clock
* - `sess.media = <string>`: the media type audio|midi, default midi * - `sess.media = <string>`: the media type audio|midi|opus, default midi
* - `stream.props = {}`: properties to be passed to the stream * - `stream.props = {}`: properties to be passed to the stream
* *
* ## General options * ## General options
@ -133,7 +133,7 @@ PW_LOG_TOPIC_STATIC(mod_topic, "mod." NAME);
"sess.name=<a name for the session> " \ "sess.name=<a name for the session> " \
"sess.min-ptime=<minimum packet time in milliseconds, default:2> " \ "sess.min-ptime=<minimum packet time in milliseconds, default:2> " \
"sess.max-ptime=<maximum packet time in milliseconds, default:20> " \ "sess.max-ptime=<maximum packet time in milliseconds, default:20> " \
"sess.media=<string, the media type audio|midi, default audio> " \ "sess.media=<string, the media type audio|midi|opus, default audio> " \
"audio.format=<format, default:"DEFAULT_FORMAT"> " \ "audio.format=<format, default:"DEFAULT_FORMAT"> " \
"audio.rate=<sample rate, default:"SPA_STRINGIFY(DEFAULT_RATE)"> " \ "audio.rate=<sample rate, default:"SPA_STRINGIFY(DEFAULT_RATE)"> " \
"audio.channels=<number of channels, default:"SPA_STRINGIFY(DEFAULT_CHANNELS)"> "\ "audio.channels=<number of channels, default:"SPA_STRINGIFY(DEFAULT_CHANNELS)"> "\
@ -646,7 +646,7 @@ static struct session *make_session(struct impl *impl, struct pw_properties *pro
str = pw_properties_get(props, "sess.media"); str = pw_properties_get(props, "sess.media");
if (spa_streq(str, "midi")) if (spa_streq(str, "midi"))
media = "Midi"; media = "Midi";
else if (spa_streq(str, "audio")) else if (spa_streq(str, "audio") || spa_streq(str, "opus"))
media = "Audio"; media = "Audio";
if (media != NULL) { if (media != NULL) {
@ -1289,7 +1289,7 @@ static const char *get_service_name(struct impl *impl)
str = pw_properties_get(impl->props, "sess.media"); str = pw_properties_get(impl->props, "sess.media");
if (spa_streq(str, "midi")) if (spa_streq(str, "midi"))
return "_apple-midi._udp"; return "_apple-midi._udp";
else if (spa_streq(str, "audio")) else if (spa_streq(str, "audio") || spa_streq(str, "opus"))
return "_pipewire-audio._udp"; return "_pipewire-audio._udp";
return NULL; return NULL;
} }
@ -1324,15 +1324,18 @@ static struct service *make_service(struct impl *impl, const struct service_info
if (avahi_string_list_get_pair(l, &key, &value, NULL) != 0) if (avahi_string_list_get_pair(l, &key, &value, NULL) != 0)
break; break;
if (spa_streq(key, "format")) { if (spa_streq(key, "subtype")) {
k = PW_KEY_AUDIO_FORMAT; k = "sess.media";
mask |= 1<<0; mask |= 1<<0;
} else if (spa_streq(key, "format")) {
k = PW_KEY_AUDIO_FORMAT;
mask |= 1<<1;
} else if (spa_streq(key, "rate")) { } else if (spa_streq(key, "rate")) {
k = PW_KEY_AUDIO_RATE; k = PW_KEY_AUDIO_RATE;
mask |= 1<<1; mask |= 1<<2;
} else if (spa_streq(key, "channels")) { } else if (spa_streq(key, "channels")) {
k = PW_KEY_AUDIO_CHANNELS; k = PW_KEY_AUDIO_CHANNELS;
mask |= 1<<2; mask |= 1<<3;
} else if (spa_streq(key, "channelnames")) { } else if (spa_streq(key, "channelnames")) {
pw_properties_set(props, pw_properties_set(props,
PW_KEY_NODE_CHANNELNAMES, value); PW_KEY_NODE_CHANNELNAMES, value);
@ -1356,7 +1359,10 @@ static struct service *make_service(struct impl *impl, const struct service_info
avahi_free(key); avahi_free(key);
avahi_free(value); avahi_free(value);
} }
if (mask != 0x7) str = pw_properties_get(props, "sess.media");
if (spa_streq(str, "opus") && mask != 0xd)
compatible = false;
if (spa_streq(str, "audio") && mask != 0xf)
compatible = false; compatible = false;
} }
if (!compatible) { if (!compatible) {
@ -1572,6 +1578,8 @@ static int make_announce(struct impl *impl)
avahi_entry_group_reset(impl->group); avahi_entry_group_reset(impl->group);
if (spa_streq(service_name, "_pipewire-audio._udp")) { if (spa_streq(service_name, "_pipewire-audio._udp")) {
str = pw_properties_get(impl->props, "sess.media");
txt = avahi_string_list_add_pair(txt, "subtype", str);
if ((str = pw_properties_get(impl->stream_props, PW_KEY_AUDIO_FORMAT)) != NULL) if ((str = pw_properties_get(impl->stream_props, PW_KEY_AUDIO_FORMAT)) != NULL)
txt = avahi_string_list_add_pair(txt, "format", str); txt = avahi_string_list_add_pair(txt, "format", str);
if ((str = pw_properties_get(impl->stream_props, PW_KEY_AUDIO_RATE)) != NULL) if ((str = pw_properties_get(impl->stream_props, PW_KEY_AUDIO_RATE)) != NULL)
@ -1735,6 +1743,13 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args)
{ "audio.position", DEFAULT_POSITION } }; { "audio.position", DEFAULT_POSITION } };
pw_properties_add(stream_props, &SPA_DICT_INIT_ARRAY(items)); pw_properties_add(stream_props, &SPA_DICT_INIT_ARRAY(items));
} }
else if (spa_streq(str, "opus")) {
struct spa_dict_item items[] = {
{ "audio.rate", SPA_STRINGIFY(DEFAULT_RATE) },
{ "audio.channels", SPA_STRINGIFY(DEFAULT_CHANNELS) },
{ "audio.position", DEFAULT_POSITION } };
pw_properties_add(stream_props, &SPA_DICT_INIT_ARRAY(items));
}
str = pw_properties_get(props, "local.ifname"); str = pw_properties_get(props, "local.ifname");
impl->ifname = str ? strdup(str) : NULL; impl->ifname = str ? strdup(str) : NULL;