mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-12-25 08:57:14 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

module-netjack2: improve OPUS fallback

Browse source
This commit is contained in:
Wim Taymans 2023-06-12 18:37:47 +02:00
parent deba261a1b
commit da86c2030c
2 changed files with 24 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -810,6 +810,20 @@ static void update_timer(struct impl *impl, uint64_t timeout)
pw_loop_update_timer(impl->main_loop, impl->timer, &value, &interval, false);
}
static bool encoding_supported(uint32_t encoder)
{
switch (encoder) {
case NJ2_ENCODER_FLOAT:
case NJ2_ENCODER_INT:
return true;
#ifdef HAVE_OPUS
case NJ2_ENCODER_OPUS:
return true;
#endif
}
return false;
}
static int handle_follower_setup(struct impl *impl, struct nj2_session_params *params,
struct sockaddr_storage *addr, socklen_t addr_len)
{
@ -829,9 +843,7 @@ static int handle_follower_setup(struct impl *impl, struct nj2_session_params *p
peer->params.recv_midi_channels < 0 ||
peer->params.sample_rate == 0 ||
peer->params.period_size == 0 ||
(peer->params.sample_encoder != NJ2_ENCODER_FLOAT &&
peer->params.sample_encoder != NJ2_ENCODER_OPUS &&
peer->params.sample_encoder != NJ2_ENCODER_INT)) {
!encoding_supported(peer->params.sample_encoder)) {
pw_log_warn("invalid follower setup");
return -EINVAL;
}