From cf1d4b9140cd8e6cdb275d088076d25fa825ff1b Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Sat, 26 Mar 2022 21:43:52 +0100 Subject: [PATCH] audioconvert: make simple upmix the default PSD seems to not always give good results. fixes #2219 --- spa/plugins/audioconvert/channelmix.c | 2 +- src/daemon/client-rt.conf.in | 2 +- src/daemon/client.conf.in | 2 +- src/daemon/minimal.conf.in | 4 ++-- src/daemon/pipewire-pulse.conf.in | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/spa/plugins/audioconvert/channelmix.c b/spa/plugins/audioconvert/channelmix.c index 3fb46beb9..4121c3fcb 100644 --- a/spa/plugins/audioconvert/channelmix.c +++ b/spa/plugins/audioconvert/channelmix.c @@ -1655,7 +1655,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.upmix = CHANNELMIX_UPMIX_SIMPLE; this->mix.log = this->log; this->mix.lfe_cutoff = 120.0f; this->mix.fc_cutoff = 6000.0f; diff --git a/src/daemon/client-rt.conf.in b/src/daemon/client-rt.conf.in index 6d69ff83a..00500b84f 100644 --- a/src/daemon/client-rt.conf.in +++ b/src/daemon/client-rt.conf.in @@ -84,7 +84,7 @@ stream.properties = { #channelmix.normalize = false #channelmix.mix-lfe = true #channelmix.upmix = true - #channelmix.upmix-method = psd # none, simple + #channelmix.upmix-method = simple # none, psd #channelmix.lfe-cutoff = 120 #channelmix.fc-cutoff = 6000 #channelmix.rear-delay = 12.0 diff --git a/src/daemon/client.conf.in b/src/daemon/client.conf.in index a81e022c4..47c48b7a6 100644 --- a/src/daemon/client.conf.in +++ b/src/daemon/client.conf.in @@ -74,7 +74,7 @@ stream.properties = { #channelmix.normalize = false #channelmix.mix-lfe = false #channelmix.upmix = true - #channelmix.upmix-method = psd # none, simple + #channelmix.upmix-method = simple # none, psd #channelmix.lfe-cutoff = 120 #channelmix.fc-cutoff = 6000 #channelmix.rear-delay = 12.0 diff --git a/src/daemon/minimal.conf.in b/src/daemon/minimal.conf.in index 583d6cc1f..a5636b405 100644 --- a/src/daemon/minimal.conf.in +++ b/src/daemon/minimal.conf.in @@ -205,7 +205,7 @@ context.objects = [ #channelmix.normalize = false #channelmix.mix-lfe = false #channelmix.upmix = true - #channelmix.upmix-method = psd # none, simple + #channelmix.upmix-method = simple # none, psd #channelmix.lfe-cutoff = 120 #channelmix.fc-cutoff = 6000 #channelmix.rear-delay = 12.0 @@ -265,7 +265,7 @@ context.objects = [ #channelmix.normalize = false #channelmix.mix-lfe = false #channelmix.upmix = true - #channelmix.upmix-method = psd # none, simple + #channelmix.upmix-method = simple # none, psd #channelmix.lfe-cutoff = 120 #channelmix.fc-cutoff = 6000 #channelmix.rear-delay = 12.0 diff --git a/src/daemon/pipewire-pulse.conf.in b/src/daemon/pipewire-pulse.conf.in index 1bf56481c..5294f7a42 100644 --- a/src/daemon/pipewire-pulse.conf.in +++ b/src/daemon/pipewire-pulse.conf.in @@ -60,7 +60,7 @@ stream.properties = { #channelmix.normalize = false #channelmix.mix-lfe = false #channelmix.upmix = true - #channelmix.upmix-method = psd # none, simple + #channelmix.upmix-method = simple # none, psd #channelmix.lfe-cutoff = 120 #channelmix.fc-cutoff = 6000 #channelmix.rear-delay = 12.0