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

module-loopback: recalc delay when starting

Browse source 
So that we can use the graph rate in case we are configured to follow
the graph rate.
This commit is contained in:
Wim Taymans 2023-06-28 12:36:42 +02:00
parent e3a41b2c49
commit c671c46b87
1 changed files with 65 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

102
src/modules/module-loopback.c
View file

@ -142,6 +142,8 @@ static const struct spa_dict_item module_props[] = {
{ PW_KEY_MODULE_VERSION, PACKAGE_VERSION }, { PW_KEY_MODULE_VERSION, PACKAGE_VERSION },
}; };
#define DEFAULT_RATE 48000
#include <stdlib.h> #include <stdlib.h>
#include <signal.h> #include <signal.h>
#include <getopt.h> #include <getopt.h>
@ -180,7 +182,9 @@ struct impl {
unsigned int do_disconnect:1; unsigned int do_disconnect:1;
unsigned int recalc_delay:1; unsigned int recalc_delay:1;
struct spa_audio_info_raw delay_info; struct spa_io_position *position;
struct spa_audio_info_raw info;
uint32_t rate;
float target_delay; float target_delay;
struct spa_ringbuffer buffer; struct spa_ringbuffer buffer;
uint8_t *buffer_data; uint8_t *buffer_data;
@ -196,7 +200,7 @@ static void capture_destroy(void *d)
static void recalculate_delay(struct impl *impl) static void recalculate_delay(struct impl *impl)
{ {
uint32_t target = impl->delay_info.rate * impl->target_delay, cdelay, pdelay; uint32_t target = impl->rate * impl->target_delay, cdelay, pdelay;
uint32_t delay, w; uint32_t delay, w;
struct pw_time pwt; struct pw_time pwt;
@ -332,6 +336,30 @@ static void param_latency_changed(struct impl *impl, const struct spa_pod *param
impl->recalc_delay = true; impl->recalc_delay = true;
} }
static void recalculate_buffer(struct impl *impl)
{
if (impl->target_delay > 0.0f) {
uint32_t delay = impl->rate * impl->target_delay;
void *data;
impl->buffer_size = (delay + (1u<<15)) * 4;
data = realloc(impl->buffer_data, impl->buffer_size * impl->info.channels);
if (data == NULL) {
pw_log_warn("can't allocate delay buffer, delay disabled: %m");
impl->buffer_size = 0;
free(impl->buffer_data);
}
impl->buffer_data = data;
spa_ringbuffer_init(&impl->buffer);
} else {
impl->buffer_size = 0;
free(impl->buffer_data);
impl->buffer_data = NULL;
}
pw_log_info("configured delay:%f buffer:%d", impl->target_delay, impl->buffer_size);
impl->recalc_delay = true;
}
static void stream_state_changed(void *data, enum pw_stream_state old, static void stream_state_changed(void *data, enum pw_stream_state old,
enum pw_stream_state state, const char *error) enum pw_stream_state state, const char *error)
{ {
@ -349,35 +377,23 @@ static void stream_state_changed(void *data, enum pw_stream_state old,
case PW_STREAM_STATE_ERROR: case PW_STREAM_STATE_ERROR:
pw_log_info("module %p: error: %s", impl, error); pw_log_info("module %p: error: %s", impl, error);
break; break;
case PW_STREAM_STATE_STREAMING:
{
uint32_t target = impl->info.rate;
if (target == 0)
target = impl->position ?
impl->position->clock.target_rate.denom : DEFAULT_RATE;
if (impl->rate != target) {
impl->rate = target;
recalculate_buffer(impl);
}
break;
}
default: default:
break; break;
} }
} }
static void recalculate_buffer(struct impl *impl)
{
if (impl->target_delay > 0.0f) {
uint32_t delay = impl->delay_info.rate * impl->target_delay;
void *data;
impl->buffer_size = (delay + (1u<<15)) * 4;
data = realloc(impl->buffer_data, impl->buffer_size * impl->delay_info.channels);
if (data == NULL) {
pw_log_warn("can't allocate delay buffer, delay disabled: %m");
impl->buffer_size = 0;
free(impl->buffer_data);
}
impl->buffer_data = data;
spa_ringbuffer_init(&impl->buffer);
} else {
impl->buffer_size = 0;
free(impl->buffer_data);
impl->buffer_data = NULL;
}
pw_log_info("configured delay:%f buffer:%d", impl->target_delay, impl->buffer_size);
impl->recalc_delay = true;
}
static void capture_param_changed(void *data, uint32_t id, const struct spa_pod *param) static void capture_param_changed(void *data, uint32_t id, const struct spa_pod *param)
{ {
struct impl *impl = data; struct impl *impl = data;
@ -386,17 +402,15 @@ static void capture_param_changed(void *data, uint32_t id, const struct spa_pod
case SPA_PARAM_Format: case SPA_PARAM_Format:
{ {
struct spa_audio_info_raw info; struct spa_audio_info_raw info;
if (param == NULL) spa_zero(info);
return; if (param != NULL) {
if (spa_format_audio_raw_parse(param, &info) < 0) if (spa_format_audio_raw_parse(param, &info) < 0 ||
return; info.channels == 0 ||
if (info.rate == 0 || info.channels > SPA_AUDIO_MAX_CHANNELS)
info.channels == 0 || return;
info.channels > SPA_AUDIO_MAX_CHANNELS) }
return; impl->rate = 0;
impl->info = info;
impl->delay_info = info;
recalculate_buffer(impl);
break; break;
} }
case SPA_PARAM_Latency: case SPA_PARAM_Latency:
@ -405,12 +419,25 @@ static void capture_param_changed(void *data, uint32_t id, const struct spa_pod
} }
} }
static void io_changed(void *data, uint32_t id, void *area, uint32_t size)
{
struct impl *impl = data;
switch (id) {
case SPA_IO_Position:
impl->position = area;
break;
default:
break;
}
}
static const struct pw_stream_events in_stream_events = { static const struct pw_stream_events in_stream_events = {
PW_VERSION_STREAM_EVENTS, PW_VERSION_STREAM_EVENTS,
.destroy = capture_destroy, .destroy = capture_destroy,
.process = capture_process, .process = capture_process,
.state_changed = stream_state_changed, .state_changed = stream_state_changed,
.param_changed = capture_param_changed, .param_changed = capture_param_changed,
.io_changed = io_changed,
}; };
static void playback_destroy(void *d) static void playback_destroy(void *d)
@ -436,6 +463,7 @@ static const struct pw_stream_events out_stream_events = {
.process = playback_process, .process = playback_process,
.state_changed = stream_state_changed, .state_changed = stream_state_changed,
.param_changed = playback_param_changed, .param_changed = playback_param_changed,
.io_changed = io_changed,
}; };
static int setup_streams(struct impl *impl) static int setup_streams(struct impl *impl)