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

pulse-tunnel: pass latency as msec

Browse source
This commit is contained in:
Wim Taymans 2021-09-30 09:35:49 +02:00
parent abd5f9fbe8
commit 696dbf7cd6
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/modules/module-pulse-tunnel.c
View file

@ -68,7 +68,7 @@ PW_LOG_TOPIC_STATIC(mod_topic, "mod." NAME);
"[ audio.channels=<number of channels> ] " \ "[ audio.channels=<number of channels> ] " \
"[ audio.position=<channel map> ] " \ "[ audio.position=<channel map> ] " \
"pulse.server.address=<address> " \ "pulse.server.address=<address> " \
"pulse.latency=<latency in usec> " \ "pulse.latency=<latency in msec> " \
"[ tunnel.mode=capture|playback " \ "[ tunnel.mode=capture|playback " \
"[ stream.props=<properties> ] " "[ stream.props=<properties> ] "
@ -83,7 +83,7 @@ static const struct spa_dict_item module_props[] = {
#define RINGBUFFER_SIZE (1u << 22) #define RINGBUFFER_SIZE (1u << 22)
#define RINGBUFFER_MASK (RINGBUFFER_SIZE-1) #define RINGBUFFER_MASK (RINGBUFFER_SIZE-1)
#define DEFAULT_LATENCY_USEC (100 * PA_USEC_PER_MSEC) #define DEFAULT_LATENCY_MSEC (100)
struct impl { struct impl {
struct pw_context *context; struct pw_context *context;
@ -102,7 +102,7 @@ struct impl {
struct spa_hook core_proxy_listener; struct spa_hook core_proxy_listener;
struct spa_hook core_listener; struct spa_hook core_listener;
uint64_t latency_usec; uint32_t latency_msec;
struct pw_properties *stream_props; struct pw_properties *stream_props;
struct pw_stream *stream; struct pw_stream *stream;
@ -328,7 +328,7 @@ static int create_stream(struct impl *impl)
spa_zero(latency); spa_zero(latency);
latency.direction = impl->mode == MODE_CAPTURE ? PW_DIRECTION_OUTPUT : PW_DIRECTION_INPUT; latency.direction = impl->mode == MODE_CAPTURE ? PW_DIRECTION_OUTPUT : PW_DIRECTION_INPUT;
latency.min_ns = latency.max_ns = impl->latency_usec * 1000; latency.min_ns = latency.max_ns = impl->latency_msec * SPA_NSEC_PER_MSEC;
params[n_params++] = spa_latency_build(&b, params[n_params++] = spa_latency_build(&b,
SPA_PARAM_Latency, &latency); SPA_PARAM_Latency, &latency);
@ -558,7 +558,7 @@ static int create_pulse_stream(struct impl *impl)
bufferattr.prebuf = (uint32_t) -1; bufferattr.prebuf = (uint32_t) -1;
if (impl->mode == MODE_CAPTURE) { if (impl->mode == MODE_CAPTURE) {
bufferattr.fragsize = pa_usec_to_bytes(impl->latency_usec, &ss); bufferattr.fragsize = pa_usec_to_bytes(impl->latency_msec * SPA_USEC_PER_MSEC, &ss);
res = pa_stream_connect_record(impl->pa_stream, res = pa_stream_connect_record(impl->pa_stream,
remote_node_target, &bufferattr, remote_node_target, &bufferattr,
@ -566,7 +566,7 @@ static int create_pulse_stream(struct impl *impl)
PA_STREAM_ADJUST_LATENCY | PA_STREAM_ADJUST_LATENCY |
PA_STREAM_AUTO_TIMING_UPDATE); PA_STREAM_AUTO_TIMING_UPDATE);
} else { } else {
bufferattr.tlength = pa_usec_to_bytes(impl->latency_usec, &ss); bufferattr.tlength = pa_usec_to_bytes(impl->latency_msec * SPA_USEC_PER_MSEC, &ss);
res = pa_stream_connect_playback(impl->pa_stream, res = pa_stream_connect_playback(impl->pa_stream,
remote_node_target, &bufferattr, remote_node_target, &bufferattr,
@ -786,9 +786,9 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args)
} }
} }
impl->latency_usec = DEFAULT_LATENCY_USEC; impl->latency_msec = DEFAULT_LATENCY_MSEC;
if ((str = pw_properties_get(props, "pulse.latency")) != NULL) if ((str = pw_properties_get(props, "pulse.latency")) != NULL)
spa_atou64(str, &impl->latency_usec, 0); spa_atou32(str, &impl->latency_msec, 0);
if (pw_properties_get(props, PW_KEY_NODE_GROUP) == NULL) if (pw_properties_get(props, PW_KEY_NODE_GROUP) == NULL)
pw_properties_set(props, PW_KEY_NODE_GROUP, "pipewire.dummy"); pw_properties_set(props, PW_KEY_NODE_GROUP, "pipewire.dummy");