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

channelmix: more improvements

Browse source 
work with the default channel layout
remap to default channel layout in fmconvert
Pass channel positions in resample format
This commit is contained in:
Wim Taymans 2018-09-17 09:41:41 +02:00
parent fef616615e
commit 78b7da608f
5 changed files with 201 additions and 143 deletions
Download patch file Download diff file Expand all files Collapse all files

14
spa/plugins/audioconvert/channelmix.c
View file

@ -132,6 +132,8 @@ static int setup_convert(struct impl *this,
const struct spa_audio_info *src_info, *dst_info;
uint32_t src_chan, dst_chan;
const struct channelmix_info *chanmix_info;
uint64_t src_mask, dst_mask;
int i;
if (direction == SPA_DIRECTION_INPUT) {
src_info = info;
@ -144,19 +146,25 @@ static int setup_convert(struct impl *this,
src_chan = src_info->info.raw.channels;
dst_chan = dst_info->info.raw.channels;
spa_log_info(this->log, NAME " %p: %s/%d@%d->%s/%d@%d", this,
for (i = 0, src_mask = 0; i < src_chan; i++)
src_mask |= 1UL << src_info->info.raw.position[i];
for (i = 0, dst_mask = 0; i < dst_chan; i++)
dst_mask |= 1UL << dst_info->info.raw.position[i];
spa_log_info(this->log, NAME " %p: %s/%d@%d->%s/%d@%d %08lx:%08lx", this,
spa_debug_type_find_name(spa_type_audio_format, src_info->info.raw.format),
src_chan,
src_info->info.raw.rate,
spa_debug_type_find_name(spa_type_audio_format, dst_info->info.raw.format),
dst_chan,
dst_info->info.raw.rate);
dst_info->info.raw.rate,
src_mask, dst_mask);
if (src_info->info.raw.rate != dst_info->info.raw.rate)
return -EINVAL;
/* find convert function */
if ((chanmix_info = find_channelmix_info(src_chan, 0, dst_chan, 0, FEATURE_SSE)) == NULL)
if ((chanmix_info = find_channelmix_info(src_chan, src_mask, dst_chan, dst_mask, FEATURE_SSE)) == NULL)
return -ENOTSUP;
spa_log_info(this->log, NAME " %p: got channelmix features %08x", this, chanmix_info->features);