X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=libpcsxcore%2Fcdriso.c;h=90c9d856fc3f2c067b8035b866616b4e5d68df48;hp=289e3cf666334c756dfe41f436918b4c0d5c3a61;hb=deebc67fc5c5027248842562e02d71d5f683a1e2;hpb=81abe4d570022077d4d015c47cd96b619d46c3cd diff --git a/libpcsxcore/cdriso.c b/libpcsxcore/cdriso.c index 289e3cf6..90c9d856 100644 --- a/libpcsxcore/cdriso.c +++ b/libpcsxcore/cdriso.c @@ -1,6 +1,7 @@ /*************************************************************************** * Copyright (C) 2007 PCSX-df Team * * Copyright (C) 2009 Wei Mingzhi * + * Copyright (C) 2012 notaz * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * @@ -15,7 +16,7 @@ * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the * * Free Software Foundation, Inc., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * ***************************************************************************/ #include "psxcommon.h" @@ -27,6 +28,7 @@ #ifdef _WIN32 #include #include +#define strcasecmp _stricmp #else #include #include @@ -45,6 +47,8 @@ static boolean subChanMixed = FALSE; static boolean subChanRaw = FALSE; static boolean subChanMissing = FALSE; +static boolean multifile = FALSE; + static unsigned char cdbuffer[CD_FRAMESIZE_RAW]; static unsigned char subbuffer[SUB_FRAMESIZE]; @@ -60,17 +64,18 @@ static pthread_t threadid; static unsigned int initial_offset = 0; static boolean playing = FALSE; static boolean cddaBigEndian = FALSE; -// offsets of cddaHandle file +// cdda sectors in toc, byte offset in file static unsigned int cdda_cur_sector; static unsigned int cdda_first_sector; -// toc_sector - file_sector -static unsigned int cdda_toc_delta; +static unsigned int cdda_file_offset; /* Frame offset into CD image where pregap data would be found if it was there. * If a game seeks there we must *not* return subchannel data since it's * not in the CD image, so that cdrom code can fake subchannel data instead. * XXX: there could be multiple pregaps but PSX dumps only have one? */ static unsigned int pregapOffset; +#define cddaCurPos cdda_cur_sector + // compressed image stuff static struct { unsigned char buff_raw[16][CD_FRAMESIZE_RAW]; @@ -82,7 +87,7 @@ static struct { unsigned int sector_in_blk; } *compr_img; -int (*cdimg_read_func)(FILE *f, void *dest, int sector); +int (*cdimg_read_func)(FILE *f, unsigned int base, void *dest, int sector); char* CALLBACK CDR__getDriveLetter(void); long CALLBACK CDR__configure(void); @@ -93,14 +98,12 @@ long CALLBACK CDR__getStatus(struct CdrStat *stat); static void DecodeRawSubData(void); -extern void *hCDRDriver; - struct trackinfo { - enum {DATA, CDDA} type; + enum {DATA=1, CDDA} type; char start[3]; // MSF-format char length[3]; // MSF-format FILE *handle; // for multi-track images CDDA - int start_offset; // sector offset from start of above file + unsigned int start_offset; // byte offset from start of above file }; #define MAXTRACKS 100 /* How many tracks can a CD hold? */ @@ -174,19 +177,24 @@ static void *playthread(void *param) { long osleep, d, t, i, s; unsigned char tmp; - int ret = 0; + int ret = 0, sector_offs; t = GetTickCount(); while (playing) { s = 0; for (i = 0; i < sizeof(sndbuffer) / CD_FRAMESIZE_RAW; i++) { - d = cdimg_read_func(cddaHandle, sndbuffer + s, cdda_cur_sector); - if (d < CD_FRAMESIZE_RAW) - break; - - if (cdda_cur_sector < cdda_first_sector) - memset(sndbuffer + s, 0, CD_FRAMESIZE_RAW); + sector_offs = cdda_cur_sector - cdda_first_sector; + if (sector_offs < 0) { + d = CD_FRAMESIZE_RAW; + memset(sndbuffer + s, 0, d); + } + else { + d = cdimg_read_func(cddaHandle, cdda_file_offset, + sndbuffer + s, sector_offs); + if (d < CD_FRAMESIZE_RAW) + break; + } s += d; cdda_cur_sector++; @@ -207,6 +215,8 @@ static void *playthread(void *param) } } + // can't do it yet due to readahead.. + //cdrAttenuate((short *)sndbuffer, s / 4, 1); do { ret = SPU_playCDDAchannel((short *)sndbuffer, s); if (ret == 0x7761) @@ -263,12 +273,11 @@ static void stopCDDA() { } // start the CDDA playback -static void startCDDA(unsigned int sector) { +static void startCDDA(void) { if (playing) { stopCDDA(); } - cdda_cur_sector = sector; playing = TRUE; #ifdef _WIN32 @@ -283,10 +292,11 @@ static void startCDDA(unsigned int sector) { static int parsetoc(const char *isofile) { char tocname[MAXPATHLEN]; FILE *fi; - char linebuf[256], dummy[256], name[256]; + char linebuf[256], tmp[256], name[256]; char *token; char time[20], time2[20]; - unsigned int t, sector_offs; + unsigned int t, sector_offs, sector_size; + unsigned int current_zero_gap = 0; numtracks = 0; @@ -322,17 +332,21 @@ static int parsetoc(const char *isofile) { memset(&ti, 0, sizeof(ti)); cddaBigEndian = TRUE; // cdrdao uses big-endian for CD Audio + sector_size = CD_FRAMESIZE_RAW; sector_offs = 2 * 75; // parse the .toc file while (fgets(linebuf, sizeof(linebuf), fi) != NULL) { // search for tracks - strncpy(dummy, linebuf, sizeof(linebuf)); - token = strtok(dummy, " "); + strncpy(tmp, linebuf, sizeof(linebuf)); + token = strtok(tmp, " "); if (token == NULL) continue; if (!strcmp(token, "TRACK")) { + sector_offs += current_zero_gap; + current_zero_gap = 0; + // get type of track token = strtok(NULL, " "); numtracks++; @@ -343,9 +357,11 @@ static int parsetoc(const char *isofile) { // check if this image contains mixed subchannel data token = strtok(NULL, " "); - if (token != NULL && !strncmp(token, "RW_RAW", 6)) { + if (token != NULL && !strncmp(token, "RW", 2)) { + sector_size = CD_FRAMESIZE_RAW + SUB_FRAMESIZE; subChanMixed = TRUE; - subChanRaw = TRUE; + if (!strncmp(token, "RW_RAW", 6)) + subChanRaw = TRUE; } } else if (!strncmp(token, "AUDIO", 5)) { @@ -355,9 +371,8 @@ static int parsetoc(const char *isofile) { else if (!strcmp(token, "DATAFILE")) { if (ti[numtracks].type == CDDA) { sscanf(linebuf, "DATAFILE \"%[^\"]\" #%d %8s", name, &t, time2); - t /= CD_FRAMESIZE_RAW + (subChanMixed ? SUB_FRAMESIZE : 0); ti[numtracks].start_offset = t; - t += sector_offs; + t = t / sector_size + sector_offs; sec2msf(t, (char *)&ti[numtracks].start); tok2msf((char *)&time2, (char *)&ti[numtracks].length); } @@ -369,21 +384,39 @@ static int parsetoc(const char *isofile) { else if (!strcmp(token, "FILE")) { sscanf(linebuf, "FILE \"%[^\"]\" #%d %8s %8s", name, &t, time, time2); tok2msf((char *)&time, (char *)&ti[numtracks].start); - t /= CD_FRAMESIZE_RAW + (subChanMixed ? SUB_FRAMESIZE : 0); + t += msf2sec(ti[numtracks].start) * sector_size; ti[numtracks].start_offset = t; - t += msf2sec(ti[numtracks].start) + sector_offs; + t = t / sector_size + sector_offs; sec2msf(t, (char *)&ti[numtracks].start); tok2msf((char *)&time2, (char *)&ti[numtracks].length); } - else if (!strcmp(token, "ZERO")) { - sscanf(linebuf, "ZERO AUDIO RW_RAW %8s", time); - tok2msf((char *)&time, dummy); - sector_offs += msf2sec(dummy); + else if (!strcmp(token, "ZERO") || !strcmp(token, "SILENCE")) { + // skip unneeded optional fields + while (token != NULL) { + token = strtok(NULL, " "); + if (strchr(token, ':') != NULL) + break; + } + if (token != NULL) { + tok2msf(token, tmp); + current_zero_gap = msf2sec(tmp); + } if (numtracks > 1) { t = ti[numtracks - 1].start_offset; + t /= sector_size; pregapOffset = t + msf2sec(ti[numtracks - 1].length); } } + else if (!strcmp(token, "START")) { + token = strtok(NULL, " "); + if (token != NULL && strchr(token, ':')) { + tok2msf(token, tmp); + t = msf2sec(tmp); + ti[numtracks].start_offset += (t - current_zero_gap) * sector_size; + t = msf2sec(ti[numtracks].start) + t; + sec2msf(t, (char *)&ti[numtracks].start); + } + } } fclose(fi); @@ -403,7 +436,8 @@ static int parsecue(const char *isofile) { char *tmp; char linebuf[256], tmpb[256], dummy[256]; unsigned int incue_max_len; - unsigned int t, file_len, sector_offs; + unsigned int t, file_len, mode, sector_offs; + unsigned int sector_size = 2352; numtracks = 0; @@ -462,24 +496,32 @@ static int parsecue(const char *isofile) { if (!strcmp(token, "TRACK")) { numtracks++; + sector_size = 0; if (strstr(linebuf, "AUDIO") != NULL) { ti[numtracks].type = CDDA; + sector_size = 2352; } - else if (strstr(linebuf, "MODE1/2352") != NULL || strstr(linebuf, "MODE2/2352") != NULL) { + else if (sscanf(linebuf, " TRACK %u MODE%u/%u", &t, &mode, §or_size) == 3) ti[numtracks].type = DATA; + else { + SysPrintf(".cue: failed to parse TRACK\n"); + ti[numtracks].type = numtracks == 1 ? DATA : CDDA; } + if (sector_size == 0) + sector_size = 2352; } else if (!strcmp(token, "INDEX")) { - sscanf(linebuf, " INDEX %02d %8s", &t, time); + if (sscanf(linebuf, " INDEX %02d %8s", &t, time) != 2) + SysPrintf(".cue: failed to parse INDEX\n"); tok2msf(time, (char *)&ti[numtracks].start); t = msf2sec(ti[numtracks].start); - ti[numtracks].start_offset = t; + ti[numtracks].start_offset = t * sector_size; t += sector_offs; sec2msf(t, ti[numtracks].start); // default track length to file length - t = file_len - ti[numtracks].start_offset; + t = file_len - ti[numtracks].start_offset / sector_size; sec2msf(t, ti[numtracks].length); if (numtracks > 1 && ti[numtracks].handle == NULL) { @@ -489,7 +531,7 @@ static int parsecue(const char *isofile) { sec2msf(t, ti[numtracks - 1].length); } if (numtracks > 1 && pregapOffset == -1) - pregapOffset = ti[numtracks].start_offset; + pregapOffset = ti[numtracks].start_offset / sector_size; } else if (!strcmp(token, "PREGAP")) { if (sscanf(linebuf, " PREGAP %8s", time) == 1) { @@ -519,8 +561,10 @@ static int parsecue(const char *isofile) { } // update global offset if this is not first file in this .cue - if (numtracks + 1 > 1) + if (numtracks + 1 > 1) { + multifile = 1; sector_offs += file_len; + } file_len = 0; if (ti[numtracks + 1].handle == NULL) { @@ -582,7 +626,7 @@ static int parseccd(const char *isofile) { else if (!strncmp(linebuf, "INDEX 1=", 8)) { sscanf(linebuf, "INDEX 1=%d", &t); sec2msf(t + 2 * 75, ti[numtracks].start); - ti[numtracks].start_offset = t; + ti[numtracks].start_offset = t * 2352; // If we've already seen another track, this is its end if (numtracks > 1) { @@ -667,7 +711,7 @@ static int parsemds(const char *isofile) { // check if the image contains mixed subchannel data fseek(fi, offset + 1, SEEK_SET); - subChanMixed = (fgetc(fi) ? TRUE : FALSE); + subChanMixed = subChanRaw = (fgetc(fi) ? TRUE : FALSE); // read track data for (i = 1; i <= numtracks; i++) { @@ -689,14 +733,14 @@ static int parsemds(const char *isofile) { fseek(fi, offset + 0x28, SEEK_SET); fread(&l, 1, sizeof(unsigned int), fi); l = SWAP32(l); - ti[i].start_offset = l / CD_FRAMESIZE_RAW; + ti[i].start_offset = l; // get pregap fseek(fi, extra_offset, SEEK_SET); fread(&l, 1, sizeof(unsigned int), fi); l = SWAP32(l); if (l != 0 && i > 1) - pregapOffset = ti[i].start_offset; + pregapOffset = msf2sec(ti[i].start); // get the track length fread(&l, 1, sizeof(unsigned int), fi); @@ -823,6 +867,7 @@ static int handlepbp(const char *isofile) { ti[i].start_offset = btoi(toc_entry.index0[0]) * 60 * 75 + btoi(toc_entry.index0[1]) * 75 + btoi(toc_entry.index0[2]); + ti[i].start_offset *= 2352; ti[i].start[0] = btoi(toc_entry.index1[0]); ti[i].start[1] = btoi(toc_entry.index1[1]); ti[i].start[2] = btoi(toc_entry.index1[2]); @@ -832,7 +877,7 @@ static int handlepbp(const char *isofile) { sec2msf(t, ti[i - 1].length); } } - t = cd_length - ti[numtracks].start_offset; + t = cd_length - ti[numtracks].start_offset / 2352; sec2msf(t, ti[numtracks].length); // seek to ISO index @@ -1001,17 +1046,17 @@ static int opensbifile(const char *isoname) { return LoadSBI(sbiname, s); } -static int cdread_normal(FILE *f, void *dest, int sector) +static int cdread_normal(FILE *f, unsigned int base, void *dest, int sector) { - fseek(f, sector * CD_FRAMESIZE_RAW, SEEK_SET); + fseek(f, base + sector * CD_FRAMESIZE_RAW, SEEK_SET); return fread(dest, 1, CD_FRAMESIZE_RAW, f); } -static int cdread_sub_mixed(FILE *f, void *dest, int sector) +static int cdread_sub_mixed(FILE *f, unsigned int base, void *dest, int sector) { int ret; - fseek(f, sector * (CD_FRAMESIZE_RAW + SUB_FRAMESIZE), SEEK_SET); + fseek(f, base + sector * (CD_FRAMESIZE_RAW + SUB_FRAMESIZE), SEEK_SET); ret = fread(dest, 1, CD_FRAMESIZE_RAW, f); fread(subbuffer, 1, SUB_FRAMESIZE, f); @@ -1051,13 +1096,16 @@ static int uncompress2(void *out, unsigned long *out_size, void *in, unsigned lo return ret == 1 ? 0 : ret; } -static int cdread_compressed(FILE *f, void *dest, int sector) +static int cdread_compressed(FILE *f, unsigned int base, void *dest, int sector) { unsigned long cdbuffer_size, cdbuffer_size_expect; unsigned int start_byte, size; int is_compressed; int ret, block; + if (base) + sector += base / 2352; + block = sector >> compr_img->block_shift; compr_img->sector_in_blk = sector & ((1 << compr_img->block_shift) - 1); @@ -1117,11 +1165,11 @@ finish: return CD_FRAMESIZE_RAW; } -static int cdread_2048(FILE *f, void *dest, int sector) +static int cdread_2048(FILE *f, unsigned int base, void *dest, int sector) { int ret; - fseek(f, sector * 2048, SEEK_SET); + fseek(f, base + sector * 2048, SEEK_SET); ret = fread((char *)dest + 12 * 2, 1, 2048, f); // not really necessary, fake mode 2 header @@ -1172,6 +1220,7 @@ static long CALLBACK ISOopen(void) { subChanRaw = FALSE; pregapOffset = 0; cdrIsoMultidiskCount = 1; + multifile = 0; CDR_getBuffer = ISOgetBuffer; cdimg_read_func = cdread_normal; @@ -1232,7 +1281,8 @@ static long CALLBACK ISOopen(void) { if (numtracks > 1 && ti[1].handle == NULL) { ti[1].handle = fopen(GetIsoFile(), "rb"); } - cdda_cur_sector = cdda_toc_delta = 0; + cdda_cur_sector = 0; + cdda_file_offset = 0; return 0; } @@ -1305,7 +1355,6 @@ static long CALLBACK ISOgetTN(unsigned char *buffer) { // byte 2 - minute static long CALLBACK ISOgetTD(unsigned char track, unsigned char *buffer) { if (track == 0) { - // CD length according pcsxr-svn (done a bit different here) unsigned int sect; unsigned char time[3]; sect = msf2sec(ti[numtracks].start) + msf2sec(ti[numtracks].length); @@ -1363,7 +1412,7 @@ static long CALLBACK ISOreadTrack(unsigned char *time) { } } - cdimg_read_func(cdHandle, cdbuffer, sector); + cdimg_read_func(cdHandle, 0, cdbuffer, sector); if (subHandle != NULL) { fseek(subHandle, sector * SUB_FRAMESIZE, SEEK_SET); @@ -1379,40 +1428,30 @@ static long CALLBACK ISOreadTrack(unsigned char *time) { // sector: byte 0 - minute; byte 1 - second; byte 2 - frame // does NOT uses bcd format static long CALLBACK ISOplay(unsigned char *time) { - unsigned int i, abs_sect, start_sect = 0; - int track_offset, file_sect; + unsigned int i; if (numtracks <= 1) return 0; // find the track - abs_sect = msf2sec((char *)time); + cdda_cur_sector = msf2sec((char *)time); for (i = numtracks; i > 1; i--) { - start_sect = msf2sec(ti[i].start); - if (start_sect <= abs_sect + 2 * 75) + cdda_first_sector = msf2sec(ti[i].start); + if (cdda_first_sector <= cdda_cur_sector + 2 * 75) break; } - - track_offset = abs_sect - start_sect; - file_sect = ti[i].start_offset + track_offset; - if (file_sect < 0) - file_sect = 0; + cdda_file_offset = ti[i].start_offset; // find the file that contains this track for (; i > 1; i--) if (ti[i].handle != NULL) break; - cdda_first_sector = 0; - if (i == 1) - cdda_first_sector = file_sect - track_offset; - - cdda_toc_delta = abs_sect - file_sect; cddaHandle = ti[i].handle; - if (SPU_playCDDAchannel != NULL) { - startCDDA(file_sect); - } + if (SPU_playCDDAchannel != NULL) + startCDDA(); + return 0; } @@ -1432,20 +1471,74 @@ static unsigned char* CALLBACK ISOgetBufferSub(void) { } static long CALLBACK ISOgetStatus(struct CdrStat *stat) { - int sec; - + u32 sect; + CDR__getStatus(stat); - + if (playing) { stat->Type = 0x02; stat->Status |= 0x80; } else { - stat->Type = 0x01; + // BIOS - boot ID (CD type) + stat->Type = ti[1].type; + } + + // relative -> absolute time + sect = cddaCurPos; + sec2msf(sect, (char *)stat->Time); + + return 0; +} + +// read CDDA sector into buffer +long CALLBACK ISOreadCDDA(unsigned char m, unsigned char s, unsigned char f, unsigned char *buffer) { + unsigned char msf[3] = {m, s, f}; + unsigned int file, track, track_start = 0; + int ret; + + cddaCurPos = msf2sec((char *)msf); + + // find current track index + for (track = numtracks; ; track--) { + track_start = msf2sec(ti[track].start); + if (track_start <= cddaCurPos) + break; + if (track == 1) + break; } - sec = cdda_cur_sector + cdda_toc_delta; - sec2msf(sec, (char *)stat->Time); + // data tracks play silent + if (ti[track].type != CDDA) { + memset(buffer, 0, CD_FRAMESIZE_RAW); + return 0; + } + + file = 1; + if (multifile) { + // find the file that contains this track + for (file = track; file > 1; file--) + if (ti[file].handle != NULL) + break; + } + + ret = cdimg_read_func(ti[file].handle, ti[track].start_offset, + buffer, cddaCurPos - track_start); + if (ret != CD_FRAMESIZE_RAW) { + memset(buffer, 0, CD_FRAMESIZE_RAW); + return -1; + } + + if (cddaBigEndian) { + int i; + unsigned char tmp; + + for (i = 0; i < CD_FRAMESIZE_RAW / 2; i++) { + tmp = buffer[i * 2]; + buffer[i * 2] = buffer[i * 2 + 1]; + buffer[i * 2 + 1] = tmp; + } + } return 0; } @@ -1463,6 +1556,7 @@ void cdrIsoInit(void) { CDR_stop = ISOstop; CDR_getBufferSub = ISOgetBufferSub; CDR_getStatus = ISOgetStatus; + CDR_readCDDA = ISOreadCDDA; CDR_getDriveLetter = CDR__getDriveLetter; CDR_configure = CDR__configure;