channelmix: enable upmixing by default, disable normalization

This commit is contained in:
Wim Taymans 2022-03-03 12:33:02 +01:00
parent 5a55e1a47a
commit d25bb89cc0
5 changed files with 29 additions and 26 deletions

View file

@ -1627,9 +1627,12 @@ impl_init(const struct spa_handle_factory *factory,
props_reset(&this->props);
this->mix.options = CHANNELMIX_OPTION_NORMALIZE;
this->mix.options = CHANNELMIX_OPTION_UPMIX;
this->mix.log = this->log;
this->mix.lfe_cutoff = 120.0f;
this->mix.fc_cutoff = 6000.0f;
this->mix.rear_delay = 12.0f;
this->mix.widen = 0.1f;
for (i = 0; info && i < info->n_items; i++) {
const char *k = info->items[i].key;

View file

@ -81,12 +81,12 @@ stream.properties = {
#node.latency = 1024/48000
#node.autoconnect = true
#resample.quality = 4
#channelmix.normalize = true
#channelmix.normalize = false
#channelmix.mix-lfe = true
#channelmix.upmix = false
#channelmix.lfe-cutoff = 0
#channelmix.fc-cutoff = 0
#channelmix.upmix = true
#channelmix.lfe-cutoff = 120
#channelmix.fc-cutoff = 6000
#channelmix.rear-delay = 12.0
#channelmix.stereo-widen = 0.0
#channelmix.stereo-widen = 0.1
#channelmix.hilbert-taps = 0
}

View file

@ -71,12 +71,12 @@ stream.properties = {
#node.latency = 1024/48000
#node.autoconnect = true
#resample.quality = 4
#channelmix.normalize = true
#channelmix.normalize = false
#channelmix.mix-lfe = false
#channelmix.upmix = false
#channelmix.lfe-cutoff = 0
#channelmix.fc-cutoff = 0
#channelmix.upmix = true
#channelmix.lfe-cutoff = 120
#channelmix.fc-cutoff = 6000
#channelmix.rear-delay = 12.0
#channelmix.stereo-widen = 0.0
#channelmix.stereo-widen = 0.1
#channelmix.hilbert-taps = 0
}

View file

@ -202,13 +202,13 @@ context.objects = [
#resample.quality = 4
resample.disable = true
#monitor.channel-volumes = false
#channelmix.normalize = true
#channelmix.normalize = false
#channelmix.mix-lfe = false
#channelmix.upmix = false
#channelmix.lfe-cutoff = 0
#channelmix.fc-cutoff = 0
#channelmix.upmix = true
#channelmix.lfe-cutoff = 120
#channelmix.fc-cutoff = 6000
#channelmix.rear-delay = 12.0
#channelmix.stereo-widen = 0.0
#channelmix.stereo-widen = 0.1
#channelmix.hilbert-taps = 0
channelmix.disable = true
#node.param.Props = {
@ -261,13 +261,13 @@ context.objects = [
#audio.position = "FL,FR"
#resample.quality = 4
resample.disable = true
#channelmix.normalize = true
#channelmix.normalize = false
#channelmix.mix-lfe = false
#channelmix.upmix = false
#channelmix.lfe-cutoff = 0
#channelmix.fc-cutoff = 0
#channelmix.upmix = true
#channelmix.lfe-cutoff = 120
#channelmix.fc-cutoff = 6000
#channelmix.rear-delay = 12.0
#channelmix.stereo-widen = 0.0
#channelmix.stereo-widen = 0.1
#channelmix.hilbert-taps = 0
channelmix.disable = true
#node.param.Props = {

View file

@ -57,13 +57,13 @@ stream.properties = {
#node.latency = 1024/48000
#node.autoconnect = true
#resample.quality = 4
#channelmix.normalize = true
#channelmix.normalize = false
#channelmix.mix-lfe = false
#channelmix.upmix = false
#channelmix.lfe-cutoff = 0
#channelmix.fc-cutoff = 0
#channelmix.upmix = true
#channelmix.lfe-cutoff = 120
#channelmix.fc-cutoff = 6000
#channelmix.rear-delay = 12.0
#channelmix.stereo-widen = 0.0
#channelmix.stereo-widen = 0.1
#channelmix.hilbert-taps = 0
}