From e5ee0afe6f7b9cc8bf551b70ce61c773706710cc Mon Sep 17 00:00:00 2001 From: David Marcec Date: Sun, 12 Aug 2018 14:46:12 +1000 Subject: Added GetAudioRendererSampleRate, GetAudioRendererSampleCount & GetAudioRendererMixBufferCount GetAudioRendererSampleRate is set as a "STUB" as a game could check if the sample rate it sent and the sample rate it wants don't match. Just a thought of something which could happen so keeping it as stub for the mean time --- src/audio_core/audio_renderer.cpp | 12 ++++++++++++ src/audio_core/audio_renderer.h | 5 ++++- 2 files changed, 16 insertions(+), 1 deletion(-) (limited to 'src/audio_core') diff --git a/src/audio_core/audio_renderer.cpp b/src/audio_core/audio_renderer.cpp index 282f345c5..1ab6e88c2 100644 --- a/src/audio_core/audio_renderer.cpp +++ b/src/audio_core/audio_renderer.cpp @@ -26,6 +26,18 @@ AudioRenderer::AudioRenderer(AudioRendererParameter params, QueueMixedBuffer(2); } +u32 AudioRenderer::GetSampleRate() const { + return STREAM_SAMPLE_RATE; +} + +u32 AudioRenderer::GetSampleCount() const { + return worker_params.sample_count; +} + +u32 AudioRenderer::GetMixBufferCount() const { + return worker_params.mix_buffer_count; +} + std::vector AudioRenderer::UpdateAudioRenderer(const std::vector& input_params) { // Copy UpdateDataHeader struct UpdateDataHeader config{}; diff --git a/src/audio_core/audio_renderer.h b/src/audio_core/audio_renderer.h index 6950a4681..13c5d0adc 100644 --- a/src/audio_core/audio_renderer.h +++ b/src/audio_core/audio_renderer.h @@ -26,7 +26,7 @@ enum class PlayState : u8 { struct AudioRendererParameter { u32_le sample_rate; u32_le sample_count; - u32_le unknown_8; + u32_le mix_buffer_count; u32_le unknown_c; u32_le voice_count; u32_le sink_count; @@ -160,6 +160,9 @@ public: std::vector UpdateAudioRenderer(const std::vector& input_params); void QueueMixedBuffer(Buffer::Tag tag); void ReleaseAndQueueBuffers(); + u32 GetSampleRate() const; + u32 GetSampleCount() const; + u32 GetMixBufferCount() const; private: class VoiceState { -- cgit v1.2.3 From 094f6003e07cbb2c42142787d52fe6e59b3918cb Mon Sep 17 00:00:00 2001 From: David Marcec Date: Sun, 12 Aug 2018 14:58:36 +1000 Subject: Pushed the requested sample rate instead of our fixed sample rate --- src/audio_core/audio_renderer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/audio_core') diff --git a/src/audio_core/audio_renderer.cpp b/src/audio_core/audio_renderer.cpp index 1ab6e88c2..6ebed3fb0 100644 --- a/src/audio_core/audio_renderer.cpp +++ b/src/audio_core/audio_renderer.cpp @@ -27,7 +27,7 @@ AudioRenderer::AudioRenderer(AudioRendererParameter params, } u32 AudioRenderer::GetSampleRate() const { - return STREAM_SAMPLE_RATE; + return worker_params.sample_rate; } u32 AudioRenderer::GetSampleCount() const { -- cgit v1.2.3