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

Merge 4589291199 into f46da1c525

This commit is contained in:
Zach Bacon 2024-03-09 14:26:26 +00:00 committed by GitHub
parent f46da1c525 4589291199
commit 793bfcef16
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 113 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

228
src/wx/faudio.cpp
View File

@ -8,9 +8,8 @@
#include "../common/SoundDriver.h" #include "../common/SoundDriver.h"
// FAudio // FAudio
#include <faudio.h> #include <FAudio.h>
// MMDevice API
#include <mmdeviceapi.h> #include <mmdeviceapi.h>
#include <string> #include <string>
#include <vector> #include <vector>
@ -19,56 +18,56 @@
#include "../System.h" // for systemMessage() #include "../System.h" // for systemMessage()
#include "../gba/Globals.h" #include "../gba/Globals.h"
int GetFADevices(FAudio* fa, wxArrayString* names, wxArrayString* ids, namespace {
const wxString* match)
{
HRESULT hr;
UINT32 dev_count = 0;
hr = FAudio_GetDeviceCount(fa, &dev_count); int GetFADevices(FAudio* fa, wxArrayString* names, wxArrayString* ids,
const wxString* match)
{
uint32_t hr;
uint32_t dev_count = 0;
hr = FAudio_GetDeviceCount(fa, &dev_count);
if (hr != S_OK) { if (hr != 0) {
wxLogError(_("FAudio: Enumerating devices failed!")); wxLogError(_("FAudio: Enumerating devices failed!"));
return true; return -1;
} else { } else {
FAudioDeviceDetails dd; FAudioDeviceDetails dd;
for (UINT32 i = 0; i < dev_count; i++) { for (uint32_t i = 0; i < dev_count; i++) {
hr = FAudio_GetDeviceDetails(fa, i, &dd); hr = FAudio_GetDeviceDetails(fa, i, &dd);
if (hr != S_OK) { if (hr != 0) {
continue; continue;
} else { } else {
if (ids) { if (ids) {
ids->push_back((wchar_t*) dd.DeviceID); //FAudio is an interesting beast, but not that hard to adapt... once you get used to it, XAudio2 wouldn't need this, but FAudio declares FAudioDeviceDetails as int32_t ids->push_back((wchar_t*) dd.DeviceID);
names->push_back((wchar_t*) dd.DisplayName); names->push_back((wchar_t*) dd.DisplayName);
} else if (*match == dd.DeviceID) } else if (*match == wxString((wchar_t*) dd.DeviceID))
return i; return i;
}
} }
} }
}
return -1; return -1;
}
} }
bool GetFADevices(wxArrayString& names, wxArrayString& ids) bool GetFADevices(wxArrayString& names, wxArrayString& ids)
{ {
HRESULT hr; uint32_t hr;
FAudio* fa = NULL; FAudio* fa = NULL;
UINT32 flags = 0; uint32_t flags = 0;
#ifdef _DEBUG #ifdef _DEBUG
flags = FAUDIO_DEBUG_ENGINE; flags = FAUDIO_DEBUG_ENGINE;
#endif #endif
hr = FAudioCreate(&fa, flags, FAUDIO_DEFAULT_PROCESSOR);
hr = FAudioCreate(&fa, flags, FAUDIO_DEFAULT_PROCESSOR); //Apparently this needs 3 parameters, the processor. if (hr != 0) {
if (hr != S_OK) {
wxLogError(_("The FAudio interface failed to initialize!")); wxLogError(_("The FAudio interface failed to initialize!"));
return false; return false;
} }
GetFADevices(fa, &names, &ids, NULL); GetFADevices(fa, &names, &ids, NULL);
//fa->Release();
FAudio_Release(fa); FAudio_Release(fa);
return true; return true;
} }
@ -189,47 +188,50 @@ public:
LeaveCriticalSection(&lock); LeaveCriticalSection(&lock);
} }
} g_notifier; } f_notifier;
// Synchronization Event // Synchronization Event
class FAudio_BufferNotify : public FAudioVoiceCallback { namespace {
public: class FAudio_BufferNotify : public FAudioVoiceCallback {
HANDLE hBufferEndEvent; public:
void *hBufferEndEvent;
FAudio_BufferNotify() FAudio_BufferNotify()
{ {
hBufferEndEvent = NULL; hBufferEndEvent = nullptr;
hBufferEndEvent = CreateEvent(NULL, FALSE, FALSE, NULL); hBufferEndEvent = CreateEvent(nullptr, FALSE, FALSE, nullptr);
assert(hBufferEndEvent != NULL); assert(hBufferEndEvent != nullptr);
}
~FAudio_BufferNotify() OnBufferEnd = &FAudio_BufferNotify::StaticOnBufferEnd;
{ OnVoiceProcessingPassStart = &FAudio_BufferNotify::StaticOnVoiceProcessingPassStart;
CloseHandle(hBufferEndEvent); OnVoiceProcessingPassEnd = &FAudio_BufferNotify::StaticOnVoiceProcessingPassEnd;
hBufferEndEvent = NULL; OnStreamEnd = &FAudio_BufferNotify::StaticOnStreamEnd;
} OnBufferStart = &FAudio_BufferNotify::StaticOnBufferStart;
OnLoopEnd = &FAudio_BufferNotify::StaticOnLoopEnd;
OnVoiceError = &FAudio_BufferNotify::StaticOnVoiceError;
}
~FAudio_BufferNotify()
{
CloseHandle(hBufferEndEvent);
hBufferEndEvent = NULL;
}
STDMETHOD_(void, OnBufferEnd)
(void* pBufferContext) static void StaticOnBufferEnd(FAudioVoiceCallback* callback, void * pBufferContext) {
{ FAudio_BufferNotify* self = static_cast<FAudio_BufferNotify*>(callback);
assert(hBufferEndEvent != NULL); if (self != nullptr && self->hBufferEndEvent != NULL)
SetEvent(hBufferEndEvent); {
} SetEvent(self->hBufferEndEvent);
}
// dummies: }
STDMETHOD_(void, OnVoiceProcessingPassStart) static void StaticOnVoiceProcessingPassStart(FAudioVoiceCallback* callback, uint32_t BytesRequired) {}
(UINT32 BytesRequired) {} static void StaticOnVoiceProcessingPassEnd(FAudioVoiceCallback* callback) {}
STDMETHOD_(void, OnVoiceProcessingPassEnd) static void StaticOnStreamEnd(FAudioVoiceCallback* callback) {}
() {} static void StaticOnBufferStart(FAudioVoiceCallback* callback, void * pBufferContext) {}
STDMETHOD_(void, OnStreamEnd) static void StaticOnLoopEnd(FAudioVoiceCallback* callback, void * pBufferContext) {}
() {} static void StaticOnVoiceError(FAudioVoiceCallback* callback, void * pBufferContext, uint32_t Error) {}
STDMETHOD_(void, OnBufferStart) };
(void* pBufferContext) {} }
STDMETHOD_(void, OnLoopEnd)
(void* pBufferContext) {}
STDMETHOD_(void, OnVoiceError)
(void* pBufferContext, HRESULT Error){};
};
// Class Declaration // Class Declaration
class FAudio_Output class FAudio_Output
@ -252,15 +254,15 @@ public:
void device_change(); void device_change();
// Configuration Changes // Configuration Changes
void setThrottle(unsigned short throttle); void setThrottle(unsigned short throttle_);
private: private:
bool failed; bool failed;
bool initialized; bool initialized;
bool playing; bool playing;
UINT32 freq; uint32_t freq;
UINT32 bufferCount; uint32_t bufferCount;
BYTE* buffers; uint8_t* buffers;
int currentBuffer; int currentBuffer;
int soundBufferLen; int soundBufferLen;
@ -288,14 +290,14 @@ FAudio_Output::FAudio_Output()
faud = NULL; faud = NULL;
mVoice = NULL; mVoice = NULL;
sVoice = NULL; sVoice = NULL;
ZeroMemory(&buf, sizeof(buf)); memset(&buf, NULL, sizeof(buf));
ZeroMemory(&vState, sizeof(vState)); memset(&vState, NULL, sizeof(vState));
g_notifier.do_register(this); f_notifier.do_register(this);
} }
FAudio_Output::~FAudio_Output() FAudio_Output::~FAudio_Output()
{ {
g_notifier.do_unregister(this); f_notifier.do_unregister(this);
close(); close();
} }
@ -305,8 +307,7 @@ void FAudio_Output::close()
if (sVoice) { if (sVoice) {
if (playing) { if (playing) {
HRESULT hr = FAudioSourceVoice_Stop(sVoice, 0, FAUDIO_COMMIT_NOW); assert(FAudioSourceVoice_Stop(sVoice, 0, FAUDIO_COMMIT_NOW) == 0);
assert(hr == S_OK);
} }
FAudioVoice_DestroyVoice(sVoice); FAudioVoice_DestroyVoice(sVoice);
@ -339,15 +340,15 @@ bool FAudio_Output::init(long sampleRate)
if (failed || initialized) if (failed || initialized)
return false; return false;
HRESULT hr; uint32_t hr;
// Initialize FAudio // Initialize FAudio
UINT32 flags = 0; uint32_t flags = 0;
//#ifdef _DEBUG //#ifdef _DEBUG
// flags = FAUDIO_DEBUG_ENGINE; // flags = FAUDIO_DEBUG_ENGINE;
//#endif //#endif
hr = FAudioCreate(&faud, flags, FAUDIO_DEFAULT_PROCESSOR); hr = FAudioCreate(&faud, flags, FAUDIO_DEFAULT_PROCESSOR);
if (hr != S_OK) { if (hr != 0) {
wxLogError(_("The FAudio interface failed to initialize!")); wxLogError(_("The FAudio interface failed to initialize!"));
failed = true; failed = true;
return false; return false;
@ -359,27 +360,26 @@ bool FAudio_Output::init(long sampleRate)
soundBufferLen = (freq / 60) * 4; soundBufferLen = (freq / 60) * 4;
// create own buffers to store sound data because it must not be // create own buffers to store sound data because it must not be
// manipulated while the voice plays from it // manipulated while the voice plays from it
buffers = (BYTE*)malloc((bufferCount + 1) * soundBufferLen); buffers = (uint8_t*)malloc((bufferCount + 1) * soundBufferLen);
// + 1 because we need one temporary buffer when all others are in use // + 1 because we need one temporary buffer when all others are in use
WAVEFORMATEX wfx; FAudioWaveFormatEx wfx;
ZeroMemory(&wfx, sizeof(wfx)); memset(&wfx, NULL, sizeof(wfx));
wfx.wFormatTag = WAVE_FORMAT_PCM; wfx.wFormatTag = FAUDIO_FORMAT_PCM;
wfx.nChannels = 2; wfx.nChannels = 2;
wfx.nSamplesPerSec = freq; wfx.nSamplesPerSec = freq;
wfx.wBitsPerSample = 16; wfx.wBitsPerSample = 16;
wfx.nBlockAlign = wfx.nChannels * (wfx.wBitsPerSample / 8); wfx.nBlockAlign = wfx.nChannels * (wfx.wBitsPerSample / 8);
wfx.nAvgBytesPerSec = wfx.nSamplesPerSec * wfx.nBlockAlign; wfx.nAvgBytesPerSec = wfx.nSamplesPerSec * wfx.nBlockAlign;
// create sound receiver // create sound receiver
hr = FAudio_CreateMasteringVoice( hr = FAudio_CreateMasteringVoice(faud,
faud, &mVoice,
&mVoice, FAUDIO_DEFAULT_CHANNELS,
FAUDIO_DEFAULT_CHANNELS, FAUDIO_DEFAULT_SAMPLERATE,
FAUDIO_DEFAULT_SAMPLERATE, 0,
0, FAGetDev(faud),
FAGetDev(faud), NULL);
NULL);
if (hr != S_OK) { if (hr != 0) {
wxLogError(_("FAudio: Creating mastering voice failed!")); wxLogError(_("FAudio: Creating mastering voice failed!"));
failed = true; failed = true;
return false; return false;
@ -387,10 +387,9 @@ bool FAudio_Output::init(long sampleRate)
// create sound emitter // create sound emitter
//This should be FAudio_CreateSourceVoice() //This should be FAudio_CreateSourceVoice()
//hr = faud->CreateSourceVoice(&sVoice, &wfx, 0, 4.0f, &notify); hr = FAudio_CreateSourceVoice(faud, &sVoice, &wfx, 0, 4.0f, &notify, NULL, NULL);
hr = FAudio_CreateSourceVoice(faud, &sVoice, (const FAudioWaveFormatEx*)&wfx, 0, 4.0f, &notify, NULL, NULL);
if (hr != S_OK) { if (hr != 0) {
wxLogError(_("FAudio: Creating source voice failed!")); wxLogError(_("FAudio: Creating source voice failed!"));
failed = true; failed = true;
return false; return false;
@ -399,9 +398,8 @@ bool FAudio_Output::init(long sampleRate)
if (gopts.upmix) { if (gopts.upmix) {
// set up stereo upmixing // set up stereo upmixing
FAudioDeviceDetails dd; FAudioDeviceDetails dd;
ZeroMemory(&dd, sizeof(dd)); memset(&dd, NULL, sizeof(dd));
hr = FAudio_GetDeviceDetails(faud, 0, &dd); assert(FAudio_GetDeviceDetails(faud, 0, &dd) == 0);
assert(hr == S_OK);
float* matrix = NULL; float* matrix = NULL;
matrix = (float*)malloc(sizeof(float) * 2 * dd.OutputFormat.Format.nChannels); matrix = (float*)malloc(sizeof(float) * 2 * dd.OutputFormat.Format.nChannels);
@ -497,8 +495,8 @@ bool FAudio_Output::init(long sampleRate)
} }
if (matrixAvailable) { if (matrixAvailable) {
hr = FAudioVoice_SetOutputMatrix(sVoice, NULL, 2, dd.OutputFormat.Format.nChannels, matrix, FAUDIO_DEFAULT_CHANNELS); //What I have here for the OperationSet maybe wrong... hr = FAudioVoice_SetOutputMatrix(sVoice, NULL, 2, dd.OutputFormat.Format.nChannels, matrix, FAUDIO_DEFAULT_CHANNELS);
assert(hr == S_OK); assert(hr == 0);
} }
free(matrix); free(matrix);
@ -506,7 +504,7 @@ bool FAudio_Output::init(long sampleRate)
} }
hr = FAudioSourceVoice_Start(sVoice, 0, FAUDIO_COMMIT_NOW); hr = FAudioSourceVoice_Start(sVoice, 0, FAUDIO_COMMIT_NOW);
assert(hr == S_OK); assert(hr == 0);
playing = true; playing = true;
currentBuffer = 0; currentBuffer = 0;
device_changed = false; device_changed = false;
@ -516,7 +514,7 @@ bool FAudio_Output::init(long sampleRate)
void FAudio_Output::write(uint16_t* finalWave, int length) void FAudio_Output::write(uint16_t* finalWave, int length)
{ {
UINT32 flags = 0; uint32_t flags = 0;
if (!initialized || failed) if (!initialized || failed)
return; return;
@ -547,7 +545,7 @@ void FAudio_Output::write(uint16_t* finalWave, int length)
if (!coreOptions.speedup && coreOptions.throttle && !gba_joybus_active) { if (!coreOptions.speedup && coreOptions.throttle && !gba_joybus_active) {
// wait for one buffer to finish playing // wait for one buffer to finish playing
if (WaitForSingleObject(notify.hBufferEndEvent, 10000) == WAIT_TIMEOUT) { if (WaitForSingleObject(notify.hBufferEndEvent, 10000) == WAIT_TIMEOUT) {
device_changed = true; device_changed = true;
} }
} else { } else {
// drop current audio frame // drop current audio frame
@ -557,13 +555,13 @@ void FAudio_Output::write(uint16_t* finalWave, int length)
} }
// copy & protect the audio data in own memory area while playing it // copy & protect the audio data in own memory area while playing it
CopyMemory(&buffers[currentBuffer * soundBufferLen], finalWave, soundBufferLen); memcpy(&buffers[currentBuffer * soundBufferLen], finalWave, soundBufferLen);
buf.AudioBytes = soundBufferLen; buf.AudioBytes = soundBufferLen;
buf.pAudioData = &buffers[currentBuffer * soundBufferLen]; buf.pAudioData = &buffers[currentBuffer * soundBufferLen];
currentBuffer++; currentBuffer++;
currentBuffer %= (bufferCount + 1); // + 1 because we need one temporary buffer currentBuffer %= (bufferCount + 1); // + 1 because we need one temporary buffer
HRESULT hr = FAudioSourceVoice_SubmitSourceBuffer(sVoice, &buf, NULL); // send buffer to queue. uint32_t hr = FAudioSourceVoice_SubmitSourceBuffer(sVoice, &buf, NULL);
assert(hr == S_OK); assert(hr == 0);
} }
void FAudio_Output::pause() void FAudio_Output::pause()
@ -572,8 +570,8 @@ void FAudio_Output::pause()
return; return;
if (playing) { if (playing) {
HRESULT hr = FAudioSourceVoice_Stop(sVoice, 0, FAUDIO_COMMIT_NOW); uint32_t hr = FAudioSourceVoice_Stop(sVoice, 0, FAUDIO_COMMIT_NOW);
assert(hr == S_OK); assert(hr == 0);
playing = false; playing = false;
} }
} }
@ -584,8 +582,8 @@ void FAudio_Output::resume()
return; return;
if (!playing) { if (!playing) {
HRESULT hr = FAudioSourceVoice_Start(sVoice, 0, FAUDIO_COMMIT_NOW); uint32_t hr = FAudioSourceVoice_Start(sVoice, 0, FAUDIO_COMMIT_NOW);
assert(hr == S_OK); assert(hr == 0);
playing = true; playing = true;
} }
} }
@ -596,8 +594,8 @@ void FAudio_Output::reset()
return; return;
if (playing) { if (playing) {
HRESULT hr = FAudioSourceVoice_Stop(sVoice, 0, FAUDIO_COMMIT_NOW); uint32_t hr = FAudioSourceVoice_Stop(sVoice, 0, FAUDIO_COMMIT_NOW);
assert(hr == S_OK); assert(hr == 0);
} }
FAudioSourceVoice_FlushSourceBuffers(sVoice); FAudioSourceVoice_FlushSourceBuffers(sVoice);
@ -613,8 +611,8 @@ void FAudio_Output::setThrottle(unsigned short throttle_)
if (throttle_ == 0) if (throttle_ == 0)
throttle_ = 100; throttle_ = 100;
HRESULT hr = FAudioSourceVoice_SetFrequencyRatio(sVoice, (float)throttle_ / 100.0f, FAUDIO_MAX_FILTER_FREQUENCY); uint32_t hr = FAudioSourceVoice_SetFrequencyRatio(sVoice, (float)throttle_ / 100.0f, FAUDIO_COMMIT_NOW);
assert(hr == S_OK); assert(hr == 0);
} }
void faudio_device_changed(FAudio_Output* instance) void faudio_device_changed(FAudio_Output* instance)