Mirrors/citra-nightly
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

DSP/HLE: Implement mixer processing

Browse source
This commit is contained in:
MerryMage 2016-04-27 07:22:39 +01:00
parent 6f6af6928f
commit 6542c60602
5 changed files with 311 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

54
src/audio_core/hle/dsp.cpp
View file

@ -6,6 +6,7 @@
#include <memory>
#include "audio_core/hle/dsp.h"
#include "audio_core/hle/mixers.h"
#include "audio_core/hle/pipe.h"
#include "audio_core/hle/source.h"
#include "audio_core/sink.h"
@ -14,6 +15,8 @@
namespace DSP {
namespace HLE {
// Region management
std::array<SharedMemory, 2> g_regions;
static size_t CurrentRegionIndex() {
@ -41,16 +44,52 @@ static SharedMemory& WriteRegion() {
return g_regions[1 - CurrentRegionIndex()];
}
// Audio processing and mixing
static std::array<Source, num_sources> sources = {
Source(0), Source(1), Source(2), Source(3), Source(4), Source(5),
Source(6), Source(7), Source(8), Source(9), Source(10), Source(11),
Source(12), Source(13), Source(14), Source(15), Source(16), Source(17),
Source(18), Source(19), Source(20), Source(21), Source(22), Source(23)
};
static Mixers mixers;
static StereoFrame16 GenerateCurrentFrame() {
SharedMemory& read = ReadRegion();
SharedMemory& write = WriteRegion();
std::array<QuadFrame32, 3> intermediate_mixes = {};
// Generate intermediate mixes
for (size_t i = 0; i < num_sources; i++) {
write.source_statuses.status[i] = sources[i].Tick(read.source_configurations.config[i], read.adpcm_coefficients.coeff[i]);
for (size_t mix = 0; mix < 3; mix++) {
sources[i].MixInto(intermediate_mixes[mix], mix);
}
}
// Generate final mix
write.dsp_status = mixers.Tick(read.dsp_configuration, read.intermediate_mix_samples, write.intermediate_mix_samples, intermediate_mixes);
StereoFrame16 output_frame = mixers.GetOutput();
// Write current output frame to the shared memory region
for (size_t samplei = 0; samplei < output_frame.size(); samplei++) {
for (size_t channeli = 0; channeli < output_frame[0].size(); channeli++) {
write.final_samples.pcm16[samplei][channeli] = s16_le(output_frame[samplei][channeli]);
}
}
return output_frame;
}
// Audio output
static std::unique_ptr<AudioCore::Sink> sink;
static AudioCore::TimeStretcher time_stretcher;
// Public Interface
void Init() {
DSP::HLE::ResetPipes();
@ -58,6 +97,8 @@ void Init() {
source.Reset();
}
mixers.Reset();
time_stretcher.Reset();
if (sink) {
time_stretcher.SetOutputSampleRate(sink->GetNativeSampleRate());
@ -75,17 +116,10 @@ void Shutdown() {
}
bool Tick() {
SharedMemory& read = ReadRegion();
SharedMemory& write = WriteRegion();
StereoFrame16 current_frame = {};
std::array<QuadFrame32, 3> intermediate_mixes = {};
for (size_t i = 0; i < num_sources; i++) {
write.source_statuses.status[i] = sources[i].Tick(read.source_configurations.config[i], read.adpcm_coefficients.coeff[i]);
for (size_t mix = 0; mix < 3; mix++) {
sources[i].MixInto(intermediate_mixes[mix], mix);
}
}
// TODO: Check dsp::DSP semaphore (which indicates emulated application has finished writing to shared memory region)
current_frame = GenerateCurrentFrame();
return true;
}