mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-10-29 05:40:27 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

audioconvert: run resampler depending on direction

Browse source 
For input streams, first run the resampler and then the channelmix. This
ensures that the channelmix is run with the rate of the graph instead
of the rate of the input. This is nicer because rate and quantum align
with the graph and the sample accurate volume ramps will work as
intended.

For output streams, leave the resampler after the channelmix for the same
reasons.
This commit is contained in:
Wim Taymans 2024-12-18 10:02:45 +01:00
parent 3cf9ccf4a7
commit 3fbf84f612
1 changed files with 41 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

24
spa/plugins/audioconvert/audioconvert.c
View file

@ -3191,7 +3191,29 @@ static int impl_node_process(void *object)
out_datas = (void **)src_datas;
}
}
if (this->direction == SPA_DIRECTION_INPUT) {
if (!resample_passthrough) {
uint32_t in_len, out_len;
in_datas = (const void**)out_datas;
if (mix_passthrough && out_passthrough)
out_datas = (void **)dst_remap;
else
out_datas = (void **)this->tmp_datas[(tmp++) & 1];
in_len = n_samples;
out_len = n_out;
resample_process(&this->resample, in_datas, &in_len, out_datas, &out_len);
spa_log_trace_fp(this->log, "%p: resample %d/%d -> %d/%d %d", this,
n_samples, in_len, n_out, out_len, out_passthrough);
this->in_offset += in_len;
n_samples = out_len;
resample_passthrough = true;
} else {
n_samples = SPA_MIN(n_samples, n_out);
this->in_offset += n_samples;
}
}
if (!mix_passthrough) {
in_datas = (const void**)out_datas;
if (resample_passthrough && out_passthrough) {
@ -3219,6 +3241,7 @@ static int impl_node_process(void *object)
channelmix_process(&this->mix, out_datas, in_datas, n_samples);
}
}
if (this->direction == SPA_DIRECTION_OUTPUT) {
if (!resample_passthrough) {
uint32_t in_len, out_len;
@ -3239,6 +3262,7 @@ static int impl_node_process(void *object)
n_samples = SPA_MIN(n_samples, n_out);
this->in_offset += n_samples;
}
}
this->out_offset += n_samples;
if (!out_passthrough) {