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

Don't need to create the mastering voice with with an explicit number of channels or sample rate.

This commit is contained in:
gibbed 2014-01-25 04:50:47 -08:00
parent 47c71d702a
commit 2f8f893977
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/xenia/apu/xaudio2/xaudio2_audio_driver.cc
View File

@ -48,8 +48,7 @@ XAudio2AudioDriver::XAudio2AudioDriver(Emulator* emulator, HANDLE wait) :
XAudio2AudioDriver::~XAudio2AudioDriver() { XAudio2AudioDriver::~XAudio2AudioDriver() {
} }
const DWORD ChannelMasks[] = const DWORD ChannelMasks[] = {
{
0, // TODO: fixme 0, // TODO: fixme
0, // TODO: fixme 0, // TODO: fixme
SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_LOW_FREQUENCY, SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_LOW_FREQUENCY,
@ -81,7 +80,7 @@ void XAudio2AudioDriver::Initialize() {
config.LogFileline = TRUE; config.LogFileline = TRUE;
audio_->SetDebugConfiguration(&config); audio_->SetDebugConfiguration(&config);
hr = audio_->CreateMasteringVoice(&mastering_voice_, frame_channels_, 48000); hr = audio_->CreateMasteringVoice(&mastering_voice_);
if (FAILED(hr)) { if (FAILED(hr)) {
XELOGE("CreateMasteringVoice failed with %.8X", hr); XELOGE("CreateMasteringVoice failed with %.8X", hr);
XEASSERTALWAYS(); XEASSERTALWAYS();
@ -96,14 +95,14 @@ void XAudio2AudioDriver::Initialize() {
waveformat.Format.wBitsPerSample = 32; waveformat.Format.wBitsPerSample = 32;
waveformat.Format.nBlockAlign = (waveformat.Format.nChannels * waveformat.Format.wBitsPerSample) / 8; waveformat.Format.nBlockAlign = (waveformat.Format.nChannels * waveformat.Format.wBitsPerSample) / 8;
waveformat.Format.nAvgBytesPerSec = waveformat.Format.nSamplesPerSec * waveformat.Format.nBlockAlign; waveformat.Format.nAvgBytesPerSec = waveformat.Format.nSamplesPerSec * waveformat.Format.nBlockAlign;
waveformat.Format.cbSize = sizeof(waveformat) - sizeof(WAVEFORMATEX); waveformat.Format.cbSize = sizeof(WAVEFORMATIEEEFLOATEX) - sizeof(WAVEFORMATEX);
waveformat.SubFormat = KSDATAFORMAT_SUBTYPE_IEEE_FLOAT; waveformat.SubFormat = KSDATAFORMAT_SUBTYPE_IEEE_FLOAT;
waveformat.Samples.wValidBitsPerSample = waveformat.Format.wBitsPerSample; waveformat.Samples.wValidBitsPerSample = waveformat.Format.wBitsPerSample;
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_NOSRC, 1.0f, 0, XAUDIO2_DEFAULT_FREQ_RATIO,
voice_callback_); voice_callback_);
if (FAILED(hr)) { if (FAILED(hr)) {
XELOGE("CreateSourceVoice failed with %.8X", hr); XELOGE("CreateSourceVoice failed with %.8X", hr);
@ -129,7 +128,6 @@ void XAudio2AudioDriver::SubmitFrame(uint32_t frame_ptr) {
auto output_frame = reinterpret_cast<float*>(frame_); auto output_frame = reinterpret_cast<float*>(frame_);
auto interleave_channels = frame_channels_; auto interleave_channels = frame_channels_;
bool burp = false;
// interleave the data // interleave the data
for (int index = 0, o = 0; index < channel_samples_; ++index) { for (int index = 0, o = 0; index < channel_samples_; ++index) {
for (int channel = 0, table = 0; channel < interleave_channels; ++channel, table += channel_samples_) { for (int channel = 0, table = 0; channel < interleave_channels; ++channel, table += channel_samples_) {
@ -139,7 +137,7 @@ void XAudio2AudioDriver::SubmitFrame(uint32_t frame_ptr) {
XAUDIO2_BUFFER buffer; XAUDIO2_BUFFER buffer;
buffer.Flags = 0; buffer.Flags = 0;
buffer.pAudioData = reinterpret_cast<BYTE*>(&frame_[0]); buffer.pAudioData = (BYTE*)frame_;
buffer.AudioBytes = sizeof(frame_); buffer.AudioBytes = sizeof(frame_);
buffer.PlayBegin = 0; buffer.PlayBegin = 0;
buffer.PlayLength = channel_samples_; buffer.PlayLength = channel_samples_;