ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CDVD | CHD: Account for pre/post gap offsets when filling TOC 

This will fix discs with tracks with both an INDEX 00 and INDEX 01
This commit is contained in:
Ty Lamontagne 2024-11-27 14:54:44 -05:00
parent d8f18a3318
commit 37555e3048
No known key found for this signature in database
GPG Key ID: 1B9139843421A974
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pcsx2/CDVD/ChdFileReader.cpp
View File

@ -281,7 +281,7 @@ bool ChdFileReader::ParseTOC(u64* out_frame_count, std::vector<toc_entry>& entri
{ {
u64 total_frames = 0; u64 total_frames = 0;
int max_found_track = -1; int max_found_track = -1;
u64 total_gap_frames = 0;
for (int search_index = 0;; search_index++) for (int search_index = 0;; search_index++)
{ {
char metadata_str[256]; char metadata_str[256];
@ -327,7 +327,7 @@ bool ChdFileReader::ParseTOC(u64* out_frame_count, std::vector<toc_entry>& entri
if (track_num != 0) if (track_num != 0)
{ {
toc_entry entry{}; toc_entry entry{};
entry.lba = static_cast<u32>(total_frames); entry.lba = static_cast<u32>(total_frames) - total_gap_frames;
entry.track = static_cast<u8>(track_num); entry.track = static_cast<u8>(track_num);
entry.adr = 1; entry.adr = 1;
entry.control = 0; entry.control = 0;
@ -338,14 +338,11 @@ bool ChdFileReader::ParseTOC(u64* out_frame_count, std::vector<toc_entry>& entri
entries.push_back(entry); entries.push_back(entry);
} }
// PCSX2 doesn't currently support multiple tracks for CDs.
/* if (track_num != 1)
{
Console.Warning(fmt::format(" Ignoring track {} in CHD.", track_num, frames));
continue;
}*/
total_frames += static_cast<u64>(pregap_frames) + static_cast<u64>(frames) + static_cast<u64>(postgap_frames); // I have not found a CHD with an audio track with a postgap, consider that untested
total_gap_frames += static_cast<u64>(pregap_frames) + static_cast<u64>(postgap_frames);
total_frames += total_gap_frames + static_cast<u64>(frames);
max_found_track = std::max(max_found_track, track_num); max_found_track = std::max(max_found_track, track_num);
} }