mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-12 13:30:15 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

channelmix: add simple upmix method

Browse source 
Add a property to select the upmix method. PSD is enabled by default
but a new simple upmixing algorithm is available that duplicates
channels and avoids lowpass filter on the FC and disables widening.

Fixes #861
This commit is contained in:
Wim Taymans 2022-03-14 15:33:07 +01:00
parent cec8898740
commit bc5b486cb9
8 changed files with 98 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -546,6 +546,31 @@ static int impl_node_enum_params(void *object, int seq,
this->mix.hilbert_taps, 0, MAX_TAPS),
SPA_PROP_INFO_params, SPA_POD_Bool(true));
break;
case 17:
{
struct spa_pod_frame f[2];
uint32_t i;
spa_pod_builder_push_object(&b, &f[0],
SPA_TYPE_OBJECT_PropInfo, id);
spa_pod_builder_add(&b,
SPA_PROP_INFO_name, SPA_POD_String("channelmix.upmix-method"),
SPA_PROP_INFO_description, SPA_POD_String("Upmix Method to use"),
SPA_PROP_INFO_type, SPA_POD_String(
channelmix_upmix_info[this->mix.upmix].label),
0);
spa_pod_builder_prop(&b, SPA_PROP_INFO_labels, 0);
spa_pod_builder_push_struct(&b, &f[1]);
for (i = 0; i < SPA_N_ELEMENTS(channelmix_upmix_info); i++) {
spa_pod_builder_string(&b, channelmix_upmix_info[i].label);
spa_pod_builder_string(&b, channelmix_upmix_info[i].description);
}
spa_pod_builder_pop(&b, &f[1]);
spa_pod_builder_add(&b,
SPA_PROP_INFO_params, SPA_POD_Bool(true),
0);
param = spa_pod_builder_pop(&b, &f[0]);
break;
}
default:
return 0;
}
@ -605,6 +630,8 @@ static int impl_node_enum_params(void *object, int seq,
spa_pod_builder_float(&b, this->mix.widen);
spa_pod_builder_string(&b, "channelmix.hilbert-taps");
spa_pod_builder_int(&b, this->mix.hilbert_taps);
spa_pod_builder_string(&b, "channelmix.upmix-method");
spa_pod_builder_string(&b, channelmix_upmix_info[this->mix.upmix].label);
spa_pod_builder_pop(&b, &f[1]);
param = spa_pod_builder_pop(&b, &f[0]);
break;
@ -648,6 +675,8 @@ static int channelmix_set_param(struct impl *this, const char *k, const char *s)
spa_atof(s, &this->mix.widen);
else if (spa_streq(k, "channelmix.hilbert-taps"))
spa_atou32(s, &this->mix.hilbert_taps, 0);
else if (spa_streq(k, "channelmix.upmix-method"))
this->mix.upmix = channelmix_upmix_from_label(s);
else
return 0;
return 1;
@ -1625,6 +1654,7 @@ impl_init(const struct spa_handle_factory *factory,
props_reset(&this->props);
this->mix.options = CHANNELMIX_OPTION_UPMIX;
this->mix.upmix = CHANNELMIX_UPMIX_PSD;
this->mix.log = this->log;
this->mix.lfe_cutoff = 120.0f;
this->mix.fc_cutoff = 6000.0f;