libretro/FBNeo
1
0
Fork 0
mirror of https://github.com/libretro/FBNeo.git synced 2025-02-17 08:07:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

gaelco snd, fix rate, use stream device

Browse Source
This commit is contained in:
dinkc64 2024-06-06 21:17:21 -04:00
parent 04bea86450
commit 1171f7078b
1 changed files with 18 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
src/burn/snd/gaelco.cpp
View File

@ -37,6 +37,7 @@ Registers per channel:
#include "burnint.h"
#include "gaelco.h"
#include "stream.h"
#define GAELCO_NUM_CHANNELS 0x07
#define GAELCO_VOLUME_LEVELS 0x10
@ -52,6 +53,7 @@ struct gaelco_sound_channel
};
//sound_stream *m_stream; /* our stream */
static Stream stream;
static UINT8 *m_snd_data; /* PCM data */
static INT32 m_banks[4]; /* start of each ROM bank */
static gaelco_sound_channel m_channel[GAELCO_NUM_CHANNELS]; /* 7 stereo channels */
@ -62,12 +64,6 @@ static INT32 gaelcosnd_initted = 0;
static INT32 gaelcosnd_mono = 0;
static INT32 gaelcosnd_swap_lr = 0;
// for resampling
static UINT32 nSampleSize;
static INT32 nFractionalPosition;
static INT32 nPosition;
static INT16 *sample_buffer;
// Table for converting from 8 to 16 bits with volume control
static INT16 m_volume_table[GAELCO_VOLUME_LEVELS][256];
@ -84,26 +80,13 @@ static void gaelco_set_bank_offsets(INT32 offs1, INT32 offs2, INT32 offs3, INT32
Writes length bytes to the sound buffer
============================================================================*/
void gaelcosnd_update(INT16 *outputs, INT32 samples)
static void sound_stream_update(INT16 **streams, INT32 samples)
{
if (samples != nBurnSoundLen) {
bprintf(0, _T("gaelcosnd_update(): once per frame, please!\n"));
return;
}
INT32 nSamplesNeeded = ((((((8000 * 1000) / nBurnFPS) * samples) / nBurnSoundLen)) / 10) + 1;
if (nBurnSoundRate < 44100) nSamplesNeeded += 2; // so we don't end up with negative nPosition below
INT16 *lmix = sample_buffer + (8000 * 0) + 5 + nPosition;
INT16 *rmix = sample_buffer + (8000 * 1) + 5 + nPosition;
/* zap the contents of the mixer buffer */
memset(lmix, 0, nSamplesNeeded * sizeof(INT16));
memset(rmix, 0, nSamplesNeeded * sizeof(INT16));
INT16 *lmix = streams[0];
INT16 *rmix = streams[1];
/* fill all data needed */
for(INT32 j = 0; j < (nSamplesNeeded - nPosition); j++){
for(INT32 j = 0; j < samples; j++){
INT32 output_l = 0, output_r = 0;
/* for each channel */
@ -212,45 +195,16 @@ void gaelcosnd_update(INT16 *outputs, INT32 samples)
*rmix++ = output_r;
}
}
}
INT16 *pBufL = sample_buffer + (8000 * 0) + 5;
INT16 *pBufR = sample_buffer + (8000 * 1) + 5;
for (INT32 i = (nFractionalPosition & 0xFFFF0000) >> 15; i < (samples << 1); i += 2, nFractionalPosition += nSampleSize) {
INT32 nLeftSample[4] = {0, 0, 0, 0};
INT32 nRightSample[4] = {0, 0, 0, 0};
INT32 nTotalLeftSample, nTotalRightSample;
nLeftSample[0] += (INT32)(pBufL[(nFractionalPosition >> 16) - 3]);
nLeftSample[1] += (INT32)(pBufL[(nFractionalPosition >> 16) - 2]);
nLeftSample[2] += (INT32)(pBufL[(nFractionalPosition >> 16) - 1]);
nLeftSample[3] += (INT32)(pBufL[(nFractionalPosition >> 16) - 0]);
nRightSample[0] += (INT32)(pBufR[(nFractionalPosition >> 16) - 3]);
nRightSample[1] += (INT32)(pBufR[(nFractionalPosition >> 16) - 2]);
nRightSample[2] += (INT32)(pBufR[(nFractionalPosition >> 16) - 1]);
nRightSample[3] += (INT32)(pBufR[(nFractionalPosition >> 16) - 0]);
nTotalLeftSample = INTERPOLATE4PS_16BIT((nFractionalPosition >> 4) & 0x0fff, nLeftSample[0], nLeftSample[1], nLeftSample[2], nLeftSample[3]);
nTotalRightSample = INTERPOLATE4PS_16BIT((nFractionalPosition >> 4) & 0x0fff, nRightSample[0], nRightSample[1], nRightSample[2], nRightSample[3]);
outputs[i + 0] = BURN_SND_CLIP(nTotalLeftSample);
outputs[i + 1] = BURN_SND_CLIP(nTotalRightSample);
void gaelcosnd_update(INT16 *output, INT32 samples_len)
{
if (samples_len != nBurnSoundLen) {
bprintf(0, _T("gaelco_update(): once per frame, please!\n"));
return;
}
if (samples >= nBurnSoundLen) {
INT32 nExtraSamples = nSamplesNeeded - (nFractionalPosition >> 16);
//bprintf(0, _T("%d, "), nExtraSamples);
for (INT32 i = -4; i < nExtraSamples; i++) {
pBufL[i] = pBufL[(nFractionalPosition >> 16) + i];
pBufR[i] = pBufR[(nFractionalPosition >> 16) + i];
}
nFractionalPosition &= 0xFFFF;
nPosition = nExtraSamples;
}
stream.render(output, samples_len);
}
/*============================================================================
@ -343,13 +297,7 @@ void gaelcosnd_start(UINT8 *soundrom, INT32 offs1, INT32 offs2, INT32 offs3, INT
gaelcosnd_reset();
// for resampling
sample_buffer = (INT16 *)BurnMalloc(8000 * sizeof(INT16) * 2); // more than enough :)
memset(sample_buffer, 0, 8000 * sizeof(INT16) * 2);
if (nBurnSoundRate) nSampleSize = (UINT32)8000 * (1 << 16) / nBurnSoundRate;
nFractionalPosition = 0;
nPosition = 0;
stream.init(1000000/128, nBurnSoundRate, 2, 0, sound_stream_update);
gaelcosnd_initted = 1;
}
@ -368,23 +316,19 @@ void gaelcosnd_exit()
{
if (!gaelcosnd_initted) return;
BurnFree(sample_buffer);
sample_buffer = NULL;
stream.exit();
m_snd_data = NULL;
gaelcosnd_mono = 0;
gaelcosnd_swap_lr = 0;
gaelcosnd_initted = 0;
}
void gaelcosnd_scan(INT32 nAction, INT32 *)
{
SCAN_VAR(m_channel);
SCAN_VAR(m_sndregs);
if (nAction & ACB_WRITE && ~nAction & ACB_RUNAHEAD) {
nFractionalPosition = 0;
nPosition = 0;
memset(sample_buffer, 0, 8000 * sizeof(INT16) * 2);
}
}
void gaelcosnd_reset()