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

Merge branch 'master' of https://github.com/project64/project64

This commit is contained in:
zilmar 2018-12-08 20:22:37 +10:30
parent 2ca97f0b37 92887d757b
commit 0e2e8eef10
1 changed files with 11 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Source/Project64-audio/AudioMain.cpp
View File

@ -85,14 +85,16 @@ EXPORT void CALL AiDacrateChanged(int SystemType)
WriteTrace(TraceAudioInterface, TraceNotice, "Unknown/reserved bits in AI_DACRATE_REG set. 0x%08X", *g_AudioInfo.AI_DACRATE_REG); WriteTrace(TraceAudioInterface, TraceNotice, "Unknown/reserved bits in AI_DACRATE_REG set. 0x%08X", *g_AudioInfo.AI_DACRATE_REG);
} }
uint32_t video_clock = 0; uint32_t video_clock = 0; int32_t BufferSize = 0;
double audio_clock = 0; double framerate = (30 / 1.001);
switch (SystemType) switch (SystemType)
{ {
case SYSTEM_NTSC: video_clock = 48681812; break; case SYSTEM_NTSC: video_clock = 48681812; break;
case SYSTEM_PAL: video_clock = 49656530; break; case SYSTEM_PAL: video_clock = 49656530; framerate = 25; break;
case SYSTEM_MPAL: video_clock = 48628316; break; case SYSTEM_MPAL: video_clock = 48628316; break;
} }
uint32_t Frequency = video_clock / (g_Dacrate + 1); uint32_t Frequency = (video_clock / (g_Dacrate + 1));
if (Frequency < 4000) if (Frequency < 4000)
{ {
@ -101,28 +103,16 @@ EXPORT void CALL AiDacrateChanged(int SystemType)
} }
else else
{ {
int32_t BufferSize = 0; double audio_clock = 0; double framerate = 0; if (g_settings->FPSBuffer() == false && SystemType != SYSTEM_PAL)
if (g_settings->FPSBuffer() == true)
{ {
framerate = 59.94004; framerate = 30.475; // Needed for Body Harvest (U)
if (SystemType == SYSTEM_PAL) { framerate = 50; }
} }
else if (g_settings->TinyBuffer() == false)
{ {
framerate = 64; framerate = (framerate / 2);
if (SystemType == SYSTEM_PAL) { framerate = 53.33333; }
} }
if (g_settings->TinyBuffer() == true) audio_clock = (video_clock / framerate);
{ BufferSize = (int32_t)(audio_clock / (g_Dacrate + 1)) + 1 & ~0x1;
audio_clock = ((video_clock / framerate) * 2);
}
else
{
audio_clock = ((video_clock / framerate) * 4);
}
BufferSize = (int32_t)audio_clock / (g_Dacrate) + 1 & ~0x1;
g_SoundDriver->AI_SetFrequency(Frequency, BufferSize); g_SoundDriver->AI_SetFrequency(Frequency, BufferSize);
} }
} }