From 164361484fa9dd13df38b694e282c5e6549c677d Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Tue, 12 Apr 2022 11:55:27 +0200 Subject: [PATCH] channelmix: tweak defaults a little. Increase the FC filter frequency to 12KHz for better dialogs. This filter is only applied when making the FC from FRONT channels so that we keep the high frequency signal on the FRONT mostly. Increase LFE filter frequency to make slightly more bass. Disable widen filter by default. Update config files with the correct defaults. --- spa/plugins/audioconvert/channelmix.c | 6 +++--- src/daemon/client-rt.conf.in | 8 ++++---- src/daemon/client.conf.in | 8 ++++---- src/daemon/minimal.conf.in | 16 ++++++++-------- src/daemon/pipewire-pulse.conf.in | 8 ++++---- 5 files changed, 23 insertions(+), 23 deletions(-) diff --git a/spa/plugins/audioconvert/channelmix.c b/spa/plugins/audioconvert/channelmix.c index 98f69c18b..7f3964874 100644 --- a/spa/plugins/audioconvert/channelmix.c +++ b/spa/plugins/audioconvert/channelmix.c @@ -1657,10 +1657,10 @@ impl_init(const struct spa_handle_factory *factory, 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; + this->mix.lfe_cutoff = 150.0f; + this->mix.fc_cutoff = 12000.0f; this->mix.rear_delay = 12.0f; - this->mix.widen = 0.02f; + this->mix.widen = 0.0f; 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 00500b84f..30bd11513 100644 --- a/src/daemon/client-rt.conf.in +++ b/src/daemon/client-rt.conf.in @@ -84,10 +84,10 @@ stream.properties = { #channelmix.normalize = false #channelmix.mix-lfe = true #channelmix.upmix = true - #channelmix.upmix-method = simple # none, psd - #channelmix.lfe-cutoff = 120 - #channelmix.fc-cutoff = 6000 + #channelmix.upmix-method = psd # none, simple + #channelmix.lfe-cutoff = 150 + #channelmix.fc-cutoff = 12000 #channelmix.rear-delay = 12.0 - #channelmix.stereo-widen = 0.1 + #channelmix.stereo-widen = 0.0 #channelmix.hilbert-taps = 0 } diff --git a/src/daemon/client.conf.in b/src/daemon/client.conf.in index 47c48b7a6..ffe23c827 100644 --- a/src/daemon/client.conf.in +++ b/src/daemon/client.conf.in @@ -74,10 +74,10 @@ stream.properties = { #channelmix.normalize = false #channelmix.mix-lfe = false #channelmix.upmix = true - #channelmix.upmix-method = simple # none, psd - #channelmix.lfe-cutoff = 120 - #channelmix.fc-cutoff = 6000 + #channelmix.upmix-method = psd # none, simple + #channelmix.lfe-cutoff = 150 + #channelmix.fc-cutoff = 12000 #channelmix.rear-delay = 12.0 - #channelmix.stereo-widen = 0.1 + #channelmix.stereo-widen = 0.0 #channelmix.hilbert-taps = 0 } diff --git a/src/daemon/minimal.conf.in b/src/daemon/minimal.conf.in index a5636b405..8b3ba7640 100644 --- a/src/daemon/minimal.conf.in +++ b/src/daemon/minimal.conf.in @@ -205,11 +205,11 @@ context.objects = [ #channelmix.normalize = false #channelmix.mix-lfe = false #channelmix.upmix = true - #channelmix.upmix-method = simple # none, psd - #channelmix.lfe-cutoff = 120 - #channelmix.fc-cutoff = 6000 + #channelmix.upmix-method = psd # none, simple + #channelmix.lfe-cutoff = 150 + #channelmix.fc-cutoff = 12000 #channelmix.rear-delay = 12.0 - #channelmix.stereo-widen = 0.1 + #channelmix.stereo-widen = 0.0 #channelmix.hilbert-taps = 0 channelmix.disable = true #node.param.Props = { @@ -265,11 +265,11 @@ context.objects = [ #channelmix.normalize = false #channelmix.mix-lfe = false #channelmix.upmix = true - #channelmix.upmix-method = simple # none, psd - #channelmix.lfe-cutoff = 120 - #channelmix.fc-cutoff = 6000 + #channelmix.upmix-method = psd # none, simple + #channelmix.lfe-cutoff = 150 + #channelmix.fc-cutoff = 12000 #channelmix.rear-delay = 12.0 - #channelmix.stereo-widen = 0.1 + #channelmix.stereo-widen = 0.0 #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 5294f7a42..c818ce302 100644 --- a/src/daemon/pipewire-pulse.conf.in +++ b/src/daemon/pipewire-pulse.conf.in @@ -60,11 +60,11 @@ stream.properties = { #channelmix.normalize = false #channelmix.mix-lfe = false #channelmix.upmix = true - #channelmix.upmix-method = simple # none, psd - #channelmix.lfe-cutoff = 120 - #channelmix.fc-cutoff = 6000 + #channelmix.upmix-method = psd # none, simple + #channelmix.lfe-cutoff = 150 + #channelmix.fc-cutoff = 12000 #channelmix.rear-delay = 12.0 - #channelmix.stereo-widen = 0.1 + #channelmix.stereo-widen = 0.0 #channelmix.hilbert-taps = 0 }