X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=platform%2Fgp2x%2F940ctl_ym2612.c;h=1352172b645735785f6599750fb9b99753218f16;hb=51a902ae2512cffdb3ac7751988c1bde4a641be4;hp=d8a10b237015ad525eff8637b03cf2635edc79a8;hpb=cc68a136aa179a5f32fe40208371eb9c2b0aadae;p=picodrive.git

diff --git a/platform/gp2x/940ctl_ym2612.c b/platform/gp2x/940ctl_ym2612.c
index d8a10b2..1352172 100644
--- a/platform/gp2x/940ctl_ym2612.c
+++ b/platform/gp2x/940ctl_ym2612.c
@@ -7,11 +7,12 @@
 #include <fcntl.h>
 #include <errno.h>
 
-#include "940shared.h"
+#include "code940/940shared.h"
 #include "gp2x.h"
 #include "emu.h"
 #include "menu.h"
 #include "asmutils.h"
+#include "../../Pico/PicoInt.h"
 
 /* we will need some gp2x internals here */
 extern volatile unsigned short *gp2x_memregs; /* from minimal library rlyeh */
@@ -20,9 +21,13 @@ extern volatile unsigned long  *gp2x_memregl;
 static unsigned char *shared_mem = 0;
 static _940_data_t *shared_data = 0;
 static _940_ctl_t *shared_ctl = 0;
+static unsigned char *mp3_mem = 0;
+
+#define MP3_SIZE_MAX (0x1000000 - 4*640*480)
 
 int crashed_940 = 0;
 
+static FILE *loaded_mp3 = 0;
 
 /***********************************************************/
 
@@ -235,11 +240,11 @@ static void wait_busy_940(void)
 	printf("wait iterations: %i\n", i);
 #else
 	for (i = 0; shared_ctl->busy && i < 0x10000; i++)
-		spend_cycles(4*1024);
+		spend_cycles(8*1024); // tested to be best for mp3 dec
 	if (i < 0x10000) return;
 
 	/* 940 crashed */
-	printf("940 crashed (cnt: %i, wc: %i, ve: ", shared_ctl->loopc, shared_ctl->waitc);
+	printf("940 crashed (cnt: %i, ve: ", shared_ctl->loopc);
 	for (i = 0; i < 8; i++)
 		printf("%i ", shared_ctl->vstarts[i]);
 	printf(")\n");
@@ -250,9 +255,10 @@ static void wait_busy_940(void)
 }
 
 
-static void add_job_940(int job)
+static void add_job_940(int job0, int job1)
 {
-	shared_ctl->job = job;
+	shared_ctl->jobs[0] = job0;
+	shared_ctl->jobs[1] = job1;
 	shared_ctl->busy = 1;
 	gp2x_memregs[0x3B3E>>1] = 0xffff; // cause an IRQ for 940
 }
@@ -276,7 +282,7 @@ void YM2612PicoStateLoad_940(void)
 
 	addr_A1 = old_A1;
 
-	add_job_940(JOB940_PICOSTATELOAD);
+	add_job_940(JOB940_PICOSTATELOAD, 0);
 }
 
 
