X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=libpcsxcore%2Fcdriso.c;h=1233ba3f23997acbd831a26b563a7c01d97b681d;hb=06d32d29e0b358ce378baadd7e17546c797c9fc8;hp=5e74de1ef970e13a02fe5ea347009f1f313ad9b0;hpb=0eacae49115dd106c08437c88500979b859f2370;p=pcsx_rearmed.git diff --git a/libpcsxcore/cdriso.c b/libpcsxcore/cdriso.c index 5e74de1e..1233ba3f 100644 --- a/libpcsxcore/cdriso.c +++ b/libpcsxcore/cdriso.c @@ -36,12 +36,17 @@ #include #include #define strcasecmp _stricmp -#else +#elif P_HAVE_PTHREAD #include #include #include #endif +// to enable the USE_READ_THREAD code, fix: +// - https://github.com/notaz/pcsx_rearmed/issues/257 +// - ISOgetBufferSub to not race with async code +#define USE_READ_THREAD 0 //P_HAVE_PTHREAD + #ifdef USE_LIBRETRO_VFS #include #undef fseeko @@ -90,11 +95,12 @@ static struct { #ifdef HAVE_CHD static struct { - unsigned char (*buffer)[CD_FRAMESIZE_RAW + SUB_FRAMESIZE]; + unsigned char *buffer; chd_file* chd; const chd_header* header; unsigned int sectors_per_hunk; - unsigned int current_hunk; + unsigned int current_hunk[2]; + unsigned int current_buffer; unsigned int sector_in_hunk; } *chd_img; #endif @@ -116,7 +122,7 @@ struct trackinfo { char start[3]; // MSF-format char length[3]; // MSF-format FILE *handle; // for multi-track images CDDA - unsigned int start_offset; // byte offset from start of above file + unsigned int start_offset; // byte offset from start of above file (chd: sector offset) }; #define MAXTRACKS 100 /* How many tracks can a CD hold? */ @@ -952,16 +958,17 @@ static int handlechd(const char *isofile) { if (Config.CHD_Precache && (chd_precache(chd_img->chd) != CHDERR_NONE)) goto fail_io; - chd_img->header = chd_get_header(chd_img->chd); + chd_img->header = chd_get_header(chd_img->chd); - chd_img->buffer = malloc(chd_img->header->hunkbytes); - if (chd_img->buffer == NULL) + chd_img->buffer = malloc(chd_img->header->hunkbytes * 2); + if (chd_img->buffer == NULL) goto fail_io; - chd_img->sectors_per_hunk = chd_img->header->hunkbytes / (CD_FRAMESIZE_RAW + SUB_FRAMESIZE); - chd_img->current_hunk = (unsigned int)-1; + chd_img->sectors_per_hunk = chd_img->header->hunkbytes / (CD_FRAMESIZE_RAW + SUB_FRAMESIZE); + chd_img->current_hunk[0] = (unsigned int)-1; + chd_img->current_hunk[1] = (unsigned int)-1; - cddaBigEndian = TRUE; + cddaBigEndian = TRUE; numtracks = 0; memset(ti, 0, sizeof(ti)); @@ -1070,7 +1077,7 @@ static int opensbifile(const char *isoname) { return LoadSBI(sbiname, s); } -#ifdef _WIN32 +#if !USE_READ_THREAD static void readThreadStop() {} static void readThreadStart() {} #else @@ -1411,6 +1418,13 @@ finish: } #ifdef HAVE_CHD +static unsigned char *chd_get_sector(unsigned int current_buffer, unsigned int sector_in_hunk) +{ + return chd_img->buffer + + current_buffer * chd_img->header->hunkbytes + + sector_in_hunk * (CD_FRAMESIZE_RAW + SUB_FRAMESIZE); +} + static int cdread_chd(FILE *f, unsigned int base, void *dest, int sector) { int hunk; @@ -1420,35 +1434,48 @@ static int cdread_chd(FILE *f, unsigned int base, void *dest, int sector) hunk = sector / chd_img->sectors_per_hunk; chd_img->sector_in_hunk = sector % chd_img->sectors_per_hunk; - if (hunk != chd_img->current_hunk) + if (hunk == chd_img->current_hunk[0]) + chd_img->current_buffer = 0; + else if (hunk == chd_img->current_hunk[1]) + chd_img->current_buffer = 1; + else { - chd_read(chd_img->chd, hunk, chd_img->buffer); - chd_img->current_hunk = hunk; + chd_read(chd_img->chd, hunk, chd_img->buffer + + chd_img->current_buffer * chd_img->header->hunkbytes); + chd_img->current_hunk[chd_img->current_buffer] = hunk; } if (dest != cdbuffer) // copy avoid HACK - memcpy(dest, chd_img->buffer[chd_img->sector_in_hunk], + memcpy(dest, chd_get_sector(chd_img->current_buffer, chd_img->sector_in_hunk), CD_FRAMESIZE_RAW); return CD_FRAMESIZE_RAW; } static int cdread_sub_chd(FILE *f, int sector) { + unsigned int sector_in_hunk; + unsigned int buffer; int hunk; if (!subChanMixed) return -1; hunk = sector / chd_img->sectors_per_hunk; - chd_img->sector_in_hunk = sector % chd_img->sectors_per_hunk; + sector_in_hunk = sector % chd_img->sectors_per_hunk; - if (hunk != chd_img->current_hunk) + if (hunk == chd_img->current_hunk[0]) + buffer = 0; + else if (hunk == chd_img->current_hunk[1]) + buffer = 1; + else { - chd_read(chd_img->chd, hunk, chd_img->buffer); - chd_img->current_hunk = hunk; + buffer = chd_img->current_buffer ^ 1; + chd_read(chd_img->chd, hunk, chd_img->buffer + + buffer * chd_img->header->hunkbytes); + chd_img->current_hunk[buffer] = hunk; } - memcpy(subbuffer, chd_img->buffer[chd_img->sector_in_hunk] + CD_FRAMESIZE_RAW, SUB_FRAMESIZE); + memcpy(subbuffer, chd_get_sector(buffer, sector_in_hunk) + CD_FRAMESIZE_RAW, SUB_FRAMESIZE); return SUB_FRAMESIZE; } #endif @@ -1468,7 +1495,7 @@ static int cdread_2048(FILE *f, unsigned int base, void *dest, int sector) return 12*2 + ret; } -#ifndef _WIN32 +#if USE_READ_THREAD static int cdread_async(FILE *f, unsigned int base, void *dest, int sector) { boolean found = FALSE; @@ -1522,11 +1549,11 @@ static unsigned char * CALLBACK ISOgetBuffer_compr(void) { #ifdef HAVE_CHD static unsigned char * CALLBACK ISOgetBuffer_chd(void) { - return chd_img->buffer[chd_img->sector_in_hunk] + 12; + return chd_get_sector(chd_img->current_buffer, chd_img->sector_in_hunk) + 12; } #endif -#ifndef _WIN32 +#if USE_READ_THREAD static unsigned char * CALLBACK ISOgetBuffer_async(void) { unsigned char *buffer; pthread_mutex_lock(§orbuffer_lock); @@ -1534,7 +1561,6 @@ static unsigned char * CALLBACK ISOgetBuffer_async(void) { pthread_mutex_unlock(§orbuffer_lock); return buffer + 12; } - #endif static unsigned char * CALLBACK ISOgetBuffer(void) { @@ -1559,7 +1585,6 @@ static long CALLBACK ISOopen(void) { char alt_bin_filename[MAXPATHLEN]; const char *bin_filename; char image_str[1024]; - int is_chd = 0; if (cdHandle != NULL) { return 0; // it's already open @@ -1614,7 +1639,6 @@ static long CALLBACK ISOopen(void) { CDR_getBuffer = ISOgetBuffer_chd; cdimg_read_func = cdread_chd; cdimg_read_sub_func = cdread_sub_chd; - is_chd = 1; } #endif @@ -1655,14 +1679,11 @@ static long CALLBACK ISOopen(void) { } // guess whether it is mode1/2048 - if (ftello(cdHandle) % 2048 == 0) { + if (cdimg_read_func == cdread_normal && ftello(cdHandle) % 2048 == 0) { unsigned int modeTest = 0; fseek(cdHandle, 0, SEEK_SET); 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]"); @@ -1675,7 +1696,7 @@ static long CALLBACK ISOopen(void) { PrintTracks(); - if (subChanMixed && !is_chd) { + if (subChanMixed && cdimg_read_func == cdread_normal) { cdimg_read_func = cdread_sub_mixed; cdimg_read_sub_func = cdread_sub_sub_mixed; }