mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-10-31 22:25:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

module-netjack2: lock and force rate and quantum

Browse source
This commit is contained in:
Wim Taymans 2023-06-05 10:36:08 +02:00
parent 407ee3940c
commit f2a0df9ac2
2 changed files with 17 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -214,6 +214,7 @@ struct impl {
struct stream source; struct stream source;
struct stream sink; struct stream sink;
uint32_t period_size;
uint32_t samplerate; uint32_t samplerate;
uint64_t frame_time; 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.rate = peer->params.sample_rate;
impl->sink.info.channels = peer->params.recv_audio_channels; impl->sink.info.channels = peer->params.recv_audio_channels;
impl->samplerate = peer->params.sample_rate; 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", pw_properties_setf(impl->sink.props, PW_KEY_NODE_DESCRIPTION, "NETJACK2 to %s",
peer->params.driver_name); peer->params.driver_name);
pw_properties_setf(impl->source.props, PW_KEY_NODE_DESCRIPTION, "NETJACK2 from %s", pw_properties_setf(impl->source.props, PW_KEY_NODE_DESCRIPTION, "NETJACK2 from %s",
peer->params.driver_name); 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) if ((res = create_filters(impl)) < 0)
return res; return res;

6
src/modules/module-netjack2-manager.c
View file

@ -860,12 +860,14 @@ static int handle_follower_available(struct impl *impl, struct nj2_session_param
follower->samplerate = impl->samplerate; follower->samplerate = impl->samplerate;
follower->period_size = impl->period_size; 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); "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, pw_properties_setf(follower->sink.props, PW_KEY_NODE_FORCE_QUANTUM,
"%u", follower->period_size); "%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); "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, pw_properties_setf(follower->source.props, PW_KEY_NODE_FORCE_QUANTUM,
"%u", follower->period_size); "%u", follower->period_size);