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

audioconvert: fix input remapping

Browse source 
As currently implemented, input format convert channel remap is no-op.
This is because although the out_datas array is permuted, the original
pointer array is not referred to later on, so the only effect is that
the temporary data array is stored in permuted order.

Fix the permutation by permuting the pointers only for the conversion
step.
This commit is contained in:
Pauli Virtanen 2022-07-18 17:22:30 +03:00 • committed by Wim Taymans
parent 4eb81b13ac
commit 977d6e2321
1 changed files with 22 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2509,19 +2509,29 @@ static int impl_node_process(void *object)
out_datas = (void **)dst_remap;
else
out_datas = (void **)this->tmp_datas[(tmp++) & 1];
} else {
out_datas = (void **)src_datas;
}
if (dir->need_remap) {
for (i = 0; i < dir->conv.n_channels; i++) {
remap_src_datas[i] = out_datas[dir->remap[i]];
spa_log_trace_fp(this->log, "%p: input remap %d -> %d", this, dir->remap[i], i);
if (dir->need_remap) {
for (i = 0; i < dir->conv.n_channels; i++) {
remap_src_datas[i] = out_datas[dir->remap[i]];
spa_log_trace_fp(this->log, "%p: input remap %d -> %d", this, dir->remap[i], i);
}
} else {
for (i = 0; i < dir->conv.n_channels; i++)
remap_src_datas[i] = out_datas[i];
}
out_datas = (void **)remap_src_datas;
}
if (!in_passthrough) {
spa_log_trace_fp(this->log, "%p: input convert %d", this, n_samples);
convert_process(&dir->conv, out_datas, src_datas, n_samples);
convert_process(&dir->conv, remap_src_datas, src_datas, n_samples);
} else {
if (dir->need_remap) {
for (i = 0; i < dir->conv.n_channels; i++) {
remap_src_datas[dir->remap[i]] = (void *)src_datas[i];
spa_log_trace_fp(this->log, "%p: input remap %d -> %d", this, dir->remap[i], i);
}
out_datas = (void **)remap_src_datas;
} else {
out_datas = (void **)src_datas;
}
}
if (!mix_passthrough) {
@ -2570,7 +2580,7 @@ static int impl_node_process(void *object)
dir = &this->dir[SPA_DIRECTION_OUTPUT];
if (dir->need_remap) {
for (i = 0; i < dir->conv.n_channels; i++) {
remap_dst_datas[i] = out_datas[dir->remap[i]];
remap_dst_datas[dir->remap[i]] = out_datas[i];
spa_log_trace_fp(this->log, "%p: output remap %d -> %d", this, i, dir->remap[i]);
}
in_datas = (const void**)remap_dst_datas;