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

PAL/NTSC noise fixed

This commit is contained in:
CaH4e3 2011-08-19 07:53:07 +00:00
parent 72f17fb40c
commit dea31f040e
1 changed files with 68 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/sound.cpp
View File

@ -100,7 +100,7 @@ static const uint32 NoiseFreqTablePAL[0x10] =
236, 354, 472, 708, 944, 1890, 3778 236, 354, 472, 708, 944, 1890, 3778
}; };
/*static*/ const uint32 *NoiseFreqTable = NoiseFreqTableNTSC; const uint32 *NoiseFreqTable = NoiseFreqTableNTSC; // for lua only
static const uint32 NTSCDMCTable[0x10]= static const uint32 NTSCDMCTable[0x10]=
{ {
@ -880,10 +880,13 @@ static void RDoTriangleNoisePCMLQ(void)
rea2: rea2:
//used to added <<(16+2) when the noise table //used to added <<(16+2) when the noise table
//values were half. //values were half.
noiseacc+=NoiseFreqTable[PSG[0xE]&0xF]<<(16+1); if(PAL)
noiseacc+=NoiseFreqTablePAL[PSG[0xE]&0xF]<<(16+1);
else
noiseacc+=NoiseFreqTableNTSC[PSG[0xE]&0xF]<<(16+1);
nreg=(nreg<<1)+(((nreg>>nshift)^(nreg>>14))&1); nreg=(nreg<<1)+(((nreg>>nshift)^(nreg>>14))&1);
nreg&=0x7fff; nreg&=0x7fff;
noiseout=amptab[(nreg>>0xe)]; noiseout=amptab[(nreg>>0xe)&1];
if(noiseacc<=0) goto rea2; if(noiseacc<=0) goto rea2;
totalout = wlookup2[tcout+noiseout+RawDALatch]; totalout = wlookup2[tcout+noiseout+RawDALatch];
} /* noiseacc<=0 */ } /* noiseacc<=0 */
@ -921,10 +924,13 @@ static void RDoTriangleNoisePCMLQ(void)
area2: area2:
//used to be added <<(16+2) when the noise table //used to be added <<(16+2) when the noise table
//values were half. //values were half.
noiseacc+=NoiseFreqTable[PSG[0xE]&0xF]<<(16+1); if(PAL)
noiseacc+=NoiseFreqTablePAL[PSG[0xE]&0xF]<<(16+1);
else
noiseacc+=NoiseFreqTableNTSC[PSG[0xE]&0xF]<<(16+1);
nreg=(nreg<<1)+(((nreg>>nshift)^(nreg>>14))&1); nreg=(nreg<<1)+(((nreg>>nshift)^(nreg>>14))&1);
nreg&=0x7fff; nreg&=0x7fff;
noiseout=amptab[(nreg>>0xe)]; noiseout=amptab[(nreg>>0xe)&1];
if(noiseacc<=0) goto area2; if(noiseacc<=0) goto area2;
totalout = wlookup2[tcout+noiseout+RawDALatch]; totalout = wlookup2[tcout+noiseout+RawDALatch];
} /* noiseacc<=0 */ } /* noiseacc<=0 */
@ -957,7 +963,7 @@ static void RDoNoise(void)
amptab[0]<<=1; amptab[0]<<=1;
outo=amptab[nreg&1]; //(nreg>>0xe)&1]; outo=amptab[(nreg>>0xe)&1];
if(!lengthcount[3]) if(!lengthcount[3])
{ {
@ -972,7 +978,10 @@ static void RDoNoise(void)
if(!wlcount[3]) if(!wlcount[3])
{ {
uint8 feedback; uint8 feedback;
wlcount[3]=NoiseFreqTable[PSG[0xE]&0xF]; if(PAL)
wlcount[3]=NoiseFreqTablePAL[PSG[0xE]&0xF];
else
wlcount[3]=NoiseFreqTableNTSC[PSG[0xE]&0xF];
feedback=((nreg>>8)&1)^((nreg>>14)&1); feedback=((nreg>>8)&1)^((nreg>>14)&1);
nreg=(nreg<<1)+feedback; nreg=(nreg<<1)+feedback;
nreg&=0x7fff; nreg&=0x7fff;
@ -987,7 +996,10 @@ static void RDoNoise(void)
if(!wlcount[3]) if(!wlcount[3])
{ {
uint8 feedback; uint8 feedback;
wlcount[3]=NoiseFreqTable[PSG[0xE]&0xF]; if(PAL)
wlcount[3]=NoiseFreqTablePAL[PSG[0xE]&0xF];
else
wlcount[3]=NoiseFreqTableNTSC[PSG[0xE]&0xF];
feedback=((nreg>>13)&1)^((nreg>>14)&1); feedback=((nreg>>13)&1)^((nreg>>14)&1);
nreg=(nreg<<1)+feedback; nreg=(nreg<<1)+feedback;
nreg&=0x7fff; nreg&=0x7fff;
@ -1115,11 +1127,6 @@ void FCEUSND_Reset(void)
fcnt=0; fcnt=0;
nreg=1; nreg=1;
if (PAL)
NoiseFreqTable = NoiseFreqTablePAL;
else
NoiseFreqTable = NoiseFreqTableNTSC;
for(x=0;x<2;x++) for(x=0;x<2;x++)
{ {
wlcount[x]=2048; wlcount[x]=2048;