From 88b3d7c16ae976d332b8462de839b86f856a7180 Mon Sep 17 00:00:00 2001
From: notaz <notasas@gmail.com>
Date: Thu, 1 Nov 2007 09:39:56 +0000
Subject: [PATCH] psp snd output improved

git-svn-id: file:///home/notaz/opt/svn/PicoDrive@288 be3aeb3a-fb24-0410-a615-afba39da0efa
---
 Pico/sound/sound.c | 14 ++++++++++----
 cpu/fame/famec.c   |  3 ++-
 platform/psp/emu.c | 28 +++++++++++++++++-----------
 3 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/Pico/sound/sound.c b/Pico/sound/sound.c
index f43252f..aa2acb2 100644
--- a/Pico/sound/sound.c
+++ b/Pico/sound/sound.c
@@ -220,8 +220,14 @@ PICO_INTERNAL void PsndClear(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);
+  if (PicoOpt & 8)
+    memset32((int *) PsndOut, 0, len); // assume PsndOut to be aligned
+  else {
+    short *out = PsndOut;
+    if ((int)out & 2) { *out++ = 0; len--; }
+    memset32((int *) out, 0, len/2);
+    if (len & 1) out[len-1] = 0;
+  }
 }
 
 
@@ -248,9 +254,9 @@ PICO_INTERNAL int PsndRender(int offset, int length)
     SN76496Update(PsndOut+offset, length, stereo);
 
   // Add in the stereo FM buffer
-  if (PicoOpt & 1) {
+  if (PicoOpt & 1)
     buf32_updated = YM2612UpdateOne(buf32, length, stereo, 1);
-  } else
+  else
     memset32(buf32, 0, length<<stereo);
 
 //printf("active_chs: %02x\n", buf32_updated);
diff --git a/cpu/fame/famec.c b/cpu/fame/famec.c
index 11d2cb2..2549147 100644
--- a/cpu/fame/famec.c
+++ b/cpu/fame/famec.c
@@ -20,7 +20,7 @@
 #define FAMEC_CHECK_BRANCHES
 #define FAMEC_EXTRA_INLINE
 // #define FAMEC_DEBUG
-//#define FAMEC_NO_GOTOS
+#define FAMEC_NO_GOTOS
 #define FAMEC_ADR_BITS  24
 // #define FAMEC_FETCHBITS 8
 #define FAMEC_DATABITS  8
@@ -506,6 +506,7 @@ static u32 Opcode;
 static s32 cycles_needed;
 static u16 *PC;
 static u32 BasePC;
+static u32 flag_C;
 static u32 flag_V;
 static u32 flag_NotZ;
 static u32 flag_N;
diff --git a/platform/psp/emu.c b/platform/psp/emu.c
index 3a3ef4b..0e64f2a 100644
--- a/platform/psp/emu.c
+++ b/platform/psp/emu.c
@@ -469,8 +469,8 @@ static void vidResetMode(void)
 
 
 /* sound stuff */
-#define SOUND_BLOCK_SIZE_NTSC (2940*2) // 1024 // 1152
-#define SOUND_BLOCK_SIZE_PAL  (3528*2)
+#define SOUND_BLOCK_SIZE_NTSC (1470*2) // 1024 // 1152
+#define SOUND_BLOCK_SIZE_PAL  (1764*2)
 #define SOUND_BLOCK_COUNT    4
 
 static short __attribute__((aligned(4))) sndBuffer[SOUND_BLOCK_SIZE_PAL*SOUND_BLOCK_COUNT + 44100/50*2];
@@ -490,9 +490,10 @@ static int sound_thread(SceSize args, void *argp)
 	while (!sound_thread_exit)
 	{
 		if (samples_made - samples_done < samples_block) {
-			// wait for data...
-			//lprintf("sthr: wait... (%i/%i)\n", samples_done, samples_made);
-			ret = sceKernelWaitSema(sound_sem, 1, 0);
+			// wait for data (use at least 2 blocks)
+			//lprintf("sthr: wait... (%i)\n", samples_made - samples_done);
+			while (samples_made - samples_done <= samples_block*2 && !sound_thread_exit)
+				ret = sceKernelWaitSema(sound_sem, 1, 0);
 			//lprintf("sthr: sceKernelWaitSema: %i\n", ret);
 			continue;
 		}
@@ -507,6 +508,14 @@ static int sound_thread(SceSize args, void *argp)
 			snd_playptr = sndBuffer;
 		if (ret)
 			lprintf("sthr: outf: %i; pos %i/%i\n", ret, samples_done, samples_made);
+
+		// shouln't happen, but just in case
+		if (samples_made - samples_done >= samples_block*3) {
+			//lprintf("block skip (%i)\n", samples_made - samples_done);
+			samples_done += samples_block; // skip
+			snd_playptr  += samples_block;
+		}
+
 	}
 
 	lprintf("sthr: exit\n");
@@ -546,8 +555,7 @@ static void sound_prepare(void)
 	stereo=(PicoOpt&8)>>3;
 
 	samples_block = Pico.m.pal ? SOUND_BLOCK_SIZE_PAL : SOUND_BLOCK_SIZE_NTSC;
-	if (PsndRate == 22050) samples_block /= 2;
-	else if (PsndRate == 11025) samples_block /= 4;
+	if (PsndRate <= 22050) samples_block /= 2;
 	sndBuffer_endptr = &sndBuffer[samples_block*SOUND_BLOCK_COUNT];
 
 	lprintf("starting audio: %i, len: %i, stereo: %i, pal: %i, block samples: %i\n",
@@ -606,7 +614,7 @@ static void writeSound(int len)
 
 	// signal the snd thread
 	samples_made += len;
-	if (samples_made - samples_done >= samples_block) {
+	if (samples_made - samples_done > samples_block*2) {
 		// lprintf("signal, %i/%i\n", samples_done, samples_made);
 		ret = sceKernelSignalSema(sound_sem, 1);
 		// lprintf("signal ret %i\n", ret);
@@ -938,12 +946,10 @@ void emu_Loop(void)
 			int tval_diff;
 			tval = sceKernelGetSystemTimeLow();
 			tval_diff = (int)(tval - tval_thissec) << 8;
-			if (tval_diff > lim_time)
+			if (tval_diff > lim_time && (frames_done/16 < frames_shown))
 			{
 				// no time left for this frame - skip
 				if (tval_diff - lim_time >= (300000<<8)) {
-					/* something caused a slowdown for us (disk access? cache flush?)
-					 * try to recover by resetting timing... */
 					reset_timing = 1;
 					continue;
 				}
-- 
2.39.2