From f2a0df9ac224e6c4a91b76d254fb7ae84ef3ac98 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Mon, 5 Jun 2023 10:36:08 +0200 Subject: [PATCH] module-netjack2: lock and force rate and quantum --- src/modules/module-netjack2-driver.c | 13 +++++++++++++ src/modules/module-netjack2-manager.c | 6 ++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/src/modules/module-netjack2-driver.c b/src/modules/module-netjack2-driver.c index d330d5421..4d9ea83db 100644 --- a/src/modules/module-netjack2-driver.c +++ b/src/modules/module-netjack2-driver.c @@ -214,6 +214,7 @@ struct impl { struct stream source; struct stream sink; + uint32_t period_size; uint32_t samplerate; uint64_t frame_time; @@ -827,12 +828,24 @@ static int handle_follower_setup(struct impl *impl, struct nj2_session_params *p impl->sink.info.rate = peer->params.sample_rate; impl->sink.info.channels = peer->params.recv_audio_channels; impl->samplerate = peer->params.sample_rate; + impl->period_size = peer->params.period_size; pw_properties_setf(impl->sink.props, PW_KEY_NODE_DESCRIPTION, "NETJACK2 to %s", peer->params.driver_name); pw_properties_setf(impl->source.props, PW_KEY_NODE_DESCRIPTION, "NETJACK2 from %s", peer->params.driver_name); + pw_properties_setf(impl->sink.props, PW_KEY_NODE_RATE, + "1/%u", impl->samplerate); + pw_properties_set(impl->sink.props, PW_KEY_NODE_FORCE_RATE, "0"); + pw_properties_setf(impl->sink.props, PW_KEY_NODE_FORCE_QUANTUM, + "%u", impl->period_size); + pw_properties_setf(impl->source.props, PW_KEY_NODE_RATE, + "1/%u", impl->samplerate); + pw_properties_set(impl->source.props, PW_KEY_NODE_FORCE_RATE, "0"); + pw_properties_setf(impl->source.props, PW_KEY_NODE_FORCE_QUANTUM, + "%u", impl->period_size); + if ((res = create_filters(impl)) < 0) return res; diff --git a/src/modules/module-netjack2-manager.c b/src/modules/module-netjack2-manager.c index 148232fe7..4ed154d74 100644 --- a/src/modules/module-netjack2-manager.c +++ b/src/modules/module-netjack2-manager.c @@ -860,12 +860,14 @@ static int handle_follower_available(struct impl *impl, struct nj2_session_param follower->samplerate = impl->samplerate; follower->period_size = impl->period_size; - pw_properties_setf(follower->sink.props, PW_KEY_NODE_FORCE_RATE, + pw_properties_setf(follower->sink.props, PW_KEY_NODE_RATE, "1/%u", follower->samplerate); + pw_properties_set(follower->sink.props, PW_KEY_NODE_FORCE_RATE, "0"); pw_properties_setf(follower->sink.props, PW_KEY_NODE_FORCE_QUANTUM, "%u", follower->period_size); - pw_properties_setf(follower->source.props, PW_KEY_NODE_FORCE_RATE, + pw_properties_setf(follower->source.props, PW_KEY_NODE_RATE, "1/%u", follower->samplerate); + pw_properties_set(follower->source.props, PW_KEY_NODE_FORCE_RATE, "0"); pw_properties_setf(follower->source.props, PW_KEY_NODE_FORCE_QUANTUM, "%u", follower->period_size);