The-Homebrew-Cloud/snes9xgx
2
0
Fork 0
mirror of https://github.com/dborth/snes9xgx.git synced 2024-12-24 18:21:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Backport frequency changes (#820)

Browse Source 
Adjust default input rate, too.
Use nominal frequency ratio for APU.
This commit is contained in:
bladeoner 2019-02-24 02:51:28 +01:00 committed by dborth
parent d85c32f263
commit dc9149939e
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/preferences.cpp
View File

@ -498,7 +498,7 @@ DefaultSettings ()
Settings.Stereo = true; Settings.Stereo = true;
Settings.ReverseStereo = true; Settings.ReverseStereo = true;
Settings.SoundPlaybackRate = 48000; Settings.SoundPlaybackRate = 48000;
Settings.SoundInputRate = 31950; Settings.SoundInputRate = 31920;
Settings.DynamicRateControl = true; Settings.DynamicRateControl = true;
// Interpolation Method // Interpolation Method

10
source/snes9x/apu/apu.cpp
View File

@ -15,10 +15,10 @@
#define APU_DEFAULT_INPUT_RATE 32040 #define APU_DEFAULT_INPUT_RATE 32040
#define APU_MINIMUM_SAMPLE_COUNT 512 #define APU_MINIMUM_SAMPLE_COUNT 512
#define APU_MINIMUM_SAMPLE_BLOCK 128 #define APU_MINIMUM_SAMPLE_BLOCK 128
#define APU_NUMERATOR_NTSC 15664 #define APU_NUMERATOR_NTSC 5632
#define APU_DENOMINATOR_NTSC 328125 #define APU_DENOMINATOR_NTSC 118125
#define APU_NUMERATOR_PAL 34176 #define APU_NUMERATOR_PAL 35527
#define APU_DENOMINATOR_PAL 709379 #define APU_DENOMINATOR_PAL 738343
SNES_SPC *spc_core = NULL; SNES_SPC *spc_core = NULL;
@ -314,7 +314,7 @@ void UpdatePlaybackRate (void)
if (Settings.MSU1) if (Settings.MSU1)
{ {
time_ratio = (44100.0 / Settings.SoundPlaybackRate) * (Settings.SoundInputRate / 32040.0); time_ratio = (44100.0 / Settings.SoundPlaybackRate) * (Settings.SoundInputRate / 32000.0);
msu::resampler->time_ratio(time_ratio); msu::resampler->time_ratio(time_ratio);
} }
} }

6
source/snes9x/msu1.cpp
View File

@ -237,7 +237,7 @@ void S9xMSU1Generate(size_t sample_count)
{ {
partial_frames += 4410 * (sample_count / 2); partial_frames += 4410 * (sample_count / 2);
while ((bufPos < (bufEnd - 2)) && partial_frames >= 3204) while ((bufPos < (bufEnd - 2)) && partial_frames >= 3200)
{ {
if (MSU1.MSU1_STATUS & AudioPlaying && audioStream) if (MSU1.MSU1_STATUS & AudioPlaying && audioStream)
{ {
@ -255,7 +255,7 @@ void S9xMSU1Generate(size_t sample_count)
*(bufPos++) = *left; *(bufPos++) = *left;
*(bufPos++) = *right; *(bufPos++) = *right;
MSU1.MSU1_AUDIO_POS += 4; MSU1.MSU1_AUDIO_POS += 4;
partial_frames -= 3204; partial_frames -= 3200;
} }
else else
if (bytes_read >= 0) if (bytes_read >= 0)
@ -279,7 +279,7 @@ void S9xMSU1Generate(size_t sample_count)
else else
{ {
MSU1.MSU1_STATUS &= ~(AudioPlaying | AudioRepeating); MSU1.MSU1_STATUS &= ~(AudioPlaying | AudioRepeating);
partial_frames -= 3204; partial_frames -= 3200;
*(bufPos++) = 0; *(bufPos++) = 0;
*(bufPos++) = 0; *(bufPos++) = 0;
} }

2
source/snes9x/snes9x.h
View File

@ -62,7 +62,7 @@
#define IMAGE_WIDTH (Settings.SupportHiRes ? MAX_SNES_WIDTH : SNES_WIDTH) #define IMAGE_WIDTH (Settings.SupportHiRes ? MAX_SNES_WIDTH : SNES_WIDTH)
#define IMAGE_HEIGHT (Settings.SupportHiRes ? MAX_SNES_HEIGHT : SNES_HEIGHT_EXTENDED) #define IMAGE_HEIGHT (Settings.SupportHiRes ? MAX_SNES_HEIGHT : SNES_HEIGHT_EXTENDED)
#define NTSC_MASTER_CLOCK 21477272.0 #define NTSC_MASTER_CLOCK 21477272.727272 // 21477272 + 8/11 exact
#define PAL_MASTER_CLOCK 21281370.0 #define PAL_MASTER_CLOCK 21281370.0
#define SNES_MAX_NTSC_VCOUNTER 262 #define SNES_MAX_NTSC_VCOUNTER 262

2
source/video.cpp
View File

@ -638,7 +638,7 @@ ResetVideo_Emu ()
else else
ResetFbWidth(512, rmode); ResetFbWidth(512, rmode);
Settings.SoundInputRate = 31950; Settings.SoundInputRate = 31920;
UpdatePlaybackRate(); UpdatePlaybackRate();
} }