From 9a4beac95a0f88ec312a28d06da8270aa58736e3 Mon Sep 17 00:00:00 2001
From: Chloe Marcec
Date: Tue, 17 Nov 2020 14:14:29 +1100
Subject: audren: Make use of nodiscard, rework downmixing, release all buffers

Preliminary work for upmixing & general cleanup. Fixes basic issues in games such as Shovel Knight and slightly improves the LEGO games. Upmixing stitll needs to be implemented.

Audio levels in a few games will be fixed as we now use the downmix coefficients when possible instead of supplying our own
---
 src/audio_core/sink_context.cpp | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

(limited to 'src/audio_core/sink_context.cpp')

diff --git a/src/audio_core/sink_context.cpp b/src/audio_core/sink_context.cpp
index 0882b411a..cdb47ba81 100644
--- a/src/audio_core/sink_context.cpp
+++ b/src/audio_core/sink_context.cpp
@@ -12,10 +12,16 @@ std::size_t SinkContext::GetCount() const {
     return sink_count;
 }
 
-void SinkContext::UpdateMainSink(SinkInfo::InParams& in) {
+void SinkContext::UpdateMainSink(const SinkInfo::InParams& in) {
+    ASSERT(in.type == SinkTypes::Device);
+
+    downmix = in.device.down_matrix_enabled;
+    if (downmix) {
+        downmix_coefficients = in.device.down_matrix_coef;
+    }
     in_use = in.in_use;
     use_count = in.device.input_count;
-    std::memcpy(buffers.data(), in.device.input.data(), AudioCommon::MAX_CHANNEL_COUNT);
+    buffers = in.device.input;
 }
 
 bool SinkContext::InUse() const {
@@ -28,4 +34,12 @@ std::vector<u8> SinkContext::OutputBuffers() const {
     return buffer_ret;
 }
 
+bool SinkContext::HasDownMixingCoefficients() const {
+    return downmix;
+}
+
+const std::array<float_le, 4>& SinkContext::GetDownmixCoefficients() const {
+    return downmix_coefficients;
+}
+
 } // namespace AudioCore
-- 
cgit v1.2.3


From 908d3c56793ee67dccd0d370b175c4937420053f Mon Sep 17 00:00:00 2001
From: Chloe Marcec
Date: Tue, 17 Nov 2020 15:40:19 +1100
Subject: Addressed changes

---
 src/audio_core/sink_context.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/audio_core/sink_context.cpp')

diff --git a/src/audio_core/sink_context.cpp b/src/audio_core/sink_context.cpp
index cdb47ba81..b29b47890 100644
--- a/src/audio_core/sink_context.cpp
+++ b/src/audio_core/sink_context.cpp
@@ -15,8 +15,8 @@ std::size_t SinkContext::GetCount() const {
 void SinkContext::UpdateMainSink(const SinkInfo::InParams& in) {
     ASSERT(in.type == SinkTypes::Device);
 
-    downmix = in.device.down_matrix_enabled;
-    if (downmix) {
+    has_downmix_coefs = in.device.down_matrix_enabled;
+    if (has_downmix_coefs) {
         downmix_coefficients = in.device.down_matrix_coef;
     }
     in_use = in.in_use;
@@ -35,10 +35,10 @@ std::vector<u8> SinkContext::OutputBuffers() const {
 }
 
 bool SinkContext::HasDownMixingCoefficients() const {
-    return downmix;
+    return has_downmix_coefs;
 }
 
-const std::array<float_le, 4>& SinkContext::GetDownmixCoefficients() const {
+const DownmixCoefficients& SinkContext::GetDownmixCoefficients() const {
     return downmix_coefficients;
 }
 
-- 
cgit v1.2.3