allow slightly deviated sound rates (for Wiz)

git-svn-id: file:///home/notaz/opt/svn/PicoDrive@740 be3aeb3a-fb24-0410-a615-afba39da0efa

pico/sound/sound.c

@@ -17,7 +17,7 @@
 void (*PsndMix_32_to_16l)(short *dest, int *src, int count) = mix_32_to_16l_stereo;
 
 // master int buffer to mix to
-static int PsndBuffer[2*44100/50];
+static int PsndBuffer[2*(44100+100)/50];
 
 // dac
 static unsigned short dac_info[312+4]; // pppppppp ppppllll, p - pos in buff, l - length to write for this sample
@@ -126,7 +126,10 @@ void PsndRerate(int preserve_state)
 
   // not all rates are supported in MCD mode due to mp3 decoder limitations
   if (PicoAHW & PAHW_MCD) {
-    if (PsndRate != 11025 && PsndRate != 22050 && PsndRate != 44100) PsndRate = 22050;
+    if (!(11025-100 <= PsndRate && PsndRate <= 11025+100) &&
+        !(22050-100 <= PsndRate && PsndRate <= 22050+100) &&
+        !(44100-100 <= PsndRate && PsndRate <= 44100+100))
+      PsndRate = 22050;
     PicoOpt |= POPT_EN_STEREO; // force stereo
   }
 
@@ -212,12 +215,14 @@ static pm_file *cdda_stream = NULL;
 
 static void cdda_raw_update(int *buffer, int length)
 {
-  int ret, cdda_bytes;
+  int ret, cdda_bytes, mult = 1;
-  if (cdda_stream == NULL) return;
+  if (cdda_stream == NULL)
+    return;
 
   cdda_bytes = length*4;
-  if (PsndRate <= 22050) cdda_bytes *= 2;
+  if (PsndRate <= 22050 + 100) mult = 2;
-  if (PsndRate <  22050) cdda_bytes *= 2;
+  if (PsndRate <  22050 - 100) mult = 4;
+  cdda_bytes *= mult;
 
   ret = pm_read(cdda_out_buffer, cdda_bytes, cdda_stream);
   if (ret < cdda_bytes) {
@@ -227,10 +232,10 @@ static void cdda_raw_update(int *buffer, int length)
   }
 
   // now mix
-  switch (PsndRate) {
+  switch (mult) {
-    case 44100: mix_16h_to_32(buffer, cdda_out_buffer, length*2); break;
+    case 1: mix_16h_to_32(buffer, cdda_out_buffer, length*2); break;
-    case 22050: mix_16h_to_32_s1(buffer, cdda_out_buffer, length*2); break;
+    case 2: mix_16h_to_32_s1(buffer, cdda_out_buffer, length*2); break;
-    case 11025: mix_16h_to_32_s2(buffer, cdda_out_buffer, length*2); break;
+    case 4: mix_16h_to_32_s2(buffer, cdda_out_buffer, length*2); break;
   }
 }
 

platform/common/mp3_helix.c

@@ -196,8 +196,14 @@ void mp3_update(int *buffer, int length, int stereo)
 		return; /* no file / EOF */
 
 	length_mp3 = length;
-	if (PsndRate == 22050) { mix_samples = mix_16h_to_32_s1; length_mp3 <<= 1; shr = 1; }
+	if (PsndRate <= 11025 + 100) {
-	else if (PsndRate == 11025) { mix_samples = mix_16h_to_32_s2; length_mp3 <<= 2; shr = 2; }
+		mix_samples = mix_16h_to_32_s2;
+		length_mp3 <<= 2; shr = 2;
+	}
+	else if (PsndRate <= 22050 + 100) {
+		mix_samples = mix_16h_to_32_s1;
+		length_mp3 <<= 1; shr = 1;
+	}
 
 	if (1152 - mp3_buffer_offs >= length_mp3) {
 		mix_samples(buffer, cdda_out_buffer + mp3_buffer_offs*2, length<<1);

platform/gp2x/emu.c

@@ -33,7 +33,7 @@
 
 extern int crashed_940;
 
-static short __attribute__((aligned(4))) sndBuffer[2*44100/50];
+static short __attribute__((aligned(4))) sndBuffer[2*(44100+100)/50];
 static unsigned char PicoDraw2FB_[(8+320) * (8+240+8)];
 unsigned char *PicoDraw2FB = PicoDraw2FB_;
 static int osd_fps_x;
@@ -205,7 +205,7 @@ static void draw_pico_ptr(void)
 	if (!(Pico.video.reg[12]&1) && !(PicoOpt & POPT_DIS_32C_BORDER))
 		x += 32;
 
-	if (EOPT_WIZ_TEAR_FIX) {
+	if (currentConfig.EmuOpt & EOPT_WIZ_TEAR_FIX) {
 		pitch = 240;
 		p += (319 - x) * pitch + y;
 	} else
@@ -614,9 +614,19 @@ void pemu_sound_start(void)
 		int is_stereo = (PicoOpt & POPT_EN_STEREO) ? 1 : 0;
 		int target_fps = Pico.m.pal ? 50 : 60;
 		int frame_samples, snd_excess_add;
+		int snd_rate_oss = PsndRate;
 		gp2x_soc_t soc;
 
 		soc = soc_detect();
+		if (soc == SOCID_POLLUX) {
+			/* POLLUX pain: DPLL1 / mclk_div / bitclk_div / 4 */
+			switch (PsndRate) {
+			case 44100: PsndRate = 44171; break; // 44170.673077
+			case 22050: PsndRate = 22086; break; // 22085.336538
+			case 11025: PsndRate = 11043; break; // 11042.668269
+			default: break;
+			}
+		}
 
 		#define SOUND_RERATE_FLAGS (POPT_EN_FM|POPT_EN_PSG|POPT_EN_STEREO|POPT_EXT_FM|POPT_EN_MCD_CDDA)
 		if (PsndRate != PsndRate_old || Pico.m.pal != pal_old || ((PicoOpt & POPT_EXT_FM) && crashed_940) ||
@@ -642,7 +652,7 @@ void pemu_sound_start(void)
 		printf("starting audio: %i len: %i (ex: %04x) stereo: %i, pal: %i\n",
 			PsndRate, PsndLen, snd_excess_add, is_stereo, Pico.m.pal);
 		sndout_oss_setvol(currentConfig.volume, currentConfig.volume);
-		sndout_oss_start(PsndRate, frame_samples, is_stereo);
+		sndout_oss_start(snd_rate_oss, frame_samples, is_stereo);
 
 		/* Wiz's sound hardware needs more prebuffer */
 		if (soc == SOCID_POLLUX)
@@ -652,6 +662,13 @@ void pemu_sound_start(void)
 
 void pemu_sound_stop(void)
 {
+	/* get back from Wiz pain */
+	switch (PsndRate) {
+		case 44171: PsndRate = 44100; break;
+		case 22086: PsndRate = 22050; break;
+		case 11043: PsndRate = 11025; break;
+		default: break;
+	}
 }
 
 void pemu_sound_wait(void)
@@ -807,6 +824,8 @@ void pemu_loop_end(void)
 	int po_old = PicoOpt;
 	int eo_old = currentConfig.EmuOpt;
 
+	pemu_sound_stop();
+
 	/* do one more frame for menu bg */
 	PicoOpt &= ~POPT_ALT_RENDERER;
 	PicoOpt |= POPT_EN_SOFTSCALE|POPT_ACC_SPRITES;