service/audren_u: Move revision testing code out of AudRenU

The revision querying facilities are used by more than just audren. e.g.
audio devices can use this to test whether or not USB audio output is
supported.

This will be used within the following change.

src/core/hle/service/audio/audren_u.cpp

@@ -349,7 +349,7 @@ void AudRenU::GetAudioRendererWorkBufferSize(Kernel::HLERequestContext& ctx) {
     };
 
     // Calculates the portion of the size related to the mix data (and the sorting thereof).
-    const auto calculate_mix_info_size = [this](const AudioCore::AudioRendererParameter& params) {
+    const auto calculate_mix_info_size = [](const AudioCore::AudioRendererParameter& params) {
         // The size of the mixing info data structure.
         constexpr u64 mix_info_size = 0x940;
 
@@ -421,7 +421,7 @@ void AudRenU::GetAudioRendererWorkBufferSize(Kernel::HLERequestContext& ctx) {
 
     // Calculates the part of the size related to the splitter context.
     const auto calculate_splitter_context_size =
-        [this](const AudioCore::AudioRendererParameter& params) -> u64 {
+        [](const AudioCore::AudioRendererParameter& params) -> u64 {
         if (!IsFeatureSupported(AudioFeatures::Splitter, params.revision)) {
             return 0;
         }
@@ -468,7 +468,7 @@ void AudRenU::GetAudioRendererWorkBufferSize(Kernel::HLERequestContext& ctx) {
     };
 
     // Calculates the part of the size related to performance statistics.
-    const auto calculate_perf_size = [this](const AudioCore::AudioRendererParameter& params) {
+    const auto calculate_perf_size = [](const AudioCore::AudioRendererParameter& params) {
         // Extra size value appended to the end of the calculation.
         constexpr u64 appended = 128;
 
@@ -495,8 +495,7 @@ void AudRenU::GetAudioRendererWorkBufferSize(Kernel::HLERequestContext& ctx) {
     };
 
     // Calculates the part of the size that relates to the audio command buffer.
-    const auto calculate_command_buffer_size =
+    const auto calculate_command_buffer_size = [](const AudioCore::AudioRendererParameter& params) {
-        [this](const AudioCore::AudioRendererParameter& params) {
         constexpr u64 alignment = (buffer_alignment_size - 1) * 2;
 
         if (!IsFeatureSupported(AudioFeatures::VariadicCommandBuffer, params.revision)) {
@@ -541,8 +540,8 @@ void AudRenU::GetAudioRendererWorkBufferSize(Kernel::HLERequestContext& ctx) {
         constexpr u64 voice_data_command_size = 0x9C;
         const u64 voice_command_max_size =
             (params.splitter_count * depop_setup_command_size) +
-                (voice_data_command_size + voice_biquad_filter_command_size +
+            (voice_data_command_size + voice_biquad_filter_command_size + volume_ramp_command_size +
-                 volume_ramp_command_size + mix_ramp_grouped_command_size);
+             mix_ramp_grouped_command_size);
 
         // Now calculate the individual elements that comprise the size and add them together.
         const u64 effect_commands_size = params.effect_count * effect_command_max_size;
@@ -551,8 +550,7 @@ void AudRenU::GetAudioRendererWorkBufferSize(Kernel::HLERequestContext& ctx) {
             depop_mix_command_size + volume_command_size * max_mix_buffers;
 
         const u64 perf_commands_size =
-                perf_command_size *
+            perf_command_size * (CalculateNumPerformanceEntries(params) + max_perf_detail_entries);
-                (CalculateNumPerformanceEntries(params) + max_perf_detail_entries);
 
         const u64 sink_commands_size = params.sink_count * sink_command_size;
 
@@ -633,7 +631,7 @@ void AudRenU::OpenAudioRendererImpl(Kernel::HLERequestContext& ctx) {
     rb.PushIpcInterface<IAudioRenderer>(system, params, audren_instance_count++);
 }
 
-bool AudRenU::IsFeatureSupported(AudioFeatures feature, u32_le revision) const {
+bool IsFeatureSupported(AudioFeatures feature, u32_le revision) {
     // Byte swap
     const u32_be version_num = revision - Common::MakeMagic('R', 'E', 'V', '0');
 

src/core/hle/service/audio/audren_u.h

@@ -30,16 +30,18 @@ private:
 
     void OpenAudioRendererImpl(Kernel::HLERequestContext& ctx);
 
-    enum class AudioFeatures : u32 {
-        Splitter,
-        PerformanceMetricsVersion2,
-        VariadicCommandBuffer,
-    };
-
-    bool IsFeatureSupported(AudioFeatures feature, u32_le revision) const;
-
     std::size_t audren_instance_count = 0;
     Core::System& system;
 };
 
+// Describes a particular audio feature that may be supported in a particular revision.
+enum class AudioFeatures : u32 {
+    Splitter,
+    PerformanceMetricsVersion2,
+    VariadicCommandBuffer,
+};
+
+// Tests if a particular audio feature is supported with a given audio revision.
+bool IsFeatureSupported(AudioFeatures feature, u32_le revision);
+
 } // namespace Service::Audio