X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2Fsound%2Fsound.c;h=a9f2f68b761eced584aa0f675ff60ba71568c9a8;hb=abe0ea43b561e2def84cf921b1d6d8c82819ea69;hp=d5802bdcf26784ce7a49c78278e972b1f812cd58;hpb=cc68a136aa179a5f32fe40208371eb9c2b0aadae;p=picodrive.git

diff --git a/Pico/sound/sound.c b/Pico/sound/sound.c
index d5802bd..a9f2f68 100644
--- a/Pico/sound/sound.c
+++ b/Pico/sound/sound.c
@@ -23,7 +23,11 @@
 #endif
 
 #include "../PicoInt.h"
+#include "../cd/pcm.h"
+#include "mix.h"
 
+// master int buffer to mix to
+static int PsndBuffer[2*44100/50];
 
 //int z80CycleAim = 0;
 
@@ -34,6 +38,8 @@ unsigned short dac_info[312]; // pppppppp ppppllll, p - pos in buff, l - length
 // for Pico
 int PsndRate=0;
 int PsndLen=0; // number of mono samples, multiply by 2 for stereo
+int PsndLen_exc_add=0; // this is for non-integer sample counts per line, eg. 22050/60
+int PsndLen_exc_cnt=0;
 short *PsndOut=NULL; // PCM data buffer
 
 // from ym2612.c
@@ -51,7 +57,7 @@ static void dac_recalculate()
 
   if(PsndLen <= lines) {
     // shrinking algo
-    dac_cnt = 0;//lines - PsndLen;
+    dac_cnt = -PsndLen;
     len=1; pos=0;
     dac_info[225] = 1;
 
@@ -68,7 +74,7 @@ static void dac_recalculate()
     }
   } else {
     // stretching
-    dac_cnt = PsndLen/2;
+    dac_cnt = PsndLen;
     pos=0;
     for(i = 225; i != 224; i++) {
       if (i >= lines) i = 0;
@@ -77,7 +83,7 @@ static void dac_recalculate()
         dac_cnt -= lines;
         len++;
       }
-	  if (i == mid) // midpoint
+      if (i == mid) // midpoint
         while(pos+len < PsndLen/2) {
           dac_cnt -= lines;
           len++;
@@ -88,12 +94,16 @@ static void dac_recalculate()
     }
     // last sample
     for(len = 0, i = pos; i < PsndLen; i++) len++;
+    if (PsndLen_exc_add) len++;
     dac_info[224] = (pos<<4)|len;
   }
-//  dprintf("rate is %i, len %i", PsndRate, PsndLen);
-//  for(i=0; i < lines; i++)
-//    dprintf("%03i : %03i : %i", i, dac_info[i]>>4, dac_info[i]&0xf);
-//exit(8);
+  //for(i=len=0; i < lines; i++) {
+  //  printf("%03i : %03i : %i\n", i, dac_info[i]>>4, dac_info[i]&0xf);
+  //  len+=dac_info[i]&0xf;
+  //}
+  //printf("rate is %i, len %f\n", PsndRate, (double)PsndRate/(Pico.m.pal ? 50.0 : 60.0));
+  //printf("len total: %i, last pos: %i\n", len, pos);
+  //exit(8);
 }
 
 
@@ -102,93 +112,158 @@ void sound_reset()
   extern int z80stopCycle;
   void *ym2612_regs;
 
-  // init even if we are not going to use them, just in case we ever enable it
-  YM2612Init(Pico.m.pal ? OSC_PAL/7 : OSC_NTSC/7, PsndRate);
   // also clear the internal registers+addr line
   ym2612_regs = YM2612GetRegs();
   memset(ym2612_regs, 0, 0x200+4);
-
-  SN76496_init(Pico.m.pal ? OSC_PAL/15 : OSC_NTSC/15, PsndRate);
-
-  // calculate PsndLen
-  PsndLen=PsndRate/(Pico.m.pal ? 50 : 60);
-
-  // recalculate dac info
-  dac_recalculate();
   z80stopCycle = 0;
+
+  sound_rerate(0);
 }
 
 
 // to be called after changing sound rate or chips
-void sound_rerate()
+void sound_rerate(int preserve_state)
 {
   unsigned int state[28];
+  int target_fps = Pico.m.pal ? 50 : 60;
+
+  // not all rates are supported in MCD mode due to mp3 decoder limitations
+  if (PicoMCD & 1) {
+    if (PsndRate != 11025 && PsndRate != 22050 && PsndRate != 44100) PsndRate = 22050;
+    PicoOpt |= 8; // force stereo
+  }
 
+  if (preserve_state) {
+    if ((PicoMCD & 1) && Pico_mcd->m.audio_track)
+      Pico_mcd->m.audio_offset = mp3_get_offset();
+  }
   YM2612Init(Pico.m.pal ? OSC_PAL/7 : OSC_NTSC/7, PsndRate);
-  // feed it back it's own registers, just like after loading state
-  YM2612PicoStateLoad();
+  if (preserve_state) {
+    // feed it back it's own registers, just like after loading state
+    YM2612PicoStateLoad();
+    if ((PicoMCD & 1) && Pico_mcd->m.audio_track)
+      mp3_start_play(Pico_mcd->TOC.Tracks[Pico_mcd->m.audio_track].F, Pico_mcd->m.audio_offset);
+  }
 
-  memcpy(state, sn76496_regs, 28*4); // remember old state
+  if (preserve_state) memcpy(state, sn76496_regs, 28*4); // remember old state
   SN76496_init(Pico.m.pal ? OSC_PAL/15 : OSC_NTSC/15, PsndRate);
-  memcpy(sn76496_regs, state, 28*4); // restore old state
+  if (preserve_state) memcpy(sn76496_regs, state, 28*4); // restore old state
 
   // calculate PsndLen
-  PsndLen=PsndRate/(Pico.m.pal ? 50 : 60);
+  PsndLen=PsndRate / target_fps;
+  PsndLen_exc_add=((PsndRate - PsndLen*target_fps)<<16) / target_fps;
+  PsndLen_exc_cnt=0;
 
   // recalculate dac info
   dac_recalculate();
+
+  if (PicoMCD & 1)
+    pcm_set_rate(PsndRate);
+
+  // clear all buffers
+  memset32(PsndBuffer, 0, sizeof(PsndBuffer)/4);
+  if (PsndOut)
+    sound_clear();
 }
 
 
 // This is called once per raster (aka line), but not necessarily for every line
-int sound_timers_and_dac(int raster)
+void sound_timers_and_dac(int raster)
 {
-  if(raster >= 0 && PsndOut && (PicoOpt&1) && *ym2612_dacen) {
-    short dout = (short) *ym2612_dacout;
-    int pos=dac_info[raster], len=pos&0xf;
-    short *d;
-    pos>>=4;
-
-    if(PicoOpt&8) { // only left channel for stereo (will be copied to right by ym2612 mixing code)
-      d=PsndOut+pos*2;
-      while(len--) { *d = dout; d += 2; }
+  int pos, len;
+  int do_dac = PsndOut && (PicoOpt&1) && *ym2612_dacen;
+//  int do_pcm = PsndOut && (PicoMCD&1) && (PicoOpt&0x400);
+
+  // Our raster lasts 63.61323/64.102564 microseconds (NTSC/PAL)
+  YM2612PicoTick(1);
+
+  if (!do_dac /*&& !do_pcm*/) return;
+
+  pos=dac_info[raster], len=pos&0xf;
+  if (!len) return;
+
+  pos>>=4;
+
+  if (do_dac) {
+    short *d = PsndOut + pos*2;
+    int dout = *ym2612_dacout;
+    if(PicoOpt&8) {
+      // some manual loop unrolling here :)
+      d[0] = dout;
+      if (len > 1) {
+        d[2] = dout;
+        if (len > 2)
+          d[4] = dout;
+      }
     } else {
-      d=PsndOut+pos;
-      while(len--) *d++ = dout;
+      short *d = PsndOut + pos;
+      d[0] = dout;
+      if (len > 1) {
+        d[1] = dout;
+        if (len > 2)
+          d[2] = dout;
+      }
     }
   }
 
-  //dprintf("s: %03i", raster);
+#if 0
+  if (do_pcm) {
+    int *d = PsndBuffer;
+    d += (PicoOpt&8) ? pos*2 : pos;
+    pcm_update(d, len, 1);
+  }
+#endif
+}
 
-  // Our raster lasts 63.61323/64.102564 microseconds (NTSC/PAL)
-  YM2612PicoTick(1);
 
-  return 0;
+void sound_clear(void)
+{
+  int len = PsndLen;
+  if (PsndLen_exc_add) len++;
+  if (PicoOpt & 8) memset32((int *) PsndOut, 0, len); // clear both channels at once
+  else memset(PsndOut, 0, len<<1);
 }
 
 
 int sound_render(int offset, int length)
 {
+  int *buf32 = PsndBuffer+offset;
   int stereo = (PicoOpt & 8) >> 3;
+  // emulating CD && PCM option enabled && PCM chip on && have enabled channels
+  int do_pcm = (PicoMCD&1) && (PicoOpt&0x400) && (Pico_mcd->pcm.control & 0x80) && Pico_mcd->pcm.enabled;
   offset <<= stereo;
 
+  if (offset == 0) { // should happen once per frame
+    // compensate for float part of PsndLen
+    PsndLen_exc_cnt += PsndLen_exc_add;
+    if (PsndLen_exc_cnt >= 0x10000) {
+      PsndLen_exc_cnt -= 0x10000;
+      length++;
+    }
+  }
+
   // PSG
-  if(PicoOpt & 2)
+  if (PicoOpt & 2)
     SN76496Update(PsndOut+offset, length, stereo);
 
   // Add in the stereo FM buffer
-  if(PicoOpt & 1) {
-    YM2612UpdateOne(PsndOut+offset, length, stereo);
-  } else {
-    // YM2612 upmixes to stereo, so we have to do this manually here
-    int i;
-	short *s = PsndOut+offset;
-	for (i = 0; i < length; i++) {
-      *(s+1) = *s; s+=2;
-    }
-  }
+  if (PicoOpt & 1)
+    YM2612UpdateOne(buf32, length, stereo, 1);
 
-  return 0;
+  // CD: PCM sound
+  if (do_pcm)
+    pcm_update(buf32, length, stereo);
+
+  // CD: CDDA audio
+  if ((PicoMCD & 1) && (PicoOpt & 0x800))
+    mp3_update(buf32, length, stereo);
+
+  // convert + limit to normal 16bit output
+  if (stereo)
+       mix_32_to_16l_stereo(PsndOut+offset, buf32, length);
+  else mix_32_to_16_mono   (PsndOut+offset, buf32, length);
+
+  return length;
 }
 
 
@@ -259,14 +334,14 @@ void z80_init()
   mz80init();
   // Modify the default context
   mz80GetContext(&z80);
-  
+
   // point mz80 stuff
   z80.z80Base=Pico.zram;
   z80.z80MemRead=mz80_mem_read;
   z80.z80MemWrite=mz80_mem_write;
   z80.z80IoRead=mz80_io_read;
   z80.z80IoWrite=mz80_io_write;
-  
+
   mz80SetContext(&z80);
 
 #elif defined(_USE_DRZ80)