From b54cdeb28448aade6eb84bc703d04d63348eea3d Mon Sep 17 00:00:00 2001 From: David Marcec Date: Fri, 20 Sep 2019 10:42:09 +1000 Subject: Added frame_count for REV7 audio renderer Added framecount --- src/audio_core/audio_renderer.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'src/audio_core/audio_renderer.cpp') diff --git a/src/audio_core/audio_renderer.cpp b/src/audio_core/audio_renderer.cpp index da50a0bbc..cf24527f3 100644 --- a/src/audio_core/audio_renderer.cpp +++ b/src/audio_core/audio_renderer.cpp @@ -107,6 +107,11 @@ Stream::State AudioRenderer::GetStreamState() const { return stream->GetState(); } +constexpr u32 VersionFromRevision(u32_le rev) { + // "REV7" -> 7 + return ((rev >> 24) & 0xff) - 0x30; +} + std::vector AudioRenderer::UpdateAudioRenderer(const std::vector& input_params) { // Copy UpdateDataHeader struct UpdateDataHeader config{}; @@ -166,6 +171,11 @@ std::vector AudioRenderer::UpdateAudioRenderer(const std::vector& input_ // Copy output header UpdateDataHeader response_data{worker_params}; std::vector output_params(response_data.total_size); + const auto audren_revision = VersionFromRevision(config.revision); + if (audren_revision >= 7) { + response_data.frame_count = 0x10; + response_data.total_size += 0x10; + } std::memcpy(output_params.data(), &response_data, sizeof(UpdateDataHeader)); // Copy output memory pool entries -- cgit v1.2.3 From e9d19add7d4a857a87191ec421a298eea1b89cf5 Mon Sep 17 00:00:00 2001 From: David Marcec Date: Sat, 21 Sep 2019 16:24:56 +1000 Subject: Used revision 5 instead of 7, marked constexpr as static --- src/audio_core/audio_renderer.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/audio_core/audio_renderer.cpp') diff --git a/src/audio_core/audio_renderer.cpp b/src/audio_core/audio_renderer.cpp index cf24527f3..e6f38d600 100644 --- a/src/audio_core/audio_renderer.cpp +++ b/src/audio_core/audio_renderer.cpp @@ -107,7 +107,7 @@ Stream::State AudioRenderer::GetStreamState() const { return stream->GetState(); } -constexpr u32 VersionFromRevision(u32_le rev) { +static constexpr u32 VersionFromRevision(u32_le rev) { // "REV7" -> 7 return ((rev >> 24) & 0xff) - 0x30; } @@ -172,7 +172,7 @@ std::vector AudioRenderer::UpdateAudioRenderer(const std::vector& input_ UpdateDataHeader response_data{worker_params}; std::vector output_params(response_data.total_size); const auto audren_revision = VersionFromRevision(config.revision); - if (audren_revision >= 7) { + if (audren_revision >= 5) { response_data.frame_count = 0x10; response_data.total_size += 0x10; } -- cgit v1.2.3