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

GBA Audio: Convert audio sampling to mTiming

This commit is contained in:
Jeffrey Pfau 2016-10-30 17:24:02 -07:00
parent bb1c47c7e8
commit 2a0c53441a
3 changed files with 12 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/gba/audio.c
View File

@ -24,9 +24,12 @@ const int GBA_AUDIO_VOLUME_MAX = 0x100;
static const int CLOCKS_PER_FRAME = 0x400;
static int _applyBias(struct GBAAudio* audio, int sample);
static void _sample(struct GBAAudio* audio);
static void _sample(struct mTiming* timing, void* user, uint32_t cyclesLate);
void GBAAudioInit(struct GBAAudio* audio, size_t samples) {
audio->sampleEvent.context = audio;
audio->sampleEvent.name = "GBA Audio Sample";
audio->sampleEvent.callback = _sample;
audio->psg.p = NULL;
uint8_t* nr52 = (uint8_t*) &audio->p->memory.io[REG_SOUNDCNT_X >> 1];
#ifdef __BIG_ENDIAN__
@ -49,13 +52,12 @@ void GBAAudioInit(struct GBAAudio* audio, size_t samples) {
void GBAAudioReset(struct GBAAudio* audio) {
GBAudioReset(&audio->psg);
audio->nextEvent = 0;
mTimingDeschedule(&audio->p->timing, &audio->sampleEvent);
mTimingSchedule(&audio->p->timing, &audio->sampleEvent, 0);
audio->chA.dmaSource = 1;
audio->chB.dmaSource = 2;
audio->chA.sample = 0;
audio->chB.sample = 0;
audio->eventDiff = 0;
audio->nextSample = 0;
audio->sampleRate = 0x8000;
audio->soundbias = 0x200;
audio->volume = 0;
@ -92,25 +94,6 @@ void GBAAudioResizeBuffer(struct GBAAudio* audio, size_t samples) {
mCoreSyncConsumeAudio(audio->p->sync);
}
int32_t GBAAudioProcessEvents(struct GBAAudio* audio, int32_t cycles) {
audio->nextEvent -= cycles;
audio->eventDiff += cycles;
while (audio->nextEvent <= 0) {
audio->nextEvent = INT_MAX;
audio->nextSample -= audio->eventDiff;
if (audio->nextSample <= 0) {
_sample(audio);
audio->nextSample += audio->sampleInterval;
}
if (audio->nextSample < audio->nextEvent) {
audio->nextEvent = audio->nextSample;
}
audio->eventDiff = 0;
}
return audio->nextEvent;
}
void GBAAudioScheduleFifoDma(struct GBAAudio* audio, int number, struct GBADMA* info) {
switch (info->dest) {
case BASE_IO | REG_FIFO_A_LO:
@ -269,7 +252,8 @@ static int _applyBias(struct GBAAudio* audio, int sample) {
return ((sample - GBARegisterSOUNDBIASGetBias(audio->soundbias)) * audio->masterVolume) >> 3;
}
static void _sample(struct GBAAudio* audio) {
static void _sample(struct mTiming* timing, void* user, uint32_t cyclesLate) {
struct GBAAudio* audio = user;
int16_t sampleLeft = 0;
int16_t sampleRight = 0;
int psgShift = 5 - audio->volume;
@ -324,6 +308,8 @@ static void _sample(struct GBAAudio* audio) {
if (wait && audio->p->stream && audio->p->stream->postAudioBuffer) {
audio->p->stream->postAudioBuffer(audio->p->stream, audio->psg.left, audio->psg.right);
}
mTimingSchedule(timing, &audio->sampleEvent, audio->sampleInterval - cyclesLate);
}
void GBAAudioSerialize(const struct GBAAudio* audio, struct GBASerializedState* state) {
@ -333,10 +319,6 @@ void GBAAudioSerialize(const struct GBAAudio* audio, struct GBASerializedState*
CircleBufferDump(&audio->chB.fifo, state->audio.fifoB, sizeof(state->audio.fifoB));
uint32_t fifoSize = CircleBufferSize(&audio->chA.fifo);
STORE_32(fifoSize, 0, &state->audio.fifoSize);
STORE_32(audio->nextEvent, 0, &state->audio.nextEvent);
STORE_32(audio->eventDiff, 0, &state->audio.eventDiff);
STORE_32(audio->nextSample, 0, &state->audio.nextSample);
}
void GBAAudioDeserialize(struct GBAAudio* audio, const struct GBASerializedState* state) {
@ -354,10 +336,6 @@ void GBAAudioDeserialize(struct GBAAudio* audio, const struct GBASerializedState
CircleBufferWrite8(&audio->chA.fifo, state->audio.fifoA[i]);
CircleBufferWrite8(&audio->chB.fifo, state->audio.fifoB[i]);
}
LOAD_32(audio->nextEvent, 0, &state->audio.nextEvent);
LOAD_32(audio->eventDiff, 0, &state->audio.eventDiff);
LOAD_32(audio->nextSample, 0, &state->audio.nextSample);
}
float GBAAudioCalculateRatio(float inputSampleRate, float desiredFPS, float desiredSampleRate) {

6
src/gba/audio.h
View File

@ -69,15 +69,13 @@ struct GBAAudio {
GBARegisterSOUNDBIAS soundbias;
int32_t nextEvent;
int32_t eventDiff;
int32_t nextSample;
int32_t sampleInterval;
bool forceDisableChA;
bool forceDisableChB;
int masterVolume;
struct mTimingEvent sampleEvent;
};
struct GBAStereoSample {

10
src/gba/gba.c
View File

@ -254,16 +254,6 @@ static void GBAProcessEvents(struct ARMCore* cpu) {
nextEvent = cpu->nextEvent;
} while (gba->cpuBlocked);
testEvent = GBAAudioProcessEvents(&gba->audio, cycles);
if (testEvent < nextEvent) {
#ifndef NDEBUG
if (testEvent == 0) {
mLOG(GBA, ERROR, "Audio requiring 0 cycles");
}
#endif
nextEvent = testEvent;
}
testEvent = GBASIOProcessEvents(&gba->sio, cycles);
if (testEvent < nextEvent) {
nextEvent = testEvent;