@@ -299,10 +305,9 @@ extern char **g_argv;
 void YM2612Init_940(int baseclock, int rate)
 {
 	printf("YM2612Init_940()\n");
-	//printf("sizeof(*shared_data): %i (%x)\n", sizeof(*shared_data), sizeof(*shared_data));
-	//printf("sizeof(*shared_ctl): %i (%x)\n", sizeof(*shared_ctl), sizeof(*shared_ctl));
+	printf("Mem usage: shared_data: %i, shared_ctl: %i\n", sizeof(*shared_data), sizeof(*shared_ctl));
 
-	Reset940(1);
+	Reset940(1, 2);
 	Pause940(1);
 
 	gp2x_memregs[0x3B46>>1] = 0xffff; // clear pending DUALCPU interrupts for 940
@@ -312,7 +317,7 @@ void YM2612Init_940(int baseclock, int rate)
 
 	if (shared_mem == NULL)
 	{
-		shared_mem = (unsigned char *) mmap(0, 0x210000, PROT_READ|PROT_WRITE, MAP_SHARED, memdev, 0x3000000);
+		shared_mem = (unsigned char *) mmap(0, 0x210000, PROT_READ|PROT_WRITE, MAP_SHARED, memdev, 0x2000000);
 		if(shared_mem == MAP_FAILED)
 		{
 			printf("mmap(shared_data) failed with %i\n", errno);
@@ -321,6 +326,12 @@ void YM2612Init_940(int baseclock, int rate)
 		shared_data = (_940_data_t *) (shared_mem+0x100000);
 		/* this area must not get buffered on either side */
 		shared_ctl =  (_940_ctl_t *)  (shared_mem+0x200000);
+		mp3_mem = (unsigned char *) mmap(0, MP3_SIZE_MAX, PROT_READ|PROT_WRITE, MAP_SHARED, memdev, 0x3000000);
+		if (mp3_mem == MAP_FAILED)
+		{
+			printf("mmap(mp3_mem) failed with %i\n", errno);
+			exit(1);
+		}
 		crashed_940 = 1;
 	}
 
@@ -370,14 +381,17 @@ void YM2612Init_940(int baseclock, int rate)
 
 	internal_reset();
 
+	loaded_mp3 = 0;
+
 	/* now cause 940 to init it's ym2612 stuff */
 	shared_ctl->baseclock = baseclock;
 	shared_ctl->rate = rate;
-	shared_ctl->job = JOB940_YM2612INIT;
+	shared_ctl->jobs[0] = JOB940_INITALL;
+	shared_ctl->jobs[1] = 0;
 	shared_ctl->busy = 1;
 
 	/* start the 940 */
-	Reset940(0);
+	Reset940(0, 2);
 	Pause940(0);
 
 	// YM2612ResetChip_940(); // will be done on JOB940_YM2612INIT
@@ -396,13 +410,73 @@ void YM2612ResetChip_940(void)
 
 	internal_reset();
 
-	add_job_940(JOB940_YM2612RESETCHIP);
+	add_job_940(JOB940_YM2612RESETCHIP, 0);
+}
+
+
+static void mix_samples(short *dest_buf, int *ym_buf, short *mp3_buf, int len, int stereo)
+{
+	if (mp3_buf)
+	{
+		if (stereo)
+		{
+			for (; len > 0; len--)
+			{
+				int l, r, lm, rm;
+				l = r = *dest_buf;
+				l += *ym_buf++;  r += *ym_buf++;
+				lm = *mp3_buf++; rm = *mp3_buf++;
+				l += lm - lm/2; r += rm - rm/2;
+				Limit( l, MAXOUT, MINOUT );
+				Limit( r, MAXOUT, MINOUT );
+				*dest_buf++ = l; *dest_buf++ = r;
+			}
+		} else {
+			for (; len > 0; len--)
+			{
+				// TODO: normalize
+				int l = *ym_buf++;
+				l += *dest_buf;
+				l += *mp3_buf++;
+				Limit( l, MAXOUT, MINOUT );
+				*dest_buf++ = l;
+			}
+		}
+	}
+	else
+	{
+		if (stereo)
+		{
+			for (; len > 0; len--)
+			{
+				int l, r;
+				l = r = *dest_buf;
+				l += *ym_buf++, r += *ym_buf++;
+				Limit( l, MAXOUT, MINOUT );
+				Limit( r, MAXOUT, MINOUT );
+				*dest_buf++ = l; *dest_buf++ = r;
+			}
+		} else {
+			for (; len > 0; len--)
+			{
+				int l = *ym_buf++;
+				l += *dest_buf;
+				Limit( l, MAXOUT, MINOUT );
+				*dest_buf++ = l;
+			}
+		}
+	}
 }
 
 
+// here we assume that length is different between games, but constant in one game
+
+static int mp3_samples_ready = 0, mp3_buffer_offs = 0;
+static int mp3_play_bufsel = 0;
+
 void YM2612UpdateOne_940(short *buffer, int length, int stereo)
 {
-	int i, *mix_buffer = shared_data->mix_buffer;
+	int cdda_on, *ym_buffer = shared_data->mix_buffer, mp3_job = 0;
 
 	//printf("YM2612UpdateOne_940()\n");
 	if (shared_ctl->busy) wait_busy_940();
@@ -412,24 +486,29 @@ void YM2612UpdateOne_940(short *buffer, int length, int stereo)
 	//	printf("%i ", shared_ctl->vstarts[i]);
 	//printf(")\n");
 
+	// emulatind MCD, cdda enabled in config, not data track, CDC is reading, playback was started, track not ended
+	cdda_on = (PicoMCD & 1) && (currentConfig.EmuOpt&0x800) && !(Pico_mcd->s68k_regs[0x36] & 1) &&
+			(Pico_mcd->scd.Status_CDC & 1) && loaded_mp3 && shared_ctl->mp3_offs < shared_ctl->mp3_len;
+
 	/* mix data from previous go */
-	if (stereo) {
-		int *mb = mix_buffer;
-		for (i = length; i > 0; i--) {
-			int l, r;
-			l = r = *buffer;
-			l += *mb++, r += *mb++;
-			Limit( l, MAXOUT, MINOUT );
-			Limit( r, MAXOUT, MINOUT );
-			*buffer++ = l; *buffer++ = r;
+	if (cdda_on && mp3_samples_ready >= length)
+	{
+		if (1152 - mp3_buffer_offs >= length) {
+			mix_samples(buffer, ym_buffer, shared_data->mp3_buffer[mp3_play_bufsel] + mp3_buffer_offs*2, length, stereo);
+
+			mp3_buffer_offs += length;
+		} else {
+			// collect from both buffers..
+			int left = 1152 - mp3_buffer_offs;
+			mix_samples(buffer, ym_buffer, shared_data->mp3_buffer[mp3_play_bufsel] + mp3_buffer_offs*2, left, stereo);
+			mp3_play_bufsel ^= 1;
+			mp3_buffer_offs = length - left;
+			mix_samples(buffer + left * 2, ym_buffer + left * 2,
+				shared_data->mp3_buffer[mp3_play_bufsel], mp3_buffer_offs, stereo);
 		}
+		mp3_samples_ready -= length;
 	} else {
-		for (i = 0; i < length; i++) {
-			int l = mix_buffer[i];
-			l += buffer[i];
-			Limit( l, MAXOUT, MINOUT );
-			buffer[i] = l;
-		}
+		mix_samples(buffer, ym_buffer, 0, length, stereo);
 	}
 
 	//printf("new writes: %i\n", writebuff_ptr);
@@ -440,12 +519,60 @@ void YM2612UpdateOne_940(short *buffer, int length, int stereo)
 	}
 	writebuff_ptr = 0;
 
-	/* give 940 another job */
+	/* give 940 ym job */
 	shared_ctl->writebuffsel ^= 1;
 	shared_ctl->length = length;
 	shared_ctl->stereo = stereo;
-	add_job_940(JOB940_YM2612UPDATEONE);
+
+	// make sure we will have enough mp3 samples next frame
+	if (cdda_on && mp3_samples_ready < length)
+	{
+		shared_ctl->mp3_buffsel ^= 1;
+		mp3_job = JOB940_MP3DECODE;
+		mp3_samples_ready += 1152;
+	}
+
+	add_job_940(JOB940_YM2612UPDATEONE, mp3_job);
 	//spend_cycles(512);
 	//printf("SRCPND: %08lx, INTMODE: %08lx, INTMASK: %08lx, INTPEND: %08lx\n",
 	//	gp2x_memregl[0x4500>>2], gp2x_memregl[0x4504>>2], gp2x_memregl[0x4508>>2], gp2x_memregl[0x4510>>2]);
 }
+
+
+/***********************************************************/
+
+void mp3_start_play(FILE *f, int pos) // pos is 0-1023
+{
+	int byte_offs = 0;
+
+	if (!(currentConfig.EmuOpt&0x800)) { // cdda disabled?
+		return;
+	}
+
+	if (loaded_mp3 != f)
+	{
+		printf("loading mp3... "); fflush(stdout);
+		fseek(f, 0, SEEK_SET);
+		fread(mp3_mem, 1, MP3_SIZE_MAX, f);
+		if (feof(f)) printf("done.\n");
+		else printf("done. mp3 too large, not all data loaded.\n");
+		shared_ctl->mp3_len = ftell(f);
+		loaded_mp3 = f;
+	}
+
+	// seek..
+	if (pos) {
+		byte_offs  = (shared_ctl->mp3_len << 6) >> 10;
+		byte_offs *= pos;
+		byte_offs >>= 6;
+	}
+	printf("mp3 pos1024: %i, byte_offs %i/%i\n", pos, byte_offs, shared_ctl->mp3_len);
+
+	shared_ctl->mp3_offs = byte_offs;
+
+	// reset buffer pointers..
+	mp3_samples_ready = mp3_buffer_offs = mp3_play_bufsel = 0;
+	shared_ctl->mp3_buffsel = 1; // will change to 0 on first decode
+}
+
+