X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=libpcsxcore%2Fcdriso.c;h=8f18f4f16c44d53f2fa4b97fac54e034f25d0982;hp=c9d94f261da29e976a24c0de3c100888b79d6891;hb=77160d47414eb2c6cb59be1ee1c2d95e2f39866e;hpb=2058d51fae1cfade8677c93079574f22507f589d diff --git a/libpcsxcore/cdriso.c b/libpcsxcore/cdriso.c index c9d94f26..8f18f4f1 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 * @@ -30,6 +31,7 @@ #else #include #include +#include #endif #include @@ -44,7 +46,7 @@ static boolean subChanMixed = FALSE; static boolean subChanRaw = FALSE; static boolean subChanMissing = FALSE; -static unsigned char cdbuffer[DATA_SIZE]; +static unsigned char cdbuffer[CD_FRAMESIZE_RAW]; static unsigned char subbuffer[SUB_FRAMESIZE]; static unsigned char sndbuffer[CD_FRAMESIZE_RAW * 10]; @@ -59,11 +61,10 @@ 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. @@ -81,7 +82,7 @@ static struct { unsigned int sector_in_blk; } *compr_img; -int (*cdimg_read_func)(FILE *f, void *dest, int sector, int offset); +int (*cdimg_read_func)(FILE *f, unsigned int base, void *dest, int sector); char* CALLBACK CDR__getDriveLetter(void); long CALLBACK CDR__configure(void); @@ -99,7 +100,7 @@ struct trackinfo { 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? */ @@ -173,19 +174,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, 0); - 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++; @@ -262,12 +268,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 @@ -354,8 +359,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 /= CD_FRAMESIZE_RAW + (subChanMixed ? SUB_FRAMESIZE : 0); t += sector_offs; sec2msf(t, (char *)&ti[numtracks].start); tok2msf((char *)&time2, (char *)&ti[numtracks].length); @@ -368,8 +373,8 @@ 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); ti[numtracks].start_offset = t; + t /= CD_FRAMESIZE_RAW + (subChanMixed ? SUB_FRAMESIZE : 0); t += msf2sec(ti[numtracks].start) + sector_offs; sec2msf(t, (char *)&ti[numtracks].start); tok2msf((char *)&time2, (char *)&ti[numtracks].length); @@ -380,6 +385,7 @@ static int parsetoc(const char *isofile) { sector_offs += msf2sec(dummy); if (numtracks > 1) { t = ti[numtracks - 1].start_offset; + t /= CD_FRAMESIZE_RAW + (subChanMixed ? SUB_FRAMESIZE : 0); pregapOffset = t + msf2sec(ti[numtracks - 1].length); } } @@ -402,7 +408,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; @@ -461,24 +468,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) { @@ -488,7 +503,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) { @@ -498,7 +513,9 @@ static int parsecue(const char *isofile) { pregapOffset = -1; // mark to fill track start_offset } else if (!strcmp(token, "FILE")) { - sscanf(linebuf, " FILE \"%[^\"]\"", tmpb); + t = sscanf(linebuf, " FILE \"%256[^\"]\"", tmpb); + if (t != 1) + sscanf(linebuf, " FILE %256s", tmpb); // absolute path? ti[numtracks + 1].handle = fopen(tmpb, "rb"); @@ -579,7 +596,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) { @@ -664,7 +681,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++) { @@ -686,14 +703,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); @@ -741,13 +758,13 @@ static int handlepbp(const char *isofile) { ret = fread(&pbp_hdr, 1, sizeof(pbp_hdr), cdHandle); if (ret != sizeof(pbp_hdr)) { - fprintf(stderr, "failed to read pbp\n"); + SysPrintf("failed to read pbp\n"); goto fail_io; } ret = fseek(cdHandle, pbp_hdr.psar_offs, SEEK_SET); if (ret != 0) { - fprintf(stderr, "failed to seek to %x\n", pbp_hdr.psar_offs); + SysPrintf("failed to seek to %x\n", pbp_hdr.psar_offs); goto fail_io; } @@ -758,12 +775,12 @@ static int handlepbp(const char *isofile) { // multidisk image? ret = fseek(cdHandle, pbp_hdr.psar_offs + 0x200, SEEK_SET); if (ret != 0) { - fprintf(stderr, "failed to seek to %x\n", pbp_hdr.psar_offs + 0x200); + SysPrintf("failed to seek to %x\n", pbp_hdr.psar_offs + 0x200); goto fail_io; } if (fread(&offsettab, 1, sizeof(offsettab), cdHandle) != sizeof(offsettab)) { - fprintf(stderr, "failed to read offsettab\n"); + SysPrintf("failed to read offsettab\n"); goto fail_io; } @@ -773,7 +790,7 @@ static int handlepbp(const char *isofile) { } cdrIsoMultidiskCount = i; if (cdrIsoMultidiskCount == 0) { - fprintf(stderr, "multidisk eboot has 0 images?\n"); + SysPrintf("multidisk eboot has 0 images?\n"); goto fail_io; } @@ -784,7 +801,7 @@ static int handlepbp(const char *isofile) { ret = fseek(cdHandle, psisoimg_offs, SEEK_SET); if (ret != 0) { - fprintf(stderr, "failed to seek to %x\n", psisoimg_offs); + SysPrintf("failed to seek to %x\n", psisoimg_offs); goto fail_io; } @@ -793,14 +810,14 @@ static int handlepbp(const char *isofile) { } if (strcmp(psar_sig, "PSISOIMG00") != 0) { - fprintf(stderr, "bad psar_sig: %s\n", psar_sig); + SysPrintf("bad psar_sig: %s\n", psar_sig); goto fail_io; } // seek to TOC ret = fseek(cdHandle, psisoimg_offs + 0x800, SEEK_SET); if (ret != 0) { - fprintf(stderr, "failed to seek to %x\n", psisoimg_offs + 0x800); + SysPrintf("failed to seek to %x\n", psisoimg_offs + 0x800); goto fail_io; } @@ -820,6 +837,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]); @@ -829,13 +847,13 @@ 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 ret = fseek(cdHandle, psisoimg_offs + 0x4000, SEEK_SET); if (ret != 0) { - fprintf(stderr, "failed to seek to ISO index\n"); + SysPrintf("failed to seek to ISO index\n"); goto fail_io; } @@ -855,7 +873,7 @@ static int handlepbp(const char *isofile) { for (i = 0; i < compr_img->index_len; i++) { ret = fread(&index_entry, 1, sizeof(index_entry), cdHandle); if (ret != sizeof(index_entry)) { - fprintf(stderr, "failed to read index_entry #%d\n", i); + SysPrintf("failed to read index_entry #%d\n", i); goto fail_index; } @@ -901,18 +919,18 @@ static int handlecbin(const char *isofile) { ret = fread(&ciso_hdr, 1, sizeof(ciso_hdr), cdHandle); if (ret != sizeof(ciso_hdr)) { - fprintf(stderr, "failed to read ciso header\n"); + SysPrintf("failed to read ciso header\n"); return -1; } if (strncmp(ciso_hdr.magic, "CISO", 4) != 0 || ciso_hdr.total_bytes <= 0 || ciso_hdr.block_size <= 0) { - fprintf(stderr, "bad ciso header\n"); + SysPrintf("bad ciso header\n"); return -1; } if (ciso_hdr.header_size != 0 && ciso_hdr.header_size != sizeof(ciso_hdr)) { ret = fseek(cdHandle, ciso_hdr.header_size, SEEK_SET); if (ret != 0) { - fprintf(stderr, "failed to seek to %x\n", ciso_hdr.header_size); + SysPrintf("failed to seek to %x\n", ciso_hdr.header_size); return -1; } } @@ -931,7 +949,7 @@ static int handlecbin(const char *isofile) { ret = fread(compr_img->index_table, sizeof(compr_img->index_table[0]), compr_img->index_len, cdHandle); if (ret != compr_img->index_len) { - fprintf(stderr, "failed to read index table\n"); + SysPrintf("failed to read index table\n"); goto fail_index; } @@ -942,7 +960,7 @@ static int handlecbin(const char *isofile) { compr_img->index_table[i] = (index << ciso_hdr.align) | plain; } if ((long long)index << ciso_hdr.align >= 0x80000000ll) - fprintf(stderr, "warning: ciso img too large, expect problems\n"); + SysPrintf("warning: ciso img too large, expect problems\n"); return 0; @@ -998,18 +1016,18 @@ static int opensbifile(const char *isoname) { return LoadSBI(sbiname, s); } -static int cdread_normal(FILE *f, void *dest, int sector, int offset) +static int cdread_normal(FILE *f, unsigned int base, void *dest, int sector) { - fseek(f, sector * CD_FRAMESIZE_RAW + offset, SEEK_SET); - return fread(dest, 1, CD_FRAMESIZE_RAW - offset, f); + 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, int offset) +static int cdread_sub_mixed(FILE *f, unsigned int base, void *dest, int sector) { int ret; - fseek(f, sector * (CD_FRAMESIZE_RAW + SUB_FRAMESIZE) + offset, SEEK_SET); - ret = fread(dest, 1, CD_FRAMESIZE_RAW - offset, f); + 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 (subChanRaw) DecodeRawSubData(); @@ -1048,13 +1066,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, int offset) +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); @@ -1064,13 +1085,13 @@ static int cdread_compressed(FILE *f, void *dest, int sector, int offset) } if (sector >= compr_img->index_len * 16) { - fprintf(stderr, "sector %d is past img end\n", sector); + SysPrintf("sector %d is past img end\n", sector); return -1; } start_byte = compr_img->index_table[block] & 0x7fffffff; if (fseek(cdHandle, start_byte, SEEK_SET) != 0) { - fprintf(stderr, "seek error for block %d at %x: ", + SysPrintf("seek error for block %d at %x: ", block, start_byte); perror(NULL); return -1; @@ -1079,13 +1100,13 @@ static int cdread_compressed(FILE *f, void *dest, int sector, int offset) is_compressed = !(compr_img->index_table[block] & 0x80000000); size = (compr_img->index_table[block + 1] & 0x7fffffff) - start_byte; if (size > sizeof(compr_img->buff_compressed)) { - fprintf(stderr, "block %d is too large: %u\n", block, size); + SysPrintf("block %d is too large: %u\n", block, size); return -1; } if (fread(is_compressed ? compr_img->buff_compressed : compr_img->buff_raw[0], 1, size, cdHandle) != size) { - fprintf(stderr, "read error for block %d at %x: ", block, start_byte); + SysPrintf("read error for block %d at %x: ", block, start_byte); perror(NULL); return -1; } @@ -1095,12 +1116,12 @@ static int cdread_compressed(FILE *f, void *dest, int sector, int offset) cdbuffer_size = cdbuffer_size_expect; ret = uncompress2(compr_img->buff_raw[0], &cdbuffer_size, compr_img->buff_compressed, size); if (ret != 0) { - fprintf(stderr, "uncompress failed with %d for block %d, sector %d\n", + SysPrintf("uncompress failed with %d for block %d, sector %d\n", ret, block, sector); return -1; } if (cdbuffer_size != cdbuffer_size_expect) - fprintf(stderr, "cdbuffer_size: %lu != %lu, sector %d\n", cdbuffer_size, + SysPrintf("cdbuffer_size: %lu != %lu, sector %d\n", cdbuffer_size, cdbuffer_size_expect, sector); } @@ -1109,22 +1130,22 @@ static int cdread_compressed(FILE *f, void *dest, int sector, int offset) finish: if (dest != cdbuffer) // copy avoid HACK - memcpy(dest, compr_img->buff_raw[compr_img->sector_in_blk] + offset, - CD_FRAMESIZE_RAW - offset); - return CD_FRAMESIZE_RAW - offset; + memcpy(dest, compr_img->buff_raw[compr_img->sector_in_blk], + CD_FRAMESIZE_RAW); + return CD_FRAMESIZE_RAW; } -static int cdread_2048(FILE *f, void *dest, int sector, int offset) +static int cdread_2048(FILE *f, unsigned int base, void *dest, int sector) { int ret; - fseek(f, sector * 2048, SEEK_SET); - ret = fread((char *)dest + 12, 1, 2048, f); + fseek(f, base + sector * 2048, SEEK_SET); + ret = fread((char *)dest + 12 * 2, 1, 2048, f); // not really necessary, fake mode 2 header - memset(cdbuffer, 0, 12); - sec2msf(sector + 2 * 75, (char *)cdbuffer); - cdbuffer[3] = 1; + memset(cdbuffer, 0, 12 * 2); + sec2msf(sector + 2 * 75, (char *)&cdbuffer[12]); + cdbuffer[12 + 3] = 1; return ret; } @@ -1134,7 +1155,7 @@ static unsigned char * CALLBACK ISOgetBuffer_compr(void) { } static unsigned char * CALLBACK ISOgetBuffer(void) { - return cdbuffer; + return cdbuffer + 12; } static void PrintTracks(void) { @@ -1229,7 +1250,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; } @@ -1360,7 +1382,7 @@ static long CALLBACK ISOreadTrack(unsigned char *time) { } } - cdimg_read_func(cdHandle, cdbuffer, sector, 12); + cdimg_read_func(cdHandle, 0, cdbuffer, sector); if (subHandle != NULL) { fseek(subHandle, sector * SUB_FRAMESIZE, SEEK_SET); @@ -1376,40 +1398,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; } @@ -1441,7 +1453,7 @@ static long CALLBACK ISOgetStatus(struct CdrStat *stat) { stat->Type = 0x01; } - sec = cdda_cur_sector + cdda_toc_delta; + sec = cdda_cur_sector; sec2msf(sec, (char *)stat->Time); return 0;