Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2024-10-23 07:35:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

CDImagePBP: Improve handling of broken images from PSX2PSP

Browse source
This commit is contained in:
Connor McLaughlin 2021-04-01 16:26:16 +10:00
parent 0313ce6aee
commit 65f99f89ff
1 changed files with 22 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/common/cd_image_pbp.cpp
View file

@ -557,10 +557,7 @@ bool CDImagePBP::OpenDisc(u32 index, Common::Error* error)
const TOCEntry& t = m_toc[static_cast<size_t>(curr_track) + 2]; const TOCEntry& t = m_toc[static_cast<size_t>(curr_track) + 2];
const u8 track_num = PackedBCDToBinary(t.point); const u8 track_num = PackedBCDToBinary(t.point);
if (track_num != curr_track) if (track_num != curr_track)
{ Log_WarningPrintf("Mismatched TOC track number, expected %u but got %u", static_cast<u32>(curr_track), track_num);
Log_ErrorPrintf("Mismatched TOC track number, expected %u but got %u", static_cast<u32>(curr_track), track_num);
return false;
}
const bool is_audio_track = t.type == 0x01; const bool is_audio_track = t.type == 0x01;
const bool is_first_track = curr_track == 1; const bool is_first_track = curr_track == 1;
@ -573,15 +570,30 @@ bool CDImagePBP::OpenDisc(u32 index, Common::Error* error)
const LBA pregap_start = Position::FromBCD(t.pregap_start.m, t.pregap_start.s, t.pregap_start.f).ToLBA(); const LBA pregap_start = Position::FromBCD(t.pregap_start.m, t.pregap_start.s, t.pregap_start.f).ToLBA();
const LBA userdata_start = Position::FromBCD(t.userdata_start.m, t.userdata_start.s, t.userdata_start.f).ToLBA(); const LBA userdata_start = Position::FromBCD(t.userdata_start.m, t.userdata_start.s, t.userdata_start.f).ToLBA();
LBA pregap_frames;
u32 pregap_sector_size;
if (userdata_start < pregap_start) if (userdata_start < pregap_start)
{ {
Log_ErrorPrintf("Invalid TOC entry at index %u, user data should not start before pregap", if (!is_first_track || is_audio_track)
static_cast<u32>(curr_track)); {
Log_ErrorPrintf("Invalid TOC entry at index %u, user data (%u) should not start before pregap (%u)",
static_cast<u32>(curr_track), userdata_start, pregap_start);
return false; return false;
} }
const LBA pregap_frames = userdata_start - pregap_start; Log_WarningPrintf(
"Invalid TOC entry at index %u, user data (%u) should not start before pregap (%u), assuming not in file.",
static_cast<u32>(curr_track), userdata_start, pregap_start);
pregap_frames = userdata_start;
pregap_sector_size = 0;
}
else
{
pregap_frames = userdata_start - pregap_start;
pregap_sector_size = track_sector_size;
}
if (is_first_track) if (is_first_track)
{ {
m_lba_count += pregap_frames; m_lba_count += pregap_frames;
@ -590,9 +602,9 @@ bool CDImagePBP::OpenDisc(u32 index, Common::Error* error)
Index pregap_index = {}; Index pregap_index = {};
pregap_index.file_offset = pregap_index.file_offset =
is_first_track ? 0 : (static_cast<u64>(pregap_start - track1_pregap_frames) * track_sector_size); is_first_track ? 0 : (static_cast<u64>(pregap_start - track1_pregap_frames) * pregap_sector_size);
pregap_index.file_index = 0; pregap_index.file_index = 0;
pregap_index.file_sector_size = track_sector_size; pregap_index.file_sector_size = pregap_sector_size;
pregap_index.start_lba_on_disc = pregap_start; pregap_index.start_lba_on_disc = pregap_start;
pregap_index.track_number = curr_track; pregap_index.track_number = curr_track;
pregap_index.index_number = 0; pregap_index.index_number = 0;