From d25bb89cc060bc09bf239dff6b08f0f740b3a3bc Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Thu, 3 Mar 2022 12:33:02 +0100 Subject: [PATCH] channelmix: enable upmixing by default, disable normalization --- spa/plugins/audioconvert/channelmix.c | 5 ++++- src/daemon/client-rt.conf.in | 10 +++++----- src/daemon/client.conf.in | 10 +++++----- src/daemon/minimal.conf.in | 20 ++++++++++---------- src/daemon/pipewire-pulse.conf.in | 10 +++++----- 5 files changed, 29 insertions(+), 26 deletions(-) diff --git a/spa/plugins/audioconvert/channelmix.c b/spa/plugins/audioconvert/channelmix.c index d261f9f45..c2ecfb21c 100644 --- a/spa/plugins/audioconvert/channelmix.c +++ b/spa/plugins/audioconvert/channelmix.c @@ -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; diff --git a/src/daemon/client-rt.conf.in b/src/daemon/client-rt.conf.in index f67b0e4c2..8729032e1 100644 --- a/src/daemon/client-rt.conf.in +++ b/src/daemon/client-rt.conf.in @@ -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 } diff --git a/src/daemon/client.conf.in b/src/daemon/client.conf.in index fed74c575..7ffc438b7 100644 --- a/src/daemon/client.conf.in +++ b/src/daemon/client.conf.in @@ -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 } diff --git a/src/daemon/minimal.conf.in b/src/daemon/minimal.conf.in index 5ff37dabb..d23f1936d 100644 --- a/src/daemon/minimal.conf.in +++ b/src/daemon/minimal.conf.in @@ -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 = { diff --git a/src/daemon/pipewire-pulse.conf.in b/src/daemon/pipewire-pulse.conf.in index c4ddabe08..ce9ee0e46 100644 --- a/src/daemon/pipewire-pulse.conf.in +++ b/src/daemon/pipewire-pulse.conf.in @@ -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 }