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

module-netjack2: improve channel positions

Browse source 
If the manager gave us a different channel count than we had by
default or configured, assume everything is AUX channels.

Also handle the case where the manager is sending more than our
MAX_CHANNELS channels.
This commit is contained in:
Wim Taymans 2024-01-25 17:59:39 +01:00
parent 31a08028ee
commit 3e49e056ef
1 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/modules/module-netjack2-driver.c
View file

@ -416,7 +416,7 @@ static void make_stream_ports(struct stream *s)
if (i < s->info.channels) { if (i < s->info.channels) {
str = spa_debug_type_find_short_name(spa_type_audio_channel, str = spa_debug_type_find_short_name(spa_type_audio_channel,
s->info.position[i]); s->info.position[i % SPA_AUDIO_MAX_CHANNELS]);
if (str) if (str)
snprintf(name, sizeof(name), "%s_%s", prefix, str); snprintf(name, sizeof(name), "%s_%s", prefix, str);
else else
@ -819,6 +819,7 @@ static int handle_follower_setup(struct impl *impl, struct nj2_session_params *p
{ {
int res; int res;
struct netjack2_peer *peer = &impl->peer; struct netjack2_peer *peer = &impl->peer;
uint32_t i;
pw_log_info("got follower setup"); pw_log_info("got follower setup");
nj2_dump_session_params(params); nj2_dump_session_params(params);
@ -842,10 +843,18 @@ static int handle_follower_setup(struct impl *impl, struct nj2_session_params *p
impl->source.n_ports = peer->params.send_audio_channels + peer->params.send_midi_channels; impl->source.n_ports = peer->params.send_audio_channels + peer->params.send_midi_channels;
impl->source.info.rate = peer->params.sample_rate; impl->source.info.rate = peer->params.sample_rate;
impl->source.info.channels = peer->params.send_audio_channels; if ((uint32_t)peer->params.send_audio_channels != impl->source.info.channels) {
impl->source.info.channels = peer->params.send_audio_channels;
for (i = 0; i < SPA_MIN(impl->source.info.channels, SPA_AUDIO_MAX_CHANNELS); i++)
impl->source.info.position[i] = SPA_AUDIO_CHANNEL_AUX0 + i;
}
impl->sink.n_ports = peer->params.recv_audio_channels + peer->params.recv_midi_channels; impl->sink.n_ports = peer->params.recv_audio_channels + peer->params.recv_midi_channels;
impl->sink.info.rate = peer->params.sample_rate; impl->sink.info.rate = peer->params.sample_rate;
impl->sink.info.channels = peer->params.recv_audio_channels; if ((uint32_t)peer->params.recv_audio_channels != impl->sink.info.channels) {
impl->sink.info.channels = peer->params.recv_audio_channels;
for (i = 0; i < SPA_MIN(impl->sink.info.channels, SPA_AUDIO_MAX_CHANNELS); i++)
impl->sink.info.position[i] = SPA_AUDIO_CHANNEL_AUX0 + i;
}
impl->samplerate = peer->params.sample_rate; impl->samplerate = peer->params.sample_rate;
impl->period_size = peer->params.period_size; impl->period_size = peer->params.period_size;