X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=plugins%2Fdfsound%2Fexternals.h;h=d1d081af744fecfd5eef463fab390c950431c818;hp=73134d07a20a23fb35b47323524eb50ced7436fd;hb=9ad8abfa940cd5c13eb0653639ea86736b65a2c4;hpb=1775933abd26d2e282c4e0b4093778d204a0038d diff --git a/plugins/dfsound/externals.h b/plugins/dfsound/externals.h index 73134d07..d1d081af 100644 --- a/plugins/dfsound/externals.h +++ b/plugins/dfsound/externals.h @@ -21,6 +21,14 @@ // generic defines ///////////////////////////////////////////////////////// +#ifdef __GNUC__ +#define noinline __attribute__((noinline)) +#define unlikely(x) __builtin_expect((x), 0) +#else +#define noinline +#define unlikely(x) x +#endif + #define PSE_LT_SPU 4 #define PSE_SPU_ERR_SUCCESS 0 #define PSE_SPU_ERR -60 @@ -35,45 +43,27 @@ // spu defines //////////////////////////////////////////////////////////////////////// -// sound buffer sizes -// 400 ms complete sound buffer -#define SOUNDSIZE 70560 -// 137 ms test buffer... if less than that is buffered, a new upload will happen -#define TESTSIZE 24192 - // num of channels #define MAXCHAN 24 -// ~ 1 ms of data // note: must be even due to the way reverb works now -#define NSSIZE 46 +#define NSSIZE ((44100 / 50 + 16) & ~1) /////////////////////////////////////////////////////////// // struct defines /////////////////////////////////////////////////////////// -// ADSR INFOS PER CHANNEL -typedef struct -{ - int AttackModeExp; - long AttackTime; - long DecayTime; - long SustainLevel; - int SustainModeExp; - long SustainModeDec; - long SustainTime; - int ReleaseModeExp; - unsigned long ReleaseVal; - long ReleaseTime; - long ReleaseStartTime; - long ReleaseVol; - long lTime; - long lVolume; -} ADSRInfo; +enum ADSR_State { + ADSR_ATTACK = 0, + ADSR_DECAY = 1, + ADSR_SUSTAIN = 2, + ADSR_RELEASE = 3, +}; +// ADSR INFOS PER CHANNEL typedef struct { - unsigned char State:2; + unsigned char State:2; // ADSR_State unsigned char AttackModeExp:1; unsigned char SustainModeExp:1; unsigned char SustainIncrease:1; @@ -105,33 +95,23 @@ typedef struct int iSBPos; // mixing stuff int spos; int sinc; + int sinc_inv; - unsigned char * pStart; // start ptr into sound mem unsigned char * pCurr; // current pos in sound mem unsigned char * pLoop; // loop ptr in sound mem - unsigned int bStop:1; // is channel stopped (sample _can_ still be playing, ADSR Release phase) unsigned int bReverb:1; // can we do reverb on this channel? must have ctrl register bit, to get active - unsigned int bIgnoreLoop:1; // ignore loop bit, if an external loop address is used unsigned int bRVBActive:1; // reverb active flag unsigned int bNoise:1; // noise active flag unsigned int bFMod:2; // freq mod (0=off, 1=sound channel, 2=freq channel) + unsigned int prevflags:3; // flags from previous block - int iActFreq; // current psx pitch - int iUsedFreq; // current pc pitch int iLeftVolume; // left volume int iRightVolume; // right volume - int s_1; // last decoding infos - int s_2; ADSRInfoEx ADSRX; int iRawPitch; // raw pitch (0...3fff) - int iRVBOffset; // reverb offset - int iRVBRepeat; // reverb repeat - int iRVBNum; // another reverb helper - int iOldNoise; // old noise val for this channel - - int SB[32+32]; + int SB[32+4]; } SPUCHAN; /////////////////////////////////////////////////////////// @@ -192,91 +172,82 @@ typedef struct } REVERBInfo; /////////////////////////////////////////////////////////// -// SPU.C globals -/////////////////////////////////////////////////////////// - -#ifndef _IN_SPU // psx buffers / addresses -extern unsigned short regArea[]; -extern unsigned short spuMem[]; -extern unsigned char * spuMemC; -extern unsigned char * pSpuIrq; -extern unsigned char * pSpuBuffer; +typedef struct +{ + unsigned short spuCtrl; + unsigned short spuStat; -// user settings + unsigned int spuAddr; + unsigned char * spuMemC; + unsigned char * pSpuIrq; -extern int iVolume; -extern int iXAPitch; -extern int iUseTimer; -extern int iSPUIRQWait; -extern int iDebugMode; -extern int iRecordMode; -extern int iUseReverb; -extern int iUseInterpolation; -// MISC + unsigned int cycles_played; + int decode_pos; + int decode_dirty_ch; + unsigned int bSpuInit:1; + unsigned int bSPUIsOpen:1; -extern int iSpuAsyncWait; + unsigned int dwNoiseVal; // global noise generator + unsigned int dwNoiseCount; + unsigned int dwNewChannel; // flags for faster testing, if new channel starts + unsigned int dwChannelOn; // not silent channels + unsigned int dwChannelDead; // silent+not useful channels -extern SPUCHAN s_chan[]; -extern REVERBInfo rvb; + unsigned char * pSpuBuffer; + short * pS; -extern unsigned long dwNoiseVal; -extern unsigned short spuCtrl; -extern unsigned short spuStat; -extern unsigned short spuIrq; -extern unsigned long spuAddr; -extern int bEndThread; -extern int bThreadEnded; -extern int bSpuInit; -extern unsigned int dwNewChannel; -extern unsigned int dwChannelOn; -extern unsigned int dwPendingChanOff; - -extern int SSumR[]; -extern int SSumL[]; -extern int iCycle; -extern short * pS; - -extern void (CALLBACK *cddavCallback)(unsigned short,unsigned short); + void (CALLBACK *irqCallback)(void); // func of main emu, called on spu irq + void (CALLBACK *cddavCallback)(unsigned short,unsigned short); + void (CALLBACK *scheduleCallback)(unsigned int); -#endif + int * sRVBStart; -/////////////////////////////////////////////////////////// -// XA.C globals -/////////////////////////////////////////////////////////// + xa_decode_t * xapGlobal; + unsigned int * XAFeed; + unsigned int * XAPlay; + unsigned int * XAStart; + unsigned int * XAEnd; -#ifndef _IN_XA + unsigned int * CDDAFeed; + unsigned int * CDDAPlay; + unsigned int * CDDAStart; + unsigned int * CDDAEnd; -extern xa_decode_t * xapGlobal; + unsigned int XARepeat; + unsigned int XALastVal; -extern uint32_t * XAFeed; -extern uint32_t * XAPlay; -extern uint32_t * XAStart; -extern uint32_t * XAEnd; + int iLeftXAVol; + int iRightXAVol; -extern uint32_t XARepeat; -extern uint32_t XALastVal; + int pad[32]; + unsigned short regArea[0x400]; + unsigned short spuMem[256*1024]; +} SPUInfo; -extern uint32_t * CDDAFeed; -extern uint32_t * CDDAPlay; -extern uint32_t * CDDAStart; -extern uint32_t * CDDAEnd; +/////////////////////////////////////////////////////////// +// SPU.C globals +/////////////////////////////////////////////////////////// -extern int iLeftXAVol; -extern int iRightXAVol; +#ifndef _IN_SPU -#endif +extern SPUInfo spu; +extern SPUCHAN s_chan[]; +extern REVERBInfo rvb; -/////////////////////////////////////////////////////////// -// REVERB.C globals -/////////////////////////////////////////////////////////// +void do_samples(unsigned int cycles_to); +void schedule_next_irq(void); -#ifndef _IN_REVERB +#define regAreaGet(ch,offset) \ + spu.regArea[((ch<<4)|(offset))>>1] -extern int * sRVBPlay; -extern int * sRVBEnd; -extern int * sRVBStart; +#define do_samples_if_needed(c) \ + do { \ + if ((int)((c) - spu.cycles_played) >= 16 * 768) \ + do_samples(c); \ + } while (0) #endif +