#include <fcntl.h>\r
#include <errno.h>\r
\r
-#include "940shared.h"\r
+#include "code940/940shared.h"\r
#include "gp2x.h"\r
#include "emu.h"\r
#include "menu.h"\r
#include "asmutils.h"\r
+#include "../../Pico/PicoInt.h"\r
\r
/* we will need some gp2x internals here */\r
extern volatile unsigned short *gp2x_memregs; /* from minimal library rlyeh */\r
static unsigned char *shared_mem = 0;\r
static _940_data_t *shared_data = 0;\r
static _940_ctl_t *shared_ctl = 0;\r
+static unsigned char *mp3_mem = 0;\r
+\r
+#define MP3_SIZE_MAX (0x1000000 - 4*640*480)\r
\r
int crashed_940 = 0;\r
\r
+static FILE *loaded_mp3 = 0;\r
\r
/***********************************************************/\r
\r
printf("wait iterations: %i\n", i);\r
#else\r
for (i = 0; shared_ctl->busy && i < 0x10000; i++)\r
- spend_cycles(4*1024);\r
+ spend_cycles(8*1024); // tested to be best for mp3 dec\r
if (i < 0x10000) return;\r
\r
/* 940 crashed */\r
- printf("940 crashed (cnt: %i, wc: %i, ve: ", shared_ctl->loopc, shared_ctl->waitc);\r
+ printf("940 crashed (cnt: %i, ve: ", shared_ctl->loopc);\r
for (i = 0; i < 8; i++)\r
printf("%i ", shared_ctl->vstarts[i]);\r
printf(")\n");\r
shared_data = (_940_data_t *) (shared_mem+0x100000);\r
/* this area must not get buffered on either side */\r
shared_ctl = (_940_ctl_t *) (shared_mem+0x200000);\r
+ mp3_mem = (unsigned char *) mmap(0, MP3_SIZE_MAX, PROT_READ|PROT_WRITE, MAP_SHARED, memdev, 0x3000000);\r
+ if (mp3_mem == MAP_FAILED)\r
+ {\r
+ printf("mmap(mp3_mem) failed with %i\n", errno);\r
+ exit(1);\r
+ }\r
crashed_940 = 1;\r
}\r
\r
\r
internal_reset();\r
\r
+ loaded_mp3 = 0;\r
+\r
/* now cause 940 to init it's ym2612 stuff */\r
shared_ctl->baseclock = baseclock;\r
shared_ctl->rate = rate;\r
- shared_ctl->jobs[0] = JOB940_YM2612INIT;\r
+ shared_ctl->jobs[0] = JOB940_INITALL;\r
shared_ctl->jobs[1] = 0;\r
shared_ctl->busy = 1;\r
\r
}\r
\r
\r
+static void mix_samples(short *dest_buf, int *ym_buf, short *mp3_buf, int len, int stereo)\r
+{\r
+ if (mp3_buf)\r
+ {\r
+ if (stereo)\r
+ {\r
+ for (; len > 0; len--)\r
+ {\r
+ int l, r, lm, rm;\r
+ l = r = *dest_buf;\r
+ l += *ym_buf++; r += *ym_buf++;\r
+ lm = *mp3_buf++; rm = *mp3_buf++;\r
+ l += lm - lm/2; r += rm - rm/2;\r
+ Limit( l, MAXOUT, MINOUT );\r
+ Limit( r, MAXOUT, MINOUT );\r
+ *dest_buf++ = l; *dest_buf++ = r;\r
+ }\r
+ } else {\r
+ for (; len > 0; len--)\r
+ {\r
+ // TODO: normalize\r
+ int l = *ym_buf++;\r
+ l += *dest_buf;\r
+ l += *mp3_buf++;\r
+ Limit( l, MAXOUT, MINOUT );\r
+ *dest_buf++ = l;\r
+ }\r
+ }\r
+ }\r
+ else\r
+ {\r
+ if (stereo)\r
+ {\r
+ for (; len > 0; len--)\r
+ {\r
+ int l, r;\r
+ l = r = *dest_buf;\r
+ l += *ym_buf++, r += *ym_buf++;\r
+ Limit( l, MAXOUT, MINOUT );\r
+ Limit( r, MAXOUT, MINOUT );\r
+ *dest_buf++ = l; *dest_buf++ = r;\r
+ }\r
+ } else {\r
+ for (; len > 0; len--)\r
+ {\r
+ int l = *ym_buf++;\r
+ l += *dest_buf;\r
+ Limit( l, MAXOUT, MINOUT );\r
+ *dest_buf++ = l;\r
+ }\r
+ }\r
+ }\r
+}\r
+\r
+\r
+// here we assume that length is different between games, but constant in one game\r
+\r
+static int mp3_samples_ready = 0, mp3_buffer_offs = 0;\r
+static int mp3_play_bufsel = 0;\r
+\r
void YM2612UpdateOne_940(short *buffer, int length, int stereo)\r
{\r
- int i, *mix_buffer = shared_data->mix_buffer;\r
+ int cdda_on, *ym_buffer = shared_data->mix_buffer, mp3_job = 0;\r
\r
//printf("YM2612UpdateOne_940()\n");\r
if (shared_ctl->busy) wait_busy_940();\r
// printf("%i ", shared_ctl->vstarts[i]);\r
//printf(")\n");\r
\r
+ // emulatind MCD, cdda enabled in config, not data track, CDC is reading, playback was started, track not ended\r
+ cdda_on = (PicoMCD & 1) && (currentConfig.EmuOpt&0x800) && !(Pico_mcd->s68k_regs[0x36] & 1) &&\r
+ (Pico_mcd->scd.Status_CDC & 1) && loaded_mp3 && shared_ctl->mp3_offs < shared_ctl->mp3_len;\r
+\r
/* mix data from previous go */\r
- if (stereo) {\r
- int *mb = mix_buffer;\r
- for (i = length; i > 0; i--) {\r
- int l, r;\r
- l = r = *buffer;\r
- l += *mb++, r += *mb++;\r
- Limit( l, MAXOUT, MINOUT );\r
- Limit( r, MAXOUT, MINOUT );\r
- *buffer++ = l; *buffer++ = r;\r
+ if (cdda_on && mp3_samples_ready >= length)\r
+ {\r
+ if (1152 - mp3_buffer_offs >= length) {\r
+ mix_samples(buffer, ym_buffer, shared_data->mp3_buffer[mp3_play_bufsel] + mp3_buffer_offs*2, length, stereo);\r
+\r
+ mp3_buffer_offs += length;\r
+ } else {\r
+ // collect from both buffers..\r
+ int left = 1152 - mp3_buffer_offs;\r
+ mix_samples(buffer, ym_buffer, shared_data->mp3_buffer[mp3_play_bufsel] + mp3_buffer_offs*2, left, stereo);\r
+ mp3_play_bufsel ^= 1;\r
+ mp3_buffer_offs = length - left;\r
+ mix_samples(buffer + left * 2, ym_buffer + left * 2,\r
+ shared_data->mp3_buffer[mp3_play_bufsel], mp3_buffer_offs, stereo);\r
}\r
+ mp3_samples_ready -= length;\r
} else {\r
- for (i = 0; i < length; i++) {\r
- int l = mix_buffer[i];\r
- l += buffer[i];\r
- Limit( l, MAXOUT, MINOUT );\r
- buffer[i] = l;\r
- }\r
+ mix_samples(buffer, ym_buffer, 0, length, stereo);\r
}\r
\r
//printf("new writes: %i\n", writebuff_ptr);\r
}\r
writebuff_ptr = 0;\r
\r
- /* give 940 another job */\r
+ /* give 940 ym job */\r
shared_ctl->writebuffsel ^= 1;\r
shared_ctl->length = length;\r
shared_ctl->stereo = stereo;\r
- add_job_940(JOB940_YM2612UPDATEONE, 0);\r
+\r
+ // make sure we will have enough mp3 samples next frame\r
+ if (cdda_on && mp3_samples_ready < length)\r
+ {\r
+ shared_ctl->mp3_buffsel ^= 1;\r
+ mp3_job = JOB940_MP3DECODE;\r
+ mp3_samples_ready += 1152;\r
+ }\r
+\r
+ add_job_940(JOB940_YM2612UPDATEONE, mp3_job);\r
//spend_cycles(512);\r
//printf("SRCPND: %08lx, INTMODE: %08lx, INTMASK: %08lx, INTPEND: %08lx\n",\r
// gp2x_memregl[0x4500>>2], gp2x_memregl[0x4504>>2], gp2x_memregl[0x4508>>2], gp2x_memregl[0x4510>>2]);\r
}\r
+\r
+\r
+/***********************************************************/\r
+\r
+void mp3_start_play(FILE *f, int pos) // pos is 0-1023\r
+{\r
+ int byte_offs = 0;\r
+\r
+ if (!(currentConfig.EmuOpt&0x800)) { // cdda disabled?\r
+ return;\r
+ }\r
+\r
+ if (loaded_mp3 != f)\r
+ {\r
+ printf("loading mp3... "); fflush(stdout);\r
+ fseek(f, 0, SEEK_SET);\r
+ fread(mp3_mem, 1, MP3_SIZE_MAX, f);\r
+ if (feof(f)) printf("done.\n");\r
+ else printf("done. mp3 too large, not all data loaded.\n");\r
+ shared_ctl->mp3_len = ftell(f);\r
+ loaded_mp3 = f;\r
+ }\r
+\r
+ // seek..\r
+ if (pos) {\r
+ byte_offs = (shared_ctl->mp3_len << 6) >> 10;\r
+ byte_offs *= pos;\r
+ byte_offs >>= 6;\r
+ }\r
+ printf("mp3 pos1024: %i, byte_offs %i/%i\n", pos, byte_offs, shared_ctl->mp3_len);\r
+\r
+ shared_ctl->mp3_offs = byte_offs;\r
+\r
+ // reset buffer pointers..\r
+ mp3_samples_ready = mp3_buffer_offs = mp3_play_bufsel = 0;\r
+ shared_ctl->mp3_buffsel = 1; // will change to 0 on first decode\r
+}\r
+\r
+\r
notaz.gp2x.de / picodrive.git / blobdiff