From f7b1ebca279e7eb3eebc11c9becb010638f17396 Mon Sep 17 00:00:00 2001 From: Christopher Snowhill Date: Tue, 24 Jun 2025 03:38:15 -0700 Subject: [PATCH] Output: Halve volume when downmixing to mono Signed-off-by: Christopher Snowhill --- Audio/Chain/DSP/Downmix.m | 2 + .../xcschemes/GME Plugin.xcscheme | 76 ------------------- .../{MAD.xcscheme => minimp3.xcscheme} | 18 ++--- 3 files changed, 11 insertions(+), 85 deletions(-) delete mode 100644 Plugins/libvgmPlayer/libvgmPlayer.xcodeproj/xcshareddata/xcschemes/GME Plugin.xcscheme rename Plugins/minimp3/minimp3.xcodeproj/xcshareddata/xcschemes/{MAD.xcscheme => minimp3.xcscheme} (85%) diff --git a/Audio/Chain/DSP/Downmix.m b/Audio/Chain/DSP/Downmix.m index 4d91f108f..c48fc72e6 100644 --- a/Audio/Chain/DSP/Downmix.m +++ b/Audio/Chain/DSP/Downmix.m @@ -157,6 +157,8 @@ static void downmix_to_mono(const float *inBuffer, int channels, uint32_t config } cblas_scopy((int)count, inBuffer, 2, outBuffer, 1); vDSP_vadd(outBuffer, 1, inBuffer + 1, 2, outBuffer, 1, count); + const float scale = 0.5f; + vDSP_vsmul(outBuffer, 1, &scale, outBuffer, 1, count); } static void upmix(const float *inBuffer, int inchannels, uint32_t inconfig, float *outBuffer, int outchannels, uint32_t outconfig, size_t count) { diff --git a/Plugins/libvgmPlayer/libvgmPlayer.xcodeproj/xcshareddata/xcschemes/GME Plugin.xcscheme b/Plugins/libvgmPlayer/libvgmPlayer.xcodeproj/xcshareddata/xcschemes/GME Plugin.xcscheme deleted file mode 100644 index eb2168b4a..000000000 --- a/Plugins/libvgmPlayer/libvgmPlayer.xcodeproj/xcshareddata/xcschemes/GME Plugin.xcscheme +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Plugins/minimp3/minimp3.xcodeproj/xcshareddata/xcschemes/MAD.xcscheme b/Plugins/minimp3/minimp3.xcodeproj/xcshareddata/xcschemes/minimp3.xcscheme similarity index 85% rename from Plugins/minimp3/minimp3.xcodeproj/xcshareddata/xcschemes/MAD.xcscheme rename to Plugins/minimp3/minimp3.xcodeproj/xcshareddata/xcschemes/minimp3.xcscheme index 4de6f86ba..00b1a7e2c 100644 --- a/Plugins/minimp3/minimp3.xcodeproj/xcshareddata/xcschemes/MAD.xcscheme +++ b/Plugins/minimp3/minimp3.xcodeproj/xcshareddata/xcschemes/minimp3.xcscheme @@ -15,9 +15,9 @@ + BuildableName = "minimp3.bundle" + BlueprintName = "minimp3" + ReferencedContainer = "container:minimp3.xcodeproj"> @@ -33,9 +33,9 @@ + BuildableName = "minimp3.bundle" + BlueprintName = "minimp3" + ReferencedContainer = "container:minimp3.xcodeproj"> @@ -69,9 +69,9 @@ + BuildableName = "minimp3.bundle" + BlueprintName = "minimp3" + ReferencedContainer = "container:minimp3.xcodeproj">