// for Pico\r
int PsndRate=0;\r
int PsndLen=0; // number of mono samples, multiply by 2 for stereo\r
+int PsndLen_exc_add=0; // this is for non-integer sample counts per line, eg. 22050/60\r
+int PsndLen_exc_cnt=0;\r
short *PsndOut=NULL; // PCM data buffer\r
\r
// from ym2612.c\r
\r
if(PsndLen <= lines) {\r
// shrinking algo\r
- dac_cnt = 0;//lines - PsndLen;\r
+ dac_cnt = -PsndLen;\r
len=1; pos=0;\r
dac_info[225] = 1;\r
\r
}\r
} else {\r
// stretching\r
- dac_cnt = PsndLen/2;\r
+ dac_cnt = PsndLen;\r
pos=0;\r
for(i = 225; i != 224; i++) {\r
if (i >= lines) i = 0;\r
}\r
// last sample\r
for(len = 0, i = pos; i < PsndLen; i++) len++;\r
+ if (PsndLen_exc_add) len++;\r
dac_info[224] = (pos<<4)|len;\r
}\r
-// dprintf("rate is %i, len %i", PsndRate, PsndLen);\r
-// for(i=0; i < lines; i++)\r
-// dprintf("%03i : %03i : %i", i, dac_info[i]>>4, dac_info[i]&0xf);\r
-//exit(8);\r
+ //for(i=len=0; i < lines; i++) {\r
+ // printf("%03i : %03i : %i\n", i, dac_info[i]>>4, dac_info[i]&0xf);\r
+ // len+=dac_info[i]&0xf;\r
+ //}\r
+ //printf("rate is %i, len %f\n", PsndRate, (double)PsndRate/(Pico.m.pal ? 50.0 : 60.0));\r
+ //printf("len total: %i, last pos: %i\n", len, pos);\r
+ //exit(8);\r
}\r
\r
\r
extern int z80stopCycle;\r
void *ym2612_regs;\r
\r
- // init even if we are not going to use them, just in case we ever enable it\r
- YM2612Init(Pico.m.pal ? OSC_PAL/7 : OSC_NTSC/7, PsndRate);\r
// also clear the internal registers+addr line\r
ym2612_regs = YM2612GetRegs();\r
memset(ym2612_regs, 0, 0x200+4);\r
-\r
- SN76496_init(Pico.m.pal ? OSC_PAL/15 : OSC_NTSC/15, PsndRate);\r
-\r
- // calculate PsndLen\r
- PsndLen=PsndRate/(Pico.m.pal ? 50 : 60);\r
-\r
- // recalculate dac info\r
- dac_recalculate();\r
z80stopCycle = 0;\r
+\r
+ sound_rerate(0);\r
}\r
\r
\r
// to be called after changing sound rate or chips\r
-void sound_rerate()\r
+void sound_rerate(int preserve_state)\r
{\r
unsigned int state[28];\r
+ int target_fps = Pico.m.pal ? 50 : 60;\r
\r
- // not all rates are supported in MCD mode due to mp3 decoder\r
+ // not all rates are supported in MCD mode due to mp3 decoder limitations\r
if (PicoMCD & 1) {\r
if (PsndRate != 11025 && PsndRate != 22050 && PsndRate != 44100) PsndRate = 22050;\r
- if (!(PicoOpt & 8)) PicoOpt |= 8;\r
+ PicoOpt |= 8; // force stereo\r
}\r
\r
- if ((PicoMCD & 1) && Pico_mcd->m.audio_track) Pico_mcd->m.audio_offset = mp3_get_offset();\r
+ if (preserve_state) {\r
+ if ((PicoMCD & 1) && Pico_mcd->m.audio_track)\r
+ Pico_mcd->m.audio_offset = mp3_get_offset();\r
+ }\r
YM2612Init(Pico.m.pal ? OSC_PAL/7 : OSC_NTSC/7, PsndRate);\r
- // feed it back it's own registers, just like after loading state\r
- YM2612PicoStateLoad();\r
- if ((PicoMCD & 1) && Pico_mcd->m.audio_track)\r
- mp3_start_play(Pico_mcd->TOC.Tracks[Pico_mcd->m.audio_track].F, Pico_mcd->m.audio_offset);\r
+ if (preserve_state) {\r
+ // feed it back it's own registers, just like after loading state\r
+ YM2612PicoStateLoad();\r
+ if ((PicoMCD & 1) && Pico_mcd->m.audio_track)\r
+ mp3_start_play(Pico_mcd->TOC.Tracks[Pico_mcd->m.audio_track].F, Pico_mcd->m.audio_offset);\r
+ }\r
\r
- memcpy(state, sn76496_regs, 28*4); // remember old state\r
+ if (preserve_state) memcpy(state, sn76496_regs, 28*4); // remember old state\r
SN76496_init(Pico.m.pal ? OSC_PAL/15 : OSC_NTSC/15, PsndRate);\r
- memcpy(sn76496_regs, state, 28*4); // restore old state\r
+ if (preserve_state) memcpy(sn76496_regs, state, 28*4); // restore old state\r
\r
// calculate PsndLen\r
- PsndLen=PsndRate/(Pico.m.pal ? 50 : 60);\r
+ PsndLen=PsndRate / target_fps;\r
+ PsndLen_exc_add=((PsndRate - PsndLen*target_fps)<<16) / target_fps;\r
+ PsndLen_exc_cnt=0;\r
\r
// recalculate dac info\r
dac_recalculate();\r
\r
if (PicoMCD & 1)\r
pcm_set_rate(PsndRate);\r
+\r
+ // clear all buffers\r
+ memset32(PsndBuffer, 0, sizeof(PsndBuffer)/4);\r
+ if (PsndOut)\r
+ sound_clear();\r
}\r
\r
\r
d[0] = dout;\r
if (len > 1) {\r
d[2] = dout;\r
- if (len > 2) {\r
+ if (len > 2)\r
d[4] = dout;\r
- if (len > 3)\r
- d[6] = dout;\r
- }\r
}\r
} else {\r
short *d = PsndOut + pos;\r
d[0] = dout;\r
if (len > 1) {\r
d[1] = dout;\r
- if (len > 2) {\r
+ if (len > 2)\r
d[2] = dout;\r
- if (len > 3)\r
- d[3] = dout;\r
- }\r
}\r
}\r
}\r
\r
void sound_clear(void)\r
{\r
- if (PicoOpt & 8) memset32((int *) PsndOut, 0, PsndLen);\r
- else memset(PsndOut, 0, PsndLen<<1);\r
-// memset(PsndBuffer, 0, (PicoOpt & 8) ? (PsndLen<<3) : (PsndLen<<2));\r
+ int len = PsndLen;\r
+ if (PsndLen_exc_add) len++;\r
+ if (PicoOpt & 8) memset32((int *) PsndOut, 0, len); // clear both channels at once\r
+ else memset(PsndOut, 0, len<<1);\r
}\r
\r
\r
int sound_render(int offset, int length)\r
{\r
+ int buf32_updated = 0;\r
int *buf32 = PsndBuffer+offset;\r
int stereo = (PicoOpt & 8) >> 3;\r
// emulating CD && PCM option enabled && PCM chip on && have enabled channels\r
int do_pcm = (PicoMCD&1) && (PicoOpt&0x400) && (Pico_mcd->pcm.control & 0x80) && Pico_mcd->pcm.enabled;\r
offset <<= stereo;\r
\r
+ if (offset == 0) { // should happen once per frame\r
+ // compensate for float part of PsndLen\r
+ PsndLen_exc_cnt += PsndLen_exc_add;\r
+ if (PsndLen_exc_cnt >= 0x10000) {\r
+ PsndLen_exc_cnt -= 0x10000;\r
+ length++;\r
+ }\r
+ }\r
+\r
// PSG\r
if (PicoOpt & 2)\r
SN76496Update(PsndOut+offset, length, stereo);\r
\r
// Add in the stereo FM buffer\r
- if (PicoOpt & 1)\r
- YM2612UpdateOne(buf32, length, stereo, 1);\r
+ if (PicoOpt & 1) {\r
+ buf32_updated = YM2612UpdateOne(buf32, length, stereo, 1);\r
+ } else\r
+ memset32(buf32, 0, length<<stereo);\r
+\r
+//printf("active_chs: %02x\n", buf32_updated);\r
\r
- if (do_pcm)\r
+ // CD: PCM sound\r
+ if (do_pcm) {\r
pcm_update(buf32, length, stereo);\r
+ //buf32_updated = 1;\r
+ }\r
\r
- // CDDA audio\r
-// if ((PicoMCD & 1) && (PicoOpt & 0x800))\r
-// mp3_update(PsndBuffer+offset, length, stereo);\r
+ // CD: CDDA audio\r
+ if ((PicoMCD & 1) && (PicoOpt & 0x800))\r
+ mp3_update(buf32, length, stereo);\r
\r
// convert + limit to normal 16bit output\r
if (stereo)\r
mix_32_to_16l_stereo(PsndOut+offset, buf32, length);\r
else mix_32_to_16_mono (PsndOut+offset, buf32, length);\r
\r
- return 0;\r
+ return length;\r
}\r
\r
\r
notaz.gp2x.de / picodrive.git / blobdiff