From: notaz Date: Mon, 30 Oct 2023 23:44:38 +0000 (+0200) Subject: cdrom: implement xa buffering somewhat X-Git-Tag: r24~72 X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=commitdiff_plain;h=5c5e6c0c5f739de80b7f8f9d6c36dda0c2fa579d cdrom: implement xa buffering somewhat libretro/pcsx_rearmed#784 --- diff --git a/libpcsxcore/cdrom.c b/libpcsxcore/cdrom.c index 83f8c1c1..950b6484 100644 --- a/libpcsxcore/cdrom.c +++ b/libpcsxcore/cdrom.c @@ -94,9 +94,12 @@ static struct { unsigned char Track; boolean Play, Muted; int CurTrack; - int Mode, File, Channel; + unsigned char Mode; + unsigned char FileChannelSelected; + unsigned char CurFile, CurChannel; + int FilterFile, FilterChannel; unsigned char LocL[8]; - int FirstSector; + int unused4; xa_decode_t Xa; @@ -105,7 +108,7 @@ static struct { u16 CmdInProgress; u8 Irq1Pending; - u8 unused5; + u8 AdpcmActive; u32 LastReadSeekCycles; u8 unused7; @@ -679,8 +682,7 @@ void cdrPlayReadInterrupt(void) if (!cdr.Muted && cdr.Play && !Config.Cdda) { cdrPrepCdda(read_buf, CD_FRAMESIZE_RAW / 4); cdrAttenuate(read_buf, CD_FRAMESIZE_RAW / 4, 1); - SPU_playCDDAchannel(read_buf, CD_FRAMESIZE_RAW, psxRegs.cycle, cdr.FirstSector); - cdr.FirstSector = 0; + SPU_playCDDAchannel(read_buf, CD_FRAMESIZE_RAW, psxRegs.cycle, 0); } msfiAdd(cdr.SetSectorPlay, 1); @@ -841,7 +843,8 @@ void cdrInterrupt(void) { cdr.LocL[0] = LOCL_INVALID; cdr.SubqForwardSectors = 1; cdr.TrackChanged = FALSE; - cdr.FirstSector = 1; + cdr.FileChannelSelected = 0; + cdr.AdpcmActive = 0; cdr.ReportDelay = 60; cdr.sectorsRead = 0; @@ -979,8 +982,8 @@ void cdrInterrupt(void) { break; case CdlSetfilter: - cdr.File = cdr.Param[0]; - cdr.Channel = cdr.Param[1]; + cdr.FilterFile = cdr.Param[0]; + cdr.FilterChannel = cdr.Param[1]; break; case CdlSetmode: @@ -995,8 +998,8 @@ void cdrInterrupt(void) { SetResultSize(5); cdr.Result[1] = cdr.Mode; cdr.Result[2] = 0; - cdr.Result[3] = cdr.File; - cdr.Result[4] = cdr.Channel; + cdr.Result[3] = cdr.FilterFile; + cdr.Result[4] = cdr.FilterChannel; break; case CdlGetlocL: @@ -1186,7 +1189,8 @@ void cdrInterrupt(void) { cdr.SetlocPending = 0; } cdr.Reading = 1; - cdr.FirstSector = 1; + cdr.FileChannelSelected = 0; + cdr.AdpcmActive = 0; // Fighting Force 2 - update subq time immediately // - fixes new game @@ -1324,7 +1328,9 @@ static void cdrUpdateTransferBuf(const u8 *buf) static void cdrReadInterrupt(void) { - u8 *buf = NULL, *hdr; + const struct { u8 file, chan, mode, coding; } *subhdr; + const u8 *buf = NULL; + int deliver_data = 1; u8 subqPos[3]; int read_ok; @@ -1357,29 +1363,45 @@ static void cdrReadInterrupt(void) if (!cdr.Stat && !cdr.Irq1Pending) cdrUpdateTransferBuf(buf); - if ((!cdr.Muted) && (cdr.Mode & MODE_STRSND) && (!Config.Xa) && (cdr.FirstSector != -1)) { // CD-XA - hdr = buf + 4; - // Firemen 2: Multi-XA files - briefings, cutscenes - if( cdr.FirstSector == 1 && (cdr.Mode & MODE_SF)==0 ) { - cdr.File = hdr[0]; - cdr.Channel = hdr[1]; + subhdr = (void *)(buf + 4); + do { + // try to process as adpcm + if (!(cdr.Mode & MODE_STRSND)) + break; + if (buf[3] != 2 || (subhdr->mode & 0x44) != 0x44) // or 0x64? + break; + CDR_LOG("f=%d m=%d %d,%3d | %d,%2d | %d,%2d\n", !!(cdr.Mode & MODE_SF), cdr.Muted, + subhdr->file, subhdr->chan, cdr.CurFile, cdr.CurChannel, cdr.FilterFile, cdr.FilterChannel); + if ((cdr.Mode & MODE_SF) && (subhdr->file != cdr.FilterFile || subhdr->chan != cdr.FilterChannel)) + break; + if (subhdr->chan & 0xe0) { // ? + if (subhdr->chan != 0xff) + log_unhandled("adpcm %d:%d\n", subhdr->file, subhdr->chan); + break; + } + if (!cdr.FileChannelSelected) { + cdr.CurFile = subhdr->file; + cdr.CurChannel = subhdr->chan; + cdr.FileChannelSelected = 1; } + else if (subhdr->file != cdr.CurFile || subhdr->chan != cdr.CurChannel) + break; - /* Gameblabla - * Skips playing on channel 255. - * Fixes missing audio in Blue's Clues : Blue's Big Musical. (Should also fix Taxi 2) - * TODO : Check if this is the proper behaviour. - * */ - if ((hdr[2] & 0x4) && hdr[0] == cdr.File && hdr[1] == cdr.Channel && cdr.Channel != 255) { - int ret = xa_decode_sector(&cdr.Xa, buf + 4, cdr.FirstSector); - if (!ret) { - cdrAttenuate(cdr.Xa.pcm, cdr.Xa.nsamples, cdr.Xa.stereo); - SPU_playADPCMchannel(&cdr.Xa, psxRegs.cycle, cdr.FirstSector); - cdr.FirstSector = 0; - } - else cdr.FirstSector = -1; + // accepted as adpcm + deliver_data = 0; + + if (Config.Xa) + break; + if (!cdr.Muted && cdr.AdpcmActive) { + cdrAttenuate(cdr.Xa.pcm, cdr.Xa.nsamples, cdr.Xa.stereo); + SPU_playADPCMchannel(&cdr.Xa, psxRegs.cycle, 0); } - } + // decode next + cdr.AdpcmActive = !xa_decode_sector(&cdr.Xa, buf + 4, !cdr.AdpcmActive); + } while (0); + + if ((cdr.Mode & MODE_SF) && (subhdr->mode & 0x44) == 0x44) // according to nocash + deliver_data = 0; /* Croc 2: $40 - only FORM1 (*) @@ -1387,7 +1409,7 @@ static void cdrReadInterrupt(void) Sim Theme Park - no adpcm at all (zero) */ - if (!(cdr.Mode & MODE_STRSND) || !(buf[4+2] & 0x4)) + if (deliver_data) cdrReadInterruptSetResult(cdr.StatP); msfiAdd(cdr.SetSectorPlay, 1); @@ -1397,20 +1419,17 @@ static void cdrReadInterrupt(void) /* cdrRead0: - bit 0,1 - mode - bit 2 - unknown - bit 3 - unknown - bit 4 - unknown + bit 0,1 - reg index + bit 2 - adpcm active bit 5 - 1 result ready bit 6 - 1 dma ready bit 7 - 1 command being processed */ unsigned char cdrRead0(void) { - if (cdr.ResultReady) - cdr.Ctrl |= 0x20; - else - cdr.Ctrl &= ~0x20; + cdr.Ctrl &= ~0x24; + cdr.Ctrl |= cdr.AdpcmActive << 2; + cdr.Ctrl |= cdr.ResultReady << 5; cdr.Ctrl |= 0x40; // data fifo not empty @@ -1691,8 +1710,8 @@ static void getCdInfo(void) void cdrReset() { memset(&cdr, 0, sizeof(cdr)); cdr.CurTrack = 1; - cdr.File = 1; - cdr.Channel = 1; + cdr.FilterFile = 0; + cdr.FilterChannel = 0; cdr.Reg2 = 0x1f; cdr.Stat = NoIntr; cdr.FifoOffset = DATA_SIZE; // fifo empty diff --git a/libpcsxcore/decode_xa.c b/libpcsxcore/decode_xa.c index 17df65f1..fb6fd135 100644 --- a/libpcsxcore/decode_xa.c +++ b/libpcsxcore/decode_xa.c @@ -122,7 +122,7 @@ static __inline void ADPCM_DecodeBlock16( ADPCM_Decode_t *decp, u8 filter_range, static int headtable[4] = {0,2,8,10}; //=========================================== -static void xa_decode_data( xa_decode_t *xdp, unsigned char *srcp ) { +static void xa_decode_data( xa_decode_t *xdp, const unsigned char *srcp ) { const u8 *sound_groupsp; const u8 *sound_datap, *sound_datap2; int i, j, k, nbits; @@ -297,8 +297,8 @@ u8 coding2; //============================================ static int parse_xa_audio_sector( xa_decode_t *xdp, - xa_subheader_t *subheadp, - unsigned char *sectorp, + const xa_subheader_t *subheadp, + const unsigned char *sectorp, int is_first_sector ) { if ( is_first_sector ) { switch ( AUDIO_CODING_GET_FREQ(subheadp->coding) ) { @@ -340,8 +340,7 @@ static int parse_xa_audio_sector( xa_decode_t *xdp, //=== - 0 for any other successive sector //=== return -1 if error //================================================================ -s32 xa_decode_sector( xa_decode_t *xdp, - unsigned char *sectorp, int is_first_sector ) { +s32 xa_decode_sector( xa_decode_t *xdp, const unsigned char *sectorp, int is_first_sector ) { if (parse_xa_audio_sector(xdp, (xa_subheader_t *)sectorp, sectorp + sizeof(xa_subheader_t), is_first_sector)) return -1; diff --git a/libpcsxcore/decode_xa.h b/libpcsxcore/decode_xa.h index a5994e12..54065356 100644 --- a/libpcsxcore/decode_xa.h +++ b/libpcsxcore/decode_xa.h @@ -40,8 +40,8 @@ typedef struct { } xa_decode_t; s32 xa_decode_sector( xa_decode_t *xdp, - unsigned char *sectorp, - int is_first_sector ); + const unsigned char *sectorp, + int is_first_sector ); #ifdef __cplusplus } diff --git a/plugins/dfsound/spu.c b/plugins/dfsound/spu.c index 8e4ae177..f5dc4062 100644 --- a/plugins/dfsound/spu.c +++ b/plugins/dfsound/spu.c @@ -1338,12 +1338,12 @@ void CALLBACK SPUupdate(void) // XA AUDIO -void CALLBACK SPUplayADPCMchannel(xa_decode_t *xap, unsigned int cycle, int is_start) +void CALLBACK SPUplayADPCMchannel(xa_decode_t *xap, unsigned int cycle, int unused) { if(!xap) return; if(!xap->freq) return; // no xa freq ? bye - if (is_start) + if (spu.XAPlay == spu.XAFeed) do_samples(cycle, 1); // catch up to prevent source underflows later FeedXA(xap); // call main XA feeder @@ -1351,12 +1351,12 @@ void CALLBACK SPUplayADPCMchannel(xa_decode_t *xap, unsigned int cycle, int is_s } // CDDA AUDIO -int CALLBACK SPUplayCDDAchannel(short *pcm, int nbytes, unsigned int cycle, int is_start) +int CALLBACK SPUplayCDDAchannel(short *pcm, int nbytes, unsigned int cycle, int unused) { if (!pcm) return -1; if (nbytes<=0) return -1; - if (is_start) + if (spu.CDDAPlay == spu.CDDAFeed) do_samples(cycle, 1); // catch up to prevent source underflows later FeedCDDA((unsigned char *)pcm, nbytes);