-// This is part of Pico Library\r
-\r
-// (c) Copyright 2004 Dave, All rights reserved.\r
-// (c) Copyright 2006,2007 notaz, All rights reserved.\r
-// Free for non-commercial use.\r
-\r
-// For commercial use, separate licencing terms must be obtained.\r
-\r
+/*\r
+ * PicoDrive\r
+ * (c) Copyright Dave, 2004\r
+ * (C) notaz, 2006-2009\r
+ *\r
+ * This work is licensed under the terms of MAME license.\r
+ * See COPYING file in the top-level directory.\r
+ */\r
\r
#include <string.h>\r
#include "ym2612.h"\r
#include "sn76496.h"\r
#include "../pico_int.h"\r
-#include "../cd/pcm.h"\r
+#include "../cd/cue.h"\r
#include "mix.h"\r
\r
void (*PsndMix_32_to_16l)(short *dest, int *src, int count) = mix_32_to_16l_stereo;\r
static int PsndBuffer[2*(44100+100)/50];\r
\r
// dac\r
-static unsigned short dac_info[312+4]; // pppppppp ppppllll, p - pos in buff, l - length to write for this sample\r
+static unsigned short dac_info[312+4]; // pos in sample buffer\r
\r
// cdda output buffer\r
short cdda_out_buffer[2*1152];\r
int PsndLen_exc_cnt=0;\r
int PsndDacLine=0;\r
short *PsndOut=NULL; // PCM data buffer\r
+static int PsndLen_use;\r
\r
// timers\r
int timer_a_next_oflow, timer_a_step; // in z80 cycles\r
for(i=226; i != 225; i++)\r
{\r
if (i >= lines) i = 0;\r
- len = 0;\r
if(dac_cnt < 0) {\r
- len=1;\r
pos++;\r
dac_cnt += lines;\r
}\r
dac_cnt -= PsndLen;\r
- dac_info[i] = (pos<<4)|len;\r
+ dac_info[i] = pos;\r
}\r
}\r
else\r
len++;\r
}\r
dac_cnt += PsndLen;\r
- dac_info[i] = (pos<<4)|len;\r
- pos+=len;\r
+ pos += len;\r
+ dac_info[i] = pos;\r
}\r
- // last sample\r
- for(len = 0, i = pos; i < PsndLen; i++) len++;\r
- if (PsndLen_exc_add) len++;\r
- dac_info[224] = (pos<<4)|len;\r
}\r
- mid = (dac_info[lines-1] & 0xfff0) + ((dac_info[lines-1] & 0xf) << 4);\r
for (i = lines; i < sizeof(dac_info) / sizeof(dac_info[0]); i++)\r
- dac_info[i] = mid;\r
- //for(i=len=0; i < lines; i++) {\r
- // printf("%03i : %03i : %i\n", i, dac_info[i]>>4, dac_info[i]&0xf);\r
- // len+=dac_info[i]&0xf;\r
- //}\r
- //printf("rate is %i, len %f\n", PsndRate, (double)PsndRate/(Pico.m.pal ? 50.0 : 60.0));\r
- //printf("len total: %i, last pos: %i\n", len, pos);\r
- //exit(8);\r
+ dac_info[i] = dac_info[0];\r
}\r
\r
\r
void *state = NULL;\r
int target_fps = Pico.m.pal ? 50 : 60;\r
\r
- // not all rates are supported in MCD mode due to mp3 decoder limitations\r
- if (PicoAHW & PAHW_MCD) {\r
- if (!(11025-100 <= PsndRate && PsndRate <= 11025+100) &&\r
- !(22050-100 <= PsndRate && PsndRate <= 22050+100) &&\r
- !(44100-100 <= PsndRate && PsndRate <= 44100+100))\r
- PsndRate = 22050;\r
- PicoOpt |= POPT_EN_STEREO; // force stereo\r
- }\r
-\r
if (preserve_state) {\r
state = malloc(0x204);\r
if (state == NULL) return;\r
// feed it back it's own registers, just like after loading state\r
memcpy(YM2612GetRegs(), state, 0x204);\r
ym2612_unpack_state();\r
- if ((PicoAHW & PAHW_MCD) && !(Pico_mcd->s68k_regs[0x36] & 1) && (Pico_mcd->scd.Status_CDC & 1))\r
- cdda_start_play();\r
}\r
\r
if (preserve_state) memcpy(state, sn76496_regs, 28*4); // remember old state\r
// recalculate dac info\r
dac_recalculate();\r
\r
- if (PicoAHW & PAHW_MCD)\r
- pcm_set_rate(PsndRate);\r
-\r
// clear all buffers\r
memset32(PsndBuffer, 0, sizeof(PsndBuffer)/4);\r
memset(cdda_out_buffer, 0, sizeof(cdda_out_buffer));\r
}\r
\r
\r
+PICO_INTERNAL void PsndStartFrame(void)\r
+{\r
+ // compensate for float part of PsndLen\r
+ PsndLen_use = PsndLen;\r
+ PsndLen_exc_cnt += PsndLen_exc_add;\r
+ if (PsndLen_exc_cnt >= 0x10000) {\r
+ PsndLen_exc_cnt -= 0x10000;\r
+ PsndLen_use++;\r
+ }\r
+\r
+ PsndDacLine = 0;\r
+ emustatus &= ~1;\r
+ dac_info[224] = PsndLen_use;\r
+}\r
+\r
PICO_INTERNAL void PsndDoDAC(int line_to)\r
{\r
int pos, pos1, len;\r
int dout = ym2612.dacout;\r
int line_from = PsndDacLine;\r
\r
+ if (line_to >= 312)\r
+ line_to = 311;\r
+\r
+ pos = dac_info[line_from];\r
+ pos1 = dac_info[line_to + 1];\r
+ len = pos1 - pos;\r
+ if (len <= 0)\r
+ return;\r
+\r
PsndDacLine = line_to + 1;\r
\r
- pos =dac_info[line_from]>>4;\r
- pos1=dac_info[line_to];\r
- len = ((pos1>>4)-pos) + (pos1&0xf);\r
- if (!len) return;\r
+ if (!PsndOut)\r
+ return;\r
\r
if (PicoOpt & POPT_EN_STEREO) {\r
short *d = PsndOut + pos*2;\r
short *d = PsndOut + pos;\r
for (; len > 0; len--, d++) *d = dout;\r
}\r
-\r
-#if 0\r
- if (do_pcm) {\r
- int *d = PsndBuffer;\r
- d += (PicoOpt&8) ? pos*2 : pos;\r
- pcm_update(d, len, 1);\r
- }\r
-#endif\r
}\r
\r
// cdda\r
-static pm_file *cdda_stream = NULL;\r
-\r
static void cdda_raw_update(int *buffer, int length)\r
{\r
int ret, cdda_bytes, mult = 1;\r
- if (cdda_stream == NULL)\r
- return;\r
\r
cdda_bytes = length*4;\r
if (PsndRate <= 22050 + 100) mult = 2;\r
if (PsndRate < 22050 - 100) mult = 4;\r
cdda_bytes *= mult;\r
\r
- ret = pm_read(cdda_out_buffer, cdda_bytes, cdda_stream);\r
+ ret = pm_read(cdda_out_buffer, cdda_bytes, Pico_mcd->cdda_stream);\r
if (ret < cdda_bytes) {\r
memset((char *)cdda_out_buffer + ret, 0, cdda_bytes - ret);\r
- cdda_stream = NULL;\r
+ Pico_mcd->cdda_stream = NULL;\r
return;\r
}\r
\r
}\r
}\r
\r
-PICO_INTERNAL void cdda_start_play(void)\r
+void cdda_start_play(int lba_base, int lba_offset, int lb_len)\r
{\r
- int lba_offset, index, lba_length, i;\r
-\r
- elprintf(EL_STATUS, "cdda play track #%i", Pico_mcd->scd.Cur_Track);\r
-\r
- index = Pico_mcd->scd.Cur_Track - 1;\r
-\r
- lba_offset = Pico_mcd->scd.Cur_LBA - Track_to_LBA(index + 1);\r
- if (lba_offset < 0) lba_offset = 0;\r
- lba_offset += Pico_mcd->TOC.Tracks[index].Offset;\r
-\r
- // find the actual file for this track\r
- for (i = index; i >= 0; i--)\r
- if (Pico_mcd->TOC.Tracks[i].F != NULL) break;\r
-\r
- if (Pico_mcd->TOC.Tracks[i].F == NULL) {\r
- elprintf(EL_STATUS|EL_ANOMALY, "no track?!");\r
- return;\r
- }\r
-\r
- if (Pico_mcd->TOC.Tracks[i].ftype == TYPE_MP3)\r
+ if (Pico_mcd->cdda_type == CT_MP3)\r
{\r
int pos1024 = 0;\r
\r
- lba_length = Pico_mcd->TOC.Tracks[i].Length;\r
- for (i++; i < Pico_mcd->TOC.Last_Track; i++) {\r
- if (Pico_mcd->TOC.Tracks[i].F != NULL) break;\r
- lba_length += Pico_mcd->TOC.Tracks[i].Length;\r
- }\r
-\r
if (lba_offset)\r
- pos1024 = lba_offset * 1024 / lba_length;\r
+ pos1024 = lba_offset * 1024 / lb_len;\r
\r
- mp3_start_play(Pico_mcd->TOC.Tracks[index].F, pos1024);\r
+ mp3_start_play(Pico_mcd->cdda_stream, pos1024);\r
return;\r
}\r
\r
- cdda_stream = Pico_mcd->TOC.Tracks[i].F;\r
- PicoCDBufferFlush(); // buffering relies on fp not being touched\r
- pm_seek(cdda_stream, lba_offset * 2352, SEEK_SET);\r
- if (Pico_mcd->TOC.Tracks[i].ftype == TYPE_WAV)\r
+ pm_seek(Pico_mcd->cdda_stream, (lba_base + lba_offset) * 2352, SEEK_SET);\r
+ if (Pico_mcd->cdda_type == CT_WAV)\r
{\r
// skip headers, assume it's 44kHz stereo uncompressed\r
- pm_seek(cdda_stream, 44, SEEK_CUR);\r
+ pm_seek(Pico_mcd->cdda_stream, 44, SEEK_CUR);\r
}\r
}\r
\r
memset32((int *) PsndOut, 0, len); // assume PsndOut to be aligned\r
else {\r
short *out = PsndOut;\r
- if ((int)out & 2) { *out++ = 0; len--; }\r
+ if ((long)out & 2) { *out++ = 0; len--; }\r
memset32((int *) out, 0, len/2);\r
if (len & 1) out[len-1] = 0;\r
}\r
int buf32_updated = 0;\r
int *buf32 = PsndBuffer+offset;\r
int stereo = (PicoOpt & 8) >> 3;\r
- // emulating CD && PCM option enabled && PCM chip on && have enabled channels\r
- int do_pcm = (PicoAHW & PAHW_MCD) && (PicoOpt&POPT_EN_MCD_PCM) &&\r
- (Pico_mcd->pcm.control & 0x80) && Pico_mcd->pcm.enabled;\r
+\r
offset <<= stereo;\r
\r
-#if !SIMPLE_WRITE_SOUND\r
- if (offset == 0) { // should happen once per frame\r
- // compensate for float part of PsndLen\r
- PsndLen_exc_cnt += PsndLen_exc_add;\r
- if (PsndLen_exc_cnt >= 0x10000) {\r
- PsndLen_exc_cnt -= 0x10000;\r
- length++;\r
- }\r
- }\r
-#endif\r
+ pprof_start(sound);\r
\r
// PSG\r
if (PicoOpt & POPT_EN_PSG)\r
memset32(buf32, 0, length<<stereo);\r
\r
//printf("active_chs: %02x\n", buf32_updated);\r
+ (void)buf32_updated;\r
\r
// CD: PCM sound\r
- if (do_pcm) {\r
- pcm_update(buf32, length, stereo);\r
+ if (PicoAHW & PAHW_MCD) {\r
+ pcd_pcm_update(buf32, length, stereo);\r
//buf32_updated = 1;\r
}\r
\r
// CD: CDDA audio\r
// CD mode, cdda enabled, not data track, CDC is reading\r
- if ((PicoAHW & PAHW_MCD) && (PicoOpt & POPT_EN_MCD_CDDA) &&\r
- !(Pico_mcd->s68k_regs[0x36] & 1) && (Pico_mcd->scd.Status_CDC & 1))\r
+ if ((PicoAHW & PAHW_MCD) && (PicoOpt & POPT_EN_MCD_CDDA)\r
+ && Pico_mcd->cdda_stream != NULL\r
+ && !(Pico_mcd->s68k_regs[0x36] & 1))\r
{\r
// note: only 44, 22 and 11 kHz supported, with forced stereo\r
- int index = Pico_mcd->scd.Cur_Track - 1;\r
-\r
- if (Pico_mcd->TOC.Tracks[index].ftype == TYPE_MP3)\r
+ if (Pico_mcd->cdda_type == CT_MP3)\r
mp3_update(buf32, length, stereo);\r
else\r
cdda_raw_update(buf32, length);\r
// convert + limit to normal 16bit output\r
PsndMix_32_to_16l(PsndOut+offset, buf32, length);\r
\r
+ pprof_end(sound);\r
+\r
return length;\r
}\r
\r
// to be called on 224 or line_sample scanlines only\r
PICO_INTERNAL void PsndGetSamples(int y)\r
{\r
-#if SIMPLE_WRITE_SOUND\r
- if (y != 224) return;\r
- PsndRender(0, PsndLen);\r
- if (PicoWriteSound) PicoWriteSound(PsndLen);\r
- PsndClear();\r
-#else\r
static int curr_pos = 0;\r
\r
+ if (ym2612.dacen && PsndDacLine < y)\r
+ PsndDoDAC(y - 1);\r
+\r
if (y == 224)\r
{\r
if (emustatus & 2)\r
curr_pos += PsndRender(curr_pos, PsndLen-PsndLen/2);\r
- else curr_pos = PsndRender(0, PsndLen);\r
- if (emustatus&1) emustatus|=2; else emustatus&=~2;\r
- if (PicoWriteSound) PicoWriteSound(curr_pos);\r
+ else curr_pos = PsndRender(0, PsndLen_use);\r
+ if (emustatus & 1)\r
+ emustatus |= 2;\r
+ else emustatus &= ~2;\r
+ if (PicoWriteSound)\r
+ PicoWriteSound(curr_pos * ((PicoOpt & POPT_EN_STEREO) ? 4 : 2));\r
// clear sound buffer\r
PsndClear();\r
+ PsndDacLine = 224;\r
+ dac_info[224] = 0;\r
}\r
else if (emustatus & 3) {\r
emustatus|= 2;\r
emustatus&=~1;\r
curr_pos = PsndRender(0, PsndLen/2);\r
}\r
-#endif\r
}\r
\r
PICO_INTERNAL void PsndGetSamplesMS(void)\r
{\r
int stereo = (PicoOpt & 8) >> 3;\r
- int length = PsndLen;\r
-\r
-#if !SIMPLE_WRITE_SOUND\r
- // compensate for float part of PsndLen\r
- PsndLen_exc_cnt += PsndLen_exc_add;\r
- if (PsndLen_exc_cnt >= 0x10000) {\r
- PsndLen_exc_cnt -= 0x10000;\r
- length++;\r
- }\r
-#endif\r
+ int length = PsndLen_use;\r
\r
// PSG\r
if (PicoOpt & POPT_EN_PSG)\r
}\r
\r
if (PicoWriteSound != NULL)\r
- PicoWriteSound(length);\r
+ PicoWriteSound(length * ((PicoOpt & POPT_EN_STEREO) ? 4 : 2));\r
PsndClear();\r
}\r
\r
+// vim:shiftwidth=2:ts=2:expandtab\r
notaz.gp2x.de / picodrive.git / blobdiff