Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2025-01-31 03:45:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

CDROM: Ignore sectors with channel number=255

Browse source 
Some games (Taxi 2 and Blues Blues) have junk audio sectors with a channel number of 255.
We need to skip them otherwise it ends up playing the incorrect file.

TODO: Verify with a hardware test.
This commit is contained in:
Connor McLaughlin 2020-07-01 21:43:24 +10:00
parent bff5432879
commit 0710e3b6d3
1 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/core/cdrom.cpp
View file

@ -2137,6 +2137,17 @@ void CDROM::ProcessXAADPCMSector(const u8* raw_sector, const CDImage::SubChannel
// is read. Fixes audio in Tomb Raider III menu.
if (!m_xa_current_set)
{
// Some games (Taxi 2 and Blues Blues) have junk audio sectors with a channel number of 255.
// We need to skip them otherwise it ends up playing the incorrect file.
// TODO: Verify with a hardware test.
if (m_last_sector_subheader.channel_number == 255 && (!m_mode.xa_filter || m_xa_filter_channel_number != 255))
{
Log_WarningPrintf("Skipping XA file with file number %u and channel number %u (submode 0x%02X coding 0x%02X)",
m_last_sector_subheader.file_number, m_last_sector_subheader.channel_number,
m_last_sector_subheader.submode.bits, m_last_sector_subheader.codinginfo.bits);
return;
}
m_xa_current_file_number = m_last_sector_subheader.file_number;
m_xa_current_channel_number = m_last_sector_subheader.channel_number;
m_xa_current_set = true;