RaySollium99/picodrive
1
0
Fork 0
mirror of https://github.com/RaySollium99/picodrive.git synced 2025-09-05 15:27:46 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

working audio sync?

Browse source 
git-svn-id: file:///home/notaz/opt/svn/PicoDrive@266 be3aeb3a-fb24-0410-a615-afba39da0efa
This commit is contained in:
notaz 2007-09-30 20:08:34 +00:00
parent fa283c9a38
commit f3d1de29da
2 changed files with 22 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

26
platform/gizmondo/emu.c
View file

@ -557,7 +557,7 @@ void emu_Loop(void)
snd_excess_add = ((PsndRate - PsndLen*target_fps)<<16) / target_fps; snd_excess_add = ((PsndRate - PsndLen*target_fps)<<16) / target_fps;
snd_cbuf_samples = (PsndRate<<stereo) * 16 / target_fps; snd_cbuf_samples = (PsndRate<<stereo) * 16 / target_fps;
lprintf("starting audio: %i len: %i (ex: %04x) stereo: %i, pal: %i\n", lprintf("starting audio: %i len: %i (ex: %04x) stereo: %i, pal: %i\n",
PsndRate, PsndLen, snd_excess_add, (PicoOpt&8)>>3, Pico.m.pal); PsndRate, PsndLen, snd_excess_add, stereo, Pico.m.pal);
ret = FrameworkAudio_Init(PsndRate, snd_cbuf_samples, stereo); ret = FrameworkAudio_Init(PsndRate, snd_cbuf_samples, stereo);
if (ret != 0) { if (ret != 0) {
lprintf("FrameworkAudio_Init() failed: %i\n", ret); lprintf("FrameworkAudio_Init() failed: %i\n", ret);
@ -632,11 +632,27 @@ void emu_Loop(void)
if (PsndOut != NULL) if (PsndOut != NULL)
{ {
int audio_skew, adj; /* some code which tries to sync things to audio clock, the dirty way */
static int audio_skew_prev = 0;
int audio_skew, adj, co = 9, shift = 7;
audio_skew = snd_all_samples*2 - FrameworkAudio_BufferPos(); audio_skew = snd_all_samples*2 - FrameworkAudio_BufferPos();
if (audio_skew < 0) if (PsndRate == 22050) co = 10;
adj = -((-audio_skew) >> 10); if (PsndRate > 22050) co = 11;
else adj = audio_skew >> 10; if (PicoOpt&8) shift++;
if (audio_skew < 0) {
adj = -((-audio_skew) >> shift);
if (audio_skew > -(6<<co)) adj>>=1;
if (audio_skew > -(4<<co)) adj>>=1;
if (audio_skew > -(2<<co)) adj>>=1;
if (audio_skew > audio_skew_prev) adj>>=2; // going up already
} else {
adj = audio_skew >> shift;
if (audio_skew < (6<<co)) adj>>=1;
if (audio_skew < (4<<co)) adj>>=1;
if (audio_skew < (2<<co)) adj>>=1;
if (audio_skew < audio_skew_prev) adj>>=2;
}
audio_skew_prev = audio_skew;
target_frametime += adj; target_frametime += adj;
sec_ms = (target_frametime * target_fps) >> 8; sec_ms = (target_frametime * target_fps) >> 8;
stdbg("%i %i %i", audio_skew, adj, sec_ms); stdbg("%i %i %i", audio_skew, adj, sec_ms);

2
platform/gizmondo/menu.c
View file

@ -1175,7 +1175,7 @@ static int sndrate_prevnext(int rate, int dir)
if (rates[i] == rate) break; if (rates[i] == rate) break;
i += dir ? 1 : -1; i += dir ? 1 : -1;
if (i > 4) return dir ? 44100 : 22050; if (i > 2) return dir ? 44100 : 22050;
if (i < 0) return dir ? 22050 : 11025; if (i < 0) return dir ? 22050 : 11025;
return rates[i]; return rates[i];
} }