summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDavid Marcec <dmarcecguzman@gmail.com>2019-09-20 02:42:09 +0200
committerDavid Marcec <dmarcecguzman@gmail.com>2019-09-20 02:42:09 +0200
commitb54cdeb28448aade6eb84bc703d04d63348eea3d (patch)
tree3cb0347035a3069baddc993f9e7d45a5d425db25 /src
parentMerge pull request #2784 from ReinUsesLisp/smem (diff)
downloadyuzu-b54cdeb28448aade6eb84bc703d04d63348eea3d.tar
yuzu-b54cdeb28448aade6eb84bc703d04d63348eea3d.tar.gz
yuzu-b54cdeb28448aade6eb84bc703d04d63348eea3d.tar.bz2
yuzu-b54cdeb28448aade6eb84bc703d04d63348eea3d.tar.lz
yuzu-b54cdeb28448aade6eb84bc703d04d63348eea3d.tar.xz
yuzu-b54cdeb28448aade6eb84bc703d04d63348eea3d.tar.zst
yuzu-b54cdeb28448aade6eb84bc703d04d63348eea3d.zip
Diffstat (limited to 'src')
-rw-r--r--src/audio_core/audio_renderer.cpp10
-rw-r--r--src/audio_core/audio_renderer.h25
2 files changed, 24 insertions, 11 deletions
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<u8> AudioRenderer::UpdateAudioRenderer(const std::vector<u8>& input_params) {
// Copy UpdateDataHeader struct
UpdateDataHeader config{};
@@ -166,6 +171,11 @@ std::vector<u8> AudioRenderer::UpdateAudioRenderer(const std::vector<u8>& input_
// Copy output header
UpdateDataHeader response_data{worker_params};
std::vector<u8> 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
diff --git a/src/audio_core/audio_renderer.h b/src/audio_core/audio_renderer.h
index 45afbe759..4f14b91cd 100644
--- a/src/audio_core/audio_renderer.h
+++ b/src/audio_core/audio_renderer.h
@@ -194,21 +194,24 @@ struct UpdateDataHeader {
mixes_size = 0x0;
sinks_size = config.sink_count * 0x20;
performance_manager_size = 0x10;
+ frame_count = 0;
total_size = sizeof(UpdateDataHeader) + behavior_size + memory_pools_size + voices_size +
effects_size + sinks_size + performance_manager_size;
}
- u32_le revision;
- u32_le behavior_size;
- u32_le memory_pools_size;
- u32_le voices_size;
- u32_le voice_resource_size;
- u32_le effects_size;
- u32_le mixes_size;
- u32_le sinks_size;
- u32_le performance_manager_size;
- INSERT_PADDING_WORDS(6);
- u32_le total_size;
+ u32_le revision{};
+ u32_le behavior_size{};
+ u32_le memory_pools_size{};
+ u32_le voices_size{};
+ u32_le voice_resource_size{};
+ u32_le effects_size{};
+ u32_le mixes_size{};
+ u32_le sinks_size{};
+ u32_le performance_manager_size{};
+ INSERT_PADDING_WORDS(1);
+ u32_le frame_count{};
+ INSERT_PADDING_WORDS(4);
+ u32_le total_size{};
};
static_assert(sizeof(UpdateDataHeader) == 0x40, "UpdateDataHeader has wrong size");