ShuriZma
/
fbneo
mirror of https://github.com/finalburnneo/FBNeo.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add some speed-ups to dac, simplify a bit, add some debugging, and move callback to struct -- this allows for multiple cpus with dacs.

This commit is contained in:
iq_132 2012-03-19 01:32:34 +00:00
parent 3031b5d259
commit 45fb2f3e96
1 changed files with 50 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

113
src/burn/snd/dac.cpp
View File

@ -1,14 +1,15 @@
#include "burnint.h" #include "burnint.h"
#include "burn_sound.h" #include "burn_sound.h"
#define DAC_NUM (8) // allow for 8 DAC chips #define DAC_NUM (8) // Maximum DAC chips
struct dac_info struct dac_info
{ {
INT16 Output; INT16 Output;
INT32 nVolShift; INT32 nVolShift;
INT32 nCurrentPosition; INT32 nCurrentPosition;
INT32 Initialized; INT32 Initialized;
INT32 (*pSyncCallback)();
}; };
static struct dac_info dac_table[DAC_NUM]; static struct dac_info dac_table[DAC_NUM];
@ -16,52 +17,37 @@ static struct dac_info dac_table[DAC_NUM];
static INT16 UnsignedVolTable[256]; static INT16 UnsignedVolTable[256];
static INT16 SignedVolTable[256]; static INT16 SignedVolTable[256];
static INT32 (*pSyncCallback)() = NULL; // should be moved to struct?
static INT16 *buffer = NULL; static INT16 *buffer = NULL;
static INT32 NumChips; static INT32 NumChips;
static INT32 bAddSignal; static INT32 bAddSignal;
// delay buffer allocation for cases when fps is not 60 static void UpdateStream(INT32 chip, INT32 length)
static inline void allocate_buffer()
{ {
if (buffer == NULL) {
buffer = (INT16*)BurnMalloc(nBurnSoundLen * sizeof(INT16));
}
}
static void UpdateStream(INT32 chip, INT32 len)
{
// check buffer
allocate_buffer();
struct dac_info *ptr; struct dac_info *ptr;
{ if (buffer == NULL) { // delay buffer allocation for cases when fps is not 60
ptr = &dac_table[chip]; buffer = (INT16*)BurnMalloc(nBurnSoundLen * sizeof(INT16));
memset (buffer, 0, nBurnSoundLen * sizeof(INT16));
}
if (ptr->Initialized == 0) return; ptr = &dac_table[chip];
if (ptr->Initialized == 0) return;
INT32 length = len - ptr->nCurrentPosition; if (length > nBurnSoundLen) length = nBurnSoundLen;
length -= ptr->nCurrentPosition;
if (length <= 0) return;
// should never happen... INT16 *buf = buffer + ptr->nCurrentPosition;
if (length <= 0) return;
// can happen, so let's make sure it doesn't INT32 Out = ptr->Output;
if ((length + ptr->nCurrentPosition) > nBurnSoundLen) length = nBurnSoundLen - ptr->nCurrentPosition;
if (length <= 0) return;
INT16 *buf = buffer + ptr->nCurrentPosition; ptr->nCurrentPosition += length;
ptr->nCurrentPosition += length; if (Out) {
INT32 Out = ptr->Output;
while (length--) { while (length--) {
*buf = BURN_SND_CLIP((INT32)(*buf + Out)); *buf++ = BURN_SND_CLIP((INT32)(*buf + Out));
*buf++;
} }
} }
} }
@ -79,16 +65,19 @@ void DACUpdate(INT16* Buffer, INT32 Length)
} }
INT16 *buf = buffer; INT16 *buf = buffer;
while (Length--) { if (bAddSignal) {
if (bAddSignal) { while (Length--) {
Buffer[1] = Buffer[0] += buf[0]; Buffer[1] = Buffer[0] += buf[0];
} else { Buffer += 2;
Buffer[1] = Buffer[0] = buf[0]; *buf++ = 0; // clear buffer
}
} else {
while (Length--) {
Buffer[1] = Buffer[0] = buf[0];
Buffer += 2;
*buf++ = 0; // clear buffer
} }
Buffer += 2;
buf[0] = 0; // clear buffer
buf++;
} }
for (INT32 i = 0; i < NumChips; i++) { for (INT32 i = 0; i < NumChips; i++) {
@ -106,9 +95,10 @@ void DACWrite(INT32 Chip, UINT8 Data)
struct dac_info *ptr; struct dac_info *ptr;
UpdateStream(Chip, pSyncCallback());
ptr = &dac_table[Chip]; ptr = &dac_table[Chip];
UpdateStream(Chip, ptr->pSyncCallback());
ptr->Output = UnsignedVolTable[Data] >> ptr->nVolShift; ptr->Output = UnsignedVolTable[Data] >> ptr->nVolShift;
} }
@ -121,29 +111,33 @@ void DACSignedWrite(INT32 Chip, UINT8 Data)
struct dac_info *ptr; struct dac_info *ptr;
UpdateStream(Chip, pSyncCallback());
ptr = &dac_table[Chip]; ptr = &dac_table[Chip];
UpdateStream(Chip, ptr->pSyncCallback());
ptr->Output = SignedVolTable[Data] >> ptr->nVolShift; ptr->Output = SignedVolTable[Data] >> ptr->nVolShift;
} }
static void DACBuildVolTables() static void DACBuildVolTables()
{ {
INT32 i; for (INT32 i = 0;i < 256;i++) {
for (i = 0;i < 256;i++) {
UnsignedVolTable[i] = i * 0x101 / 2; UnsignedVolTable[i] = i * 0x101 / 2;
SignedVolTable[i] = i * 0x101 - 0x8000; SignedVolTable[i] = i * 0x101 - 0x8000;
} }
} }
static void DACInitCommon(INT32 Num, UINT32, INT32 bAdd) void DACInit(INT32 Num, UINT32 /*Clock*/, INT32 bAdd, INT32 (*pSyncCB)())
{ {
#if defined FBA_DEBUG
if (Num >= DAC_NUM) bprintf (PRINT_ERROR, _T("DACInit called for too many chips (%d)! Change DAC_NUM (%d)!\n"), Num, DAC_NUM);
if (pSyncCB == NULL) bprintf (PRINT_ERROR, _T("DACInit called with NULL callback!\n"));
#endif
struct dac_info *ptr; struct dac_info *ptr;
DebugSnd_DACInitted = 1; DebugSnd_DACInitted = 1;
NumChips = Num+1; NumChips = Num + 1;
ptr = &dac_table[Num]; ptr = &dac_table[Num];
@ -151,19 +145,13 @@ static void DACInitCommon(INT32 Num, UINT32, INT32 bAdd)
ptr->Initialized = 1; ptr->Initialized = 1;
ptr->nVolShift = 0; ptr->nVolShift = 0;
ptr->pSyncCallback = pSyncCB;
DACBuildVolTables();
DACBuildVolTables(); // necessary to build for every chip?
bAddSignal = bAdd; bAddSignal = bAdd;
} }
void DACInit(INT32 Num, UINT32 Clock, INT32 bAdd, INT32 (*pSyncCB)())
{
pSyncCallback = pSyncCB;
DACInitCommon(Num, Clock, bAdd);
}
void DACSetVolShift(INT32 Chip, INT32 nShift) void DACSetVolShift(INT32 Chip, INT32 nShift)
{ {
#if defined FBA_DEBUG #if defined FBA_DEBUG
@ -205,14 +193,13 @@ void DACExit()
ptr = &dac_table[i]; ptr = &dac_table[i];
ptr->Initialized = 0; ptr->Initialized = 0;
ptr->pSyncCallback = NULL;
} }
NumChips = 0; NumChips = 0;
DebugSnd_DACInitted = 0; DebugSnd_DACInitted = 0;
pSyncCallback = NULL;
BurnFree (buffer); BurnFree (buffer);
} }