X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=libpcsxcore%2Fcdriso.c;h=f03efa39d00f92430bbdcaeef471326aaedfb0af;hb=2e88c3173da3048d8502f4ab0ee70fe215f549eb;hp=c36c196120328971743cda36c2e9b4d3a830932f;hpb=4ee722a52cb0fb56260ccd3962537e5c772800e0;p=pcsx_rearmed.git diff --git a/libpcsxcore/cdriso.c b/libpcsxcore/cdriso.c index c36c1961..f03efa39 100644 --- a/libpcsxcore/cdriso.c +++ b/libpcsxcore/cdriso.c @@ -19,8 +19,6 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * ***************************************************************************/ -#include - #include "psxcommon.h" #include "plugins.h" #include "cdrom.h" @@ -38,13 +36,20 @@ #include #include #define strcasecmp _stricmp -#define usleep(x) (Sleep((x) / 1000)) #else #include #include #include #endif +#ifdef USE_LIBRETRO_VFS +#include +#undef fseeko +#undef ftello +#define ftello rftell +#define fseeko rfseek +#endif + #define OFF_T_MSB ((off_t)1 << (sizeof(off_t) * 8 - 1)) unsigned int cdrIsoMultidiskCount; @@ -63,21 +68,10 @@ static boolean multifile = FALSE; static unsigned char cdbuffer[CD_FRAMESIZE_RAW]; static unsigned char subbuffer[SUB_FRAMESIZE]; -static unsigned char sndbuffer[CD_FRAMESIZE_RAW * 10]; - -#define CDDA_FRAMETIME (1000 * (sizeof(sndbuffer) / CD_FRAMESIZE_RAW) / 75) - -#ifdef _WIN32 -static HANDLE threadid; -#else -static pthread_t threadid; -#endif -static unsigned int initial_offset = 0; static boolean playing = FALSE; static boolean cddaBigEndian = FALSE; // cdda sectors in toc, byte offset in file static unsigned int cdda_cur_sector; -static unsigned int cdda_first_sector; 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 @@ -175,144 +169,6 @@ static void tok2msf(char *time, char *msf) { } } -#ifndef _WIN32 -static long GetTickCount(void) { - static time_t initial_time = 0; - struct timeval now; - - gettimeofday(&now, NULL); - - if (initial_time == 0) { - initial_time = now.tv_sec; - } - - return (now.tv_sec - initial_time) * 1000L + now.tv_usec / 1000L; -} -#endif - -// this thread plays audio data -#ifdef _WIN32 -static void playthread(void *param) -#else -static void *playthread(void *param) -#endif -{ - long osleep, d, t, i, s; - unsigned char tmp; - int ret = 0, sector_offs; - - t = GetTickCount(); - - while (playing) { - s = 0; - for (i = 0; i < sizeof(sndbuffer) / CD_FRAMESIZE_RAW; i++) { - 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++; - } - - if (s == 0) { - playing = FALSE; - initial_offset = 0; - break; - } - - if (!cdr.Muted && playing) { - if (cddaBigEndian) { - for (i = 0; i < s / 2; i++) { - tmp = sndbuffer[i * 2]; - sndbuffer[i * 2] = sndbuffer[i * 2 + 1]; - sndbuffer[i * 2 + 1] = tmp; - } - } - - // can't do it yet due to readahead.. - //cdrAttenuate((short *)sndbuffer, s / 4, 1); - do { - ret = SPU_playCDDAchannel((short *)sndbuffer, s); - if (ret == 0x7761) - { - usleep(6 * 1000); - } - } while (ret == 0x7761 && playing); // rearmed_wait - } - - if (ret != 0x676f) { // !rearmed_go - // do approx sleep - long now; - - // HACK: stop feeding data while emu is paused - extern int stop; - while (stop && playing) - { - usleep(10000); - } - - now = GetTickCount(); - osleep = t - now; - if (osleep <= 0) { - osleep = 1; - t = now; - } - else if (osleep > CDDA_FRAMETIME) { - osleep = CDDA_FRAMETIME; - t = now; - } - - usleep(osleep * 1000); - t += CDDA_FRAMETIME; - } - - } - -#ifdef _WIN32 - _endthread(); -#else - pthread_exit(0); - return NULL; -#endif -} - -// stop the CDDA playback -static void stopCDDA() { - if (!playing) { - return; - } - - playing = FALSE; -#ifdef _WIN32 - WaitForSingleObject(threadid, INFINITE); -#else - pthread_join(threadid, NULL); -#endif -} - -// start the CDDA playback -static void startCDDA(void) { - if (playing) { - stopCDDA(); - } - - playing = TRUE; - -#ifdef _WIN32 - threadid = (HANDLE)_beginthread(playthread, 0, NULL); -#else - pthread_create(&threadid, NULL, playthread, NULL); -#endif -} - // this function tries to get the .toc file of the given .bin // the necessary data is put into the ti (trackinformation)-array static int parsetoc(const char *isofile) { @@ -336,16 +192,16 @@ static int parsetoc(const char *isofile) { return -1; } - if ((fi = fopen_utf8(tocname, "r")) == NULL) { + if ((fi = fopen(tocname, "r")) == NULL) { // try changing extension to .cue (to satisfy some stupid tutorials) strcpy(tocname + strlen(tocname) - 4, ".cue"); - if ((fi = fopen_utf8(tocname, "r")) == NULL) { + if ((fi = fopen(tocname, "r")) == NULL) { // if filename is image.toc.bin, try removing .bin (for Brasero) strcpy(tocname, isofile); t = strlen(tocname); if (t >= 8 && strcmp(tocname + t - 8, ".toc.bin") == 0) { tocname[t - 4] = '\0'; - if ((fi = fopen_utf8(tocname, "r")) == NULL) { + if ((fi = fopen(tocname, "r")) == NULL) { return -1; } } @@ -354,11 +210,12 @@ static int parsetoc(const char *isofile) { } } // check if it's really a TOC named as a .cue - fgets(linebuf, sizeof(linebuf), fi); - token = strtok(linebuf, " "); - if (token && strncmp(token, "CD", 2) != 0 && strcmp(token, "CATALOG") != 0) { - fclose(fi); - return -1; + if (fgets(linebuf, sizeof(linebuf), fi) != NULL) { + token = strtok(linebuf, " "); + if (token && strncmp(token, "CD", 2) != 0 && strcmp(token, "CATALOG") != 0) { + fclose(fi); + return -1; + } } fseek(fi, 0, SEEK_SET); } @@ -488,7 +345,7 @@ static int parsecue(const char *isofile) { return -1; } - if ((fi = fopen_utf8(cuename, "r")) == NULL) { + if ((fi = fopen(cuename, "r")) == NULL) { return -1; } @@ -592,7 +449,7 @@ static int parsecue(const char *isofile) { else tmp = tmpb; strncpy(incue_fname, tmp, incue_max_len); - ti[numtracks + 1].handle = fopen_utf8(filepath, "rb"); + ti[numtracks + 1].handle = fopen(filepath, "rb"); // update global offset if this is not first file in this .cue if (numtracks + 1 > 1) { @@ -613,7 +470,7 @@ static int parsecue(const char *isofile) { strncasecmp(isofile + strlen(isofile) - 4, ".cd", 3) == 0)) { // user selected .cue/.cdX as image file, use it's data track instead fclose(cdHandle); - cdHandle = fopen_utf8(filepath, "rb"); + cdHandle = fopen(filepath, "rb"); } } } @@ -647,7 +504,7 @@ static int parseccd(const char *isofile) { return -1; } - if ((fi = fopen_utf8(ccdname, "r")) == NULL) { + if ((fi = fopen(ccdname, "r")) == NULL) { return -1; } @@ -706,14 +563,15 @@ static int parsemds(const char *isofile) { return -1; } - if ((fi = fopen_utf8(mdsname, "rb")) == NULL) { + if ((fi = fopen(mdsname, "rb")) == NULL) { return -1; } memset(&ti, 0, sizeof(ti)); // check if it's a valid mds file - fread(&i, 1, sizeof(unsigned int), fi); + if (fread(&i, 1, sizeof(i), fi) != sizeof(i)) + goto fail_io; i = SWAP32(i); if (i != 0x4944454D) { // not an valid mds file @@ -723,19 +581,22 @@ static int parsemds(const char *isofile) { // get offset to session block fseek(fi, 0x50, SEEK_SET); - fread(&offset, 1, sizeof(unsigned int), fi); + if (fread(&offset, 1, sizeof(offset), fi) != sizeof(offset)) + goto fail_io; offset = SWAP32(offset); // get total number of tracks offset += 14; fseek(fi, offset, SEEK_SET); - fread(&s, 1, sizeof(unsigned short), fi); + if (fread(&s, 1, sizeof(s), fi) != sizeof(s)) + goto fail_io; s = SWAP16(s); numtracks = s; // get offset to track blocks fseek(fi, 4, SEEK_CUR); - fread(&offset, 1, sizeof(unsigned int), fi); + if (fread(&offset, 1, sizeof(offset), fi) != sizeof(offset)) + goto fail_io; offset = SWAP32(offset); // skip lead-in data @@ -764,32 +625,41 @@ static int parsemds(const char *isofile) { ti[i].start[1] = fgetc(fi); ti[i].start[2] = fgetc(fi); - fread(&extra_offset, 1, sizeof(unsigned int), fi); + if (fread(&extra_offset, 1, sizeof(extra_offset), fi) != sizeof(extra_offset)) + goto fail_io; extra_offset = SWAP32(extra_offset); // get track start offset (in .mdf) fseek(fi, offset + 0x28, SEEK_SET); - fread(&l, 1, sizeof(unsigned int), fi); + if (fread(&l, 1, sizeof(l), fi) != sizeof(l)) + goto fail_io; l = SWAP32(l); ti[i].start_offset = l; // get pregap fseek(fi, extra_offset, SEEK_SET); - fread(&l, 1, sizeof(unsigned int), fi); + if (fread(&l, 1, sizeof(l), fi) != sizeof(l)) + goto fail_io; l = SWAP32(l); if (l != 0 && i > 1) pregapOffset = msf2sec(ti[i].start); // get the track length - fread(&l, 1, sizeof(unsigned int), fi); + if (fread(&l, 1, sizeof(l), fi) != sizeof(l)) + goto fail_io; l = SWAP32(l); sec2msf(l, ti[i].length); offset += 0x50; } - fclose(fi); return 0; +fail_io: +#ifndef NDEBUG + SysPrintf(_("File IO error in <%s:%s>.\n"), __FILE__, __func__); +#endif + fclose(fi); + return -1; } static int handlepbp(const char *isofile) { @@ -815,6 +685,7 @@ static int handlepbp(const char *isofile) { off_t psisoimg_offs, cdimg_base; unsigned int t, cd_length; unsigned int offsettab[8]; + unsigned int psar_offs, index_entry_size, index_entry_offset; const char *ext = NULL; int i, ret; @@ -833,20 +704,23 @@ static int handlepbp(const char *isofile) { goto fail_io; } - ret = fseeko(cdHandle, pbp_hdr.psar_offs, SEEK_SET); + psar_offs = SWAP32(pbp_hdr.psar_offs); + + ret = fseeko(cdHandle, psar_offs, SEEK_SET); if (ret != 0) { - SysPrintf("failed to seek to %x\n", pbp_hdr.psar_offs); + SysPrintf("failed to seek to %x\n", psar_offs); goto fail_io; } - psisoimg_offs = pbp_hdr.psar_offs; - fread(psar_sig, 1, sizeof(psar_sig), cdHandle); + psisoimg_offs = psar_offs; + if (fread(psar_sig, 1, sizeof(psar_sig), cdHandle) != sizeof(psar_sig)) + goto fail_io; psar_sig[10] = 0; if (strcmp(psar_sig, "PSTITLEIMG") == 0) { // multidisk image? - ret = fseeko(cdHandle, pbp_hdr.psar_offs + 0x200, SEEK_SET); + ret = fseeko(cdHandle, psar_offs + 0x200, SEEK_SET); if (ret != 0) { - SysPrintf("failed to seek to %x\n", pbp_hdr.psar_offs + 0x200); + SysPrintf("failed to seek to %x\n", psar_offs + 0x200); goto fail_io; } @@ -868,7 +742,7 @@ static int handlepbp(const char *isofile) { if (cdrIsoMultidiskSelect >= cdrIsoMultidiskCount) cdrIsoMultidiskSelect = 0; - psisoimg_offs += offsettab[cdrIsoMultidiskSelect]; + psisoimg_offs += SWAP32(offsettab[cdrIsoMultidiskSelect]); ret = fseeko(cdHandle, psisoimg_offs, SEEK_SET); if (ret != 0) { @@ -876,7 +750,8 @@ static int handlepbp(const char *isofile) { goto fail_io; } - fread(psar_sig, 1, sizeof(psar_sig), cdHandle); + if (fread(psar_sig, 1, sizeof(psar_sig), cdHandle) != sizeof(psar_sig)) + goto fail_io; psar_sig[10] = 0; } @@ -894,15 +769,18 @@ static int handlepbp(const char *isofile) { // first 3 entries are special fseek(cdHandle, sizeof(toc_entry), SEEK_CUR); - fread(&toc_entry, 1, sizeof(toc_entry), cdHandle); + if (fread(&toc_entry, 1, sizeof(toc_entry), cdHandle) != sizeof(toc_entry)) + goto fail_io; numtracks = btoi(toc_entry.index1[0]); - fread(&toc_entry, 1, sizeof(toc_entry), cdHandle); + if (fread(&toc_entry, 1, sizeof(toc_entry), cdHandle) != sizeof(toc_entry)) + goto fail_io; cd_length = btoi(toc_entry.index1[0]) * 60 * 75 + btoi(toc_entry.index1[1]) * 75 + btoi(toc_entry.index1[2]); for (i = 1; i <= numtracks; i++) { - fread(&toc_entry, 1, sizeof(toc_entry), cdHandle); + if (fread(&toc_entry, 1, sizeof(toc_entry), cdHandle) != sizeof(toc_entry)) + goto fail_io; ti[i].type = (toc_entry.type == 1) ? CDDA : DATA; @@ -948,19 +826,29 @@ static int handlepbp(const char *isofile) { goto fail_index; } - if (index_entry.size == 0) + index_entry_size = SWAP32(index_entry.size); + index_entry_offset = SWAP32(index_entry.offset); + + if (index_entry_size == 0) break; - compr_img->index_table[i] = cdimg_base + index_entry.offset; + compr_img->index_table[i] = cdimg_base + index_entry_offset; } - compr_img->index_table[i] = cdimg_base + index_entry.offset + index_entry.size; + compr_img->index_table[i] = cdimg_base + index_entry_offset + index_entry_size; return 0; fail_index: free(compr_img->index_table); compr_img->index_table = NULL; + goto done; + fail_io: +#ifndef NDEBUG + SysPrintf(_("File IO error in <%s:%s>.\n"), __FILE__, __func__); +#endif + +done: if (compr_img != NULL) { free(compr_img); compr_img = NULL; @@ -1054,6 +942,9 @@ fail_io: #ifdef HAVE_CHD static int handlechd(const char *isofile) { + int frame_offset = 150; + int file_offset = 0; + chd_img = calloc(1, sizeof(*chd_img)); if (chd_img == NULL) goto fail_io; @@ -1076,8 +967,6 @@ static int handlechd(const char *isofile) { cddaBigEndian = TRUE; numtracks = 0; - int frame_offset = 0; - int file_offset = 0; memset(ti, 0, sizeof(ti)); while (1) @@ -1102,20 +991,26 @@ static int handlechd(const char *isofile) { else break; - if(md.track == 1) - md.pregap = 150; - else - sec2msf(msf2sec(ti[md.track-1].length) + md.pregap, ti[md.track-1].length); + SysPrintf("chd: %s\n", meta); + + if (md.track == 1) { + if (!strncmp(md.subtype, "RW", 2)) { + subChanMixed = TRUE; + if (!strcmp(md.subtype, "RW_RAW")) + subChanRaw = TRUE; + } + } ti[md.track].type = !strncmp(md.type, "AUDIO", 5) ? CDDA : DATA; sec2msf(frame_offset + md.pregap, ti[md.track].start); sec2msf(md.frames, ti[md.track].length); - ti[md.track].start_offset = file_offset; + ti[md.track].start_offset = file_offset + md.pregap; - frame_offset += md.pregap + md.frames + md.postgap; - file_offset += md.frames + md.postgap; + // XXX: what about postgap? + frame_offset += md.frames; + file_offset += md.frames; numtracks++; } @@ -1146,7 +1041,7 @@ static int opensubfile(const char *isoname) { return -1; } - subHandle = fopen_utf8(subname, "rb"); + subHandle = fopen(subname, "rb"); if (subHandle == NULL) { return -1; } @@ -1383,10 +1278,18 @@ static int cdread_sub_mixed(FILE *f, unsigned int base, void *dest, int sector) 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); + if (fread(subbuffer, 1, SUB_FRAMESIZE, f) != SUB_FRAMESIZE) + goto fail_io; if (subChanRaw) DecodeRawSubData(); + goto done; + +fail_io: +#ifndef NDEBUG + SysPrintf(_("File IO error in <%s:%s>.\n"), __FILE__, __func__); +#endif +done: return ret; } @@ -1511,6 +1414,12 @@ static int cdread_chd(FILE *f, unsigned int base, void *dest, int sector) if (dest != cdbuffer) // copy avoid HACK memcpy(dest, chd_img->buffer[chd_img->sector_in_hunk], CD_FRAMESIZE_RAW); + if (subChanMixed) { + memcpy(subbuffer, chd_img->buffer[chd_img->sector_in_hunk] + CD_FRAMESIZE_RAW, + SUB_FRAMESIZE); + if (subChanRaw) + DecodeRawSubData(); + } return CD_FRAMESIZE_RAW; } #endif @@ -1619,20 +1528,22 @@ static long CALLBACK ISOopen(void) { boolean isMode1ISO = FALSE; char alt_bin_filename[MAXPATHLEN]; const char *bin_filename; - char image_str[1024] = {0}; + char image_str[1024]; + int is_chd = 0; if (cdHandle != NULL) { return 0; // it's already open } - cdHandle = fopen_utf8(GetIsoFile(), "rb"); + cdHandle = fopen(GetIsoFile(), "rb"); if (cdHandle == NULL) { SysPrintf(_("Could't open '%s' for reading: %s\n"), GetIsoFile(), strerror(errno)); return -1; } - sprintf(image_str, "Loaded CD Image: %s", GetIsoFile()); + snprintf(image_str, sizeof(image_str) - 6*4 - 1, + "Loaded CD Image: %s", GetIsoFile()); cddaBigEndian = FALSE; subChanMixed = FALSE; @@ -1671,6 +1582,7 @@ static long CALLBACK ISOopen(void) { strcat(image_str, "[+chd]"); CDR_getBuffer = ISOgetBuffer_chd; cdimg_read_func = cdread_chd; + is_chd = 1; } #endif @@ -1697,7 +1609,7 @@ static long CALLBACK ISOopen(void) { p = alt_bin_filename + strlen(alt_bin_filename) - 4; for (i = 0; i < sizeof(exts) / sizeof(exts[0]); i++) { strcpy(p, exts[i]); - tmpf = fopen_utf8(alt_bin_filename, "rb"); + tmpf = fopen(alt_bin_filename, "rb"); if (tmpf != NULL) break; } @@ -1714,7 +1626,12 @@ static long CALLBACK ISOopen(void) { if (ftello(cdHandle) % 2048 == 0) { unsigned int modeTest = 0; fseek(cdHandle, 0, SEEK_SET); - fread(&modeTest, 4, 1, cdHandle); + if (!fread(&modeTest, sizeof(modeTest), 1, cdHandle)) { +#ifndef NDEBUG + SysPrintf(_("File IO error in <%s:%s>.\n"), __FILE__, __func__); +#endif + return -1; + } if (SWAP32(modeTest) != 0xffffff00) { strcat(image_str, "[2048]"); isMode1ISO = TRUE; @@ -1726,14 +1643,14 @@ static long CALLBACK ISOopen(void) { PrintTracks(); - if (subChanMixed) + if (subChanMixed && !is_chd) cdimg_read_func = cdread_sub_mixed; else if (isMode1ISO) cdimg_read_func = cdread_2048; // make sure we have another handle open for cdda if (numtracks > 1 && ti[1].handle == NULL) { - ti[1].handle = fopen_utf8(bin_filename, "rb"); + ti[1].handle = fopen(bin_filename, "rb"); } cdda_cur_sector = 0; cdda_file_offset = 0; @@ -1755,7 +1672,7 @@ static long CALLBACK ISOclose(void) { fclose(subHandle); subHandle = NULL; } - stopCDDA(); + playing = FALSE; cddaHandle = NULL; if (compr_img != NULL) { @@ -1870,12 +1787,12 @@ static void DecodeRawSubData(void) { // read track // time: byte 0 - minute; byte 1 - second; byte 2 - frame // uses bcd format -static long CALLBACK ISOreadTrack(unsigned char *time) { +static boolean CALLBACK ISOreadTrack(unsigned char *time) { int sector = MSF2SECT(btoi(time[0]), btoi(time[1]), btoi(time[2])); long ret; if (cdHandle == NULL) { - return -1; + return 0; } if (pregapOffset) { @@ -1889,52 +1806,31 @@ static long CALLBACK ISOreadTrack(unsigned char *time) { ret = cdimg_read_func(cdHandle, 0, cdbuffer, sector); if (ret < 0) - return -1; + return 0; if (subHandle != NULL) { fseek(subHandle, sector * SUB_FRAMESIZE, SEEK_SET); - fread(subbuffer, 1, SUB_FRAMESIZE, subHandle); + if (fread(subbuffer, 1, SUB_FRAMESIZE, subHandle) != SUB_FRAMESIZE) + /* Faulty subchannel data shouldn't cause a read failure */ + return 0; if (subChanRaw) DecodeRawSubData(); } - return 0; + return 1; } // plays cdda audio // 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; - - if (numtracks <= 1) - return 0; - - // find the track - cdda_cur_sector = msf2sec((char *)time); - for (i = numtracks; i > 1; i--) { - cdda_first_sector = msf2sec(ti[i].start); - if (cdda_first_sector <= cdda_cur_sector + 2 * 75) - break; - } - cdda_file_offset = ti[i].start_offset; - - // find the file that contains this track - for (; i > 1; i--) - if (ti[i].handle != NULL) - break; - - cddaHandle = ti[i].handle; - - if (SPU_playCDDAchannel != NULL) - startCDDA(); - + playing = TRUE; return 0; } // stops cdda audio static long CALLBACK ISOstop(void) { - stopCDDA(); + playing = FALSE; return 0; }