spu: try to clean up the interpolation mess

[pcsx_rearmed.git] / plugins / dfsound / externals.h

diff --git a/plugins/dfsound/externals.h b/plugins/dfsound/externals.h
index dd05a5a..9fb58ad 100644 (file)
--- a/plugins/dfsound/externals.h
+++ b/plugins/dfsound/externals.h
@@ -117,7 +117,7 @@ typedef struct
  unsigned int      bFMod:2;                            // freq mod (0=off, 1=sound channel, 2=freq channel)\r
  unsigned int      prevflags:3;                        // flags from previous block\r
  unsigned int      bIgnoreLoop:1;                      // Ignore loop\r
- unsigned int      bNewPitch:1;                        // pitch changed\r
+ unsigned int      bStarting:1;                        // starting after keyon\r
  union {\r
   struct {\r
    int             iLeftVolume;                        // left volume\r
@@ -182,7 +182,21 @@ typedef struct
 \r
 // psx buffers / addresses\r
 \r
-#define SB_SIZE (32 + 4)\r
+typedef union\r
+{\r
+ int SB[28 + 4 + 4];\r
+ struct {\r
+  int sample[28];\r
+  union {\r
+   struct {\r
+    int pos;\r
+    signed short val[4];\r
+   } gauss;\r
+   int simple[5]; // 28-32\r
+  } interp;\r
+  int sinc_old;\r
+ };\r
+} sample_buf;\r
 \r
 typedef struct\r
 {\r
@@ -197,6 +211,7 @@ typedef struct
  unsigned char * pSpuIrq;\r
 \r
  unsigned int    cycles_played;\r
+ unsigned int    cycles_dma_end;\r
  int             decode_pos;\r
  int             decode_dirty_ch;\r
  unsigned int    bSpuInit:1;\r
@@ -216,7 +231,7 @@ typedef struct
  void (CALLBACK *cddavCallback)(short, short);\r
  void (CALLBACK *scheduleCallback)(unsigned int);\r
 \r
- xa_decode_t   * xapGlobal;\r
+ const xa_decode_t * xapGlobal;\r
  unsigned int  * XAFeed;\r
  unsigned int  * XAPlay;\r
  unsigned int  * XAStart;\r
@@ -237,11 +252,13 @@ typedef struct
  REVERBInfo    * rvb;\r
 \r
  // buffers\r
- int           * SB;\r
+ void          * unused;\r
  int           * SSumLR;\r
 \r
- int             pad[29];\r
  unsigned short  regArea[0x400];\r
+\r
+ sample_buf      sb[MAXCHAN];\r
+ int             interpolation;\r
 } SPUInfo;\r
 \r
 #define regAreaGet(offset) \\r
@@ -261,9 +278,9 @@ void do_samples(unsigned int cycles_to, int do_sync);
 void schedule_next_irq(void);\r
 void check_irq_io(unsigned int addr);\r
 \r
-#define do_samples_if_needed(c, sync) \\r
+#define do_samples_if_needed(c, sync, samples) \\r
  do { \\r
-  if (sync || (int)((c) - spu.cycles_played) >= 16 * 768) \\r
+  if (sync || (int)((c) - spu.cycles_played) >= (samples) * 768) \\r
    do_samples(c, sync); \\r
  } while (0)\r
 \r