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

audioconvert: fix channel remapping some more

Browse source 
See #461
This commit is contained in:
Wim Taymans 2021-02-26 18:39:25 +01:00
parent 08445d2c4a
commit e2181c582d
1 changed files with 18 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

26
spa/plugins/audioconvert/fmtconvert.c
View file

@ -178,8 +178,19 @@ static int setup_convert(struct impl *this)
if (informat.info.raw.position[i] != if (informat.info.raw.position[i] !=
outformat.info.raw.position[j]) outformat.info.raw.position[j])
continue; continue;
this->src_remap[j] = i; if (inport->blocks > 1) {
this->dst_remap[i] = j; this->src_remap[j] = i;
if (outport->blocks > 1)
this->dst_remap[j] = j;
else
this->dst_remap[j] = 0;
} else {
this->src_remap[j] = 0;
if (outport->blocks > 1)
this->dst_remap[i] = j;
else
this->dst_remap[j] = 0;
}
spa_log_debug(this->log, NAME " %p: channel %d -> %d (%s -> %s)", this, spa_log_debug(this->log, NAME " %p: channel %d -> %d (%s -> %s)", this,
i, j, i, j,
spa_debug_type_find_short_name(spa_type_audio_channel, spa_debug_type_find_short_name(spa_type_audio_channel,
@ -872,11 +883,11 @@ static int impl_node_process(void *object)
size = UINT32_MAX; size = UINT32_MAX;
for (i = 0; i < n_src_datas; i++) { for (i = 0; i < n_src_datas; i++) {
struct spa_data *sd = &inb->datas[i]; uint32_t src_remap = this->src_remap[i];
uint32_t src_remap = n_src_datas > 1 ? this->src_remap[i] : 0; struct spa_data *sd = &inb->datas[src_remap];
offs = SPA_MIN(sd->chunk->offset, sd->maxsize); offs = SPA_MIN(sd->chunk->offset, sd->maxsize);
size = SPA_MIN(size, SPA_MIN(sd->maxsize - offs, sd->chunk->size)); size = SPA_MIN(size, SPA_MIN(sd->maxsize - offs, sd->chunk->size));
src_datas[src_remap] = SPA_MEMBER(sd->data, offs, void); src_datas[i] = SPA_MEMBER(sd->data, offs, void);
} }
n_samples = size / inport->stride; n_samples = size / inport->stride;
@ -888,12 +899,11 @@ static int impl_node_process(void *object)
this->is_passthrough); this->is_passthrough);
for (i = 0; i < n_dst_datas; i++) { for (i = 0; i < n_dst_datas; i++) {
uint32_t dst_remap = n_dst_datas > 1 ? this->dst_remap[i] : 0; uint32_t dst_remap = this->dst_remap[i];
uint32_t src_remap = n_src_datas > 1 ? i : 0;
struct spa_data *dd = outb->datas; struct spa_data *dd = outb->datas;
if (this->is_passthrough) if (this->is_passthrough)
dd[i].data = (void *)src_datas[src_remap]; dd[i].data = (void *)src_datas[i];
else else
dst_datas[i] = dd[dst_remap].data = outbuf->datas[dst_remap]; dst_datas[i] = dd[dst_remap].data = outbuf->datas[dst_remap];