ShuriZma
/
xenia-canary
mirror of https://github.com/xenia-canary/xenia-canary.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Minor changes to APU.

This commit is contained in:
gibbed 2014-01-18 06:06:34 -08:00
parent 619b9758a0
commit 40178cb22d
4 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/xenia/apu/nop/nop_audio_system.cc
View File

@ -32,7 +32,7 @@ void NopAudioSystem::Pump() {
// //
} }
void NopAudioSystem::SubmitFrame(uint32_t samples_ptr) { void NopAudioSystem::SubmitFrame(uint32_t frame_ptr) {
// Process samples! They are big-endian floats. // Process samples! They are big-endian floats.
} }

2
src/xenia/apu/nop/nop_audio_system.h
View File

@ -28,7 +28,7 @@ public:
virtual void Shutdown(); virtual void Shutdown();
virtual void SubmitFrame(uint32_t samples_ptr); virtual void SubmitFrame(uint32_t frame_ptr);
protected: protected:
virtual void Initialize(); virtual void Initialize();

39
src/xenia/apu/xaudio2/xaudio2_audio_system.cc
View File

@ -80,7 +80,7 @@ void XAudio2AudioSystem::Initialize() {
active_channels_ = 6; active_channels_ = 6;
XAUDIO2_DEBUG_CONFIGURATION config; XAUDIO2_DEBUG_CONFIGURATION config;
config.TraceMask = XAUDIO2_LOG_ERRORS | XAUDIO2_LOG_WARNINGS | XAUDIO2_LOG_INFO | XAUDIO2_LOG_DETAIL | XAUDIO2_LOG_STREAMING; config.TraceMask = XAUDIO2_LOG_ERRORS | XAUDIO2_LOG_WARNINGS;
config.BreakMask = 0; config.BreakMask = 0;
config.LogThreadID = FALSE; config.LogThreadID = FALSE;
config.LogTiming = TRUE; config.LogTiming = TRUE;
@ -97,7 +97,8 @@ void XAudio2AudioSystem::Initialize() {
WAVEFORMATIEEEFLOATEX waveformat; WAVEFORMATIEEEFLOATEX waveformat;
waveformat.Format.wFormatTag = WAVE_FORMAT_EXTENSIBLE; //waveformat.Format.wFormatTag = WAVE_FORMAT_EXTENSIBLE;
waveformat.Format.wFormatTag = WAVE_FORMAT_IEEE_FLOAT;
waveformat.Format.nChannels = active_channels_; waveformat.Format.nChannels = active_channels_;
waveformat.Format.nSamplesPerSec = 48000; waveformat.Format.nSamplesPerSec = 48000;
waveformat.Format.wBitsPerSample = 32; waveformat.Format.wBitsPerSample = 32;
@ -110,7 +111,7 @@ void XAudio2AudioSystem::Initialize() {
waveformat.dwChannelMask = ChannelMasks[waveformat.Format.nChannels]; waveformat.dwChannelMask = ChannelMasks[waveformat.Format.nChannels];
hr = audio_->CreateSourceVoice(&pcm_voice_, &waveformat.Format, hr = audio_->CreateSourceVoice(&pcm_voice_, &waveformat.Format,
XAUDIO2_VOICE_NOPITCH | XAUDIO2_VOICE_NOSRC, 0,
XAUDIO2_DEFAULT_FREQ_RATIO, voice_callback_); XAUDIO2_DEFAULT_FREQ_RATIO, voice_callback_);
if (FAILED(hr)) { if (FAILED(hr)) {
XELOGE("CreateSourceVoice failed with %.8X", hr); XELOGE("CreateSourceVoice failed with %.8X", hr);
@ -129,33 +130,37 @@ void XAudio2AudioSystem::Pump() {
// Only allow one buffer to be queued at once. We only have one static // Only allow one buffer to be queued at once. We only have one static
// store of data, and if we called back the game audio driver it would // store of data, and if we called back the game audio driver it would
// overwrite it. // overwrite it.
ResetEvent(wait_handle_); //ResetEvent(wait_handle_);
} }
WaitForSingleObject(wait_handle_, INFINITE); WaitForSingleObject(wait_handle_, INFINITE);
} }
void XAudio2AudioSystem::SubmitFrame(uint32_t samples_ptr) { void XAudio2AudioSystem::SubmitFrame(uint32_t frame_ptr) {
ResetEvent(wait_handle_);
// Process samples! They are big-endian floats. // Process samples! They are big-endian floats.
HRESULT hr; HRESULT hr;
auto samples = reinterpret_cast<float*>( auto input_frame = reinterpret_cast<float*>(emulator_->memory()->membase() + frame_ptr);
emulator_->memory()->membase() + samples_ptr); auto output_frame = reinterpret_cast<float*>(frame_);
// interleave the data // interleave the data
for (int i = 0, o = 0; i < 256; ++i) { for (int index = 0, o = 0; index < 256; ++index) {
for (int j = 0; j < 6 && j < active_channels_; ++j) { for (int channel = 0, table = 0;
samples_[o++] = XESWAPF32BE(*(samples + (j * 256) + i)); channel < 6 && channel < active_channels_;
++channel, table += 256) {
output_frame[o++] = XESWAPF32BE(input_frame[table + index]);
} }
} }
XAUDIO2_BUFFER buffer; XAUDIO2_BUFFER buffer;
buffer.Flags = XAUDIO2_END_OF_STREAM; buffer.Flags = 0;
buffer.pAudioData = reinterpret_cast<BYTE*>(samples_); buffer.pAudioData = reinterpret_cast<BYTE*>(frame_);
buffer.AudioBytes = sizeof(samples_); buffer.AudioBytes = sizeof(frame_);
buffer.PlayBegin = 0; buffer.PlayBegin = 0;
buffer.PlayLength = 256; buffer.PlayLength = 256;
buffer.LoopBegin = 0; buffer.LoopBegin = XAUDIO2_NO_LOOP_REGION;
buffer.LoopLength = 0; buffer.LoopLength = 0;
buffer.LoopCount = 0; buffer.LoopCount = 0;
buffer.pContext = 0; buffer.pContext = 0;
@ -165,12 +170,6 @@ void XAudio2AudioSystem::SubmitFrame(uint32_t samples_ptr) {
XEASSERTALWAYS(); XEASSERTALWAYS();
return; return;
} }
hr = pcm_voice_->Start(0);
if (FAILED(hr)) {
XELOGE("Start failed with %.8X", hr);
XEASSERTALWAYS();
return;
}
} }
void XAudio2AudioSystem::Shutdown() { void XAudio2AudioSystem::Shutdown() {

5
src/xenia/apu/xaudio2/xaudio2_audio_system.h
View File

@ -30,7 +30,7 @@ public:
virtual void Shutdown(); virtual void Shutdown();
virtual void SubmitFrame(uint32_t samples_ptr); virtual void SubmitFrame(uint32_t frame_ptr);
protected: protected:
virtual void Initialize(); virtual void Initialize();
@ -41,7 +41,8 @@ private:
IXAudio2MasteringVoice* mastering_voice_; IXAudio2MasteringVoice* mastering_voice_;
IXAudio2SourceVoice* pcm_voice_; IXAudio2SourceVoice* pcm_voice_;
int active_channels_; int active_channels_;
float samples_[1536]; static const int frame_channels_ = 6;
float frame_[frame_channels_ * 256];
HANDLE wait_handle_; HANDLE wait_handle_;
class VoiceCallback; class VoiceCallback;