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

disc ID: handle data tracks with audio sectors (bad rips, in other words). should fix #928, but since the user self-made his own bad dump, I can't verify it

This commit is contained in:
zeromus 2017-07-23 11:30:43 -05:00
parent f050718a87
commit 3a4b9ed798
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
BizHawk.Emulation.DiscSystem/DiscIdentifier.cs
View File

@ -60,8 +60,10 @@ namespace BizHawk.Emulation.DiscSystem
_disc = disc; _disc = disc;
_dsr = new DiscSectorReader(disc); _dsr = new DiscSectorReader(disc);
//the first check for mode 0 should be sufficient for blocking attempts to read audio sectors, so dont do this //the first check for mode 0 should be sufficient for blocking attempts to read audio sectors
//dsr.Policy.ThrowExceptions2048 = false; //but github #928 had a data track with an audio sector
//so let's be careful here.. we're just trying to ID things, not be robust
_dsr.Policy.ThrowExceptions2048 = false;
} }
private readonly Disc _disc; private readonly Disc _disc;
@ -74,14 +76,13 @@ namespace BizHawk.Emulation.DiscSystem
/// </summary> /// </summary>
public DiscType DetectDiscType() public DiscType DetectDiscType()
{ {
//check track 1's data type. if it's an audio track, further data-track testing is useless
//furthermore, it's probably senseless (no binary data there to read)
//however a sector could mark itself as audio without actually being.. we'll just wait for that one.
// not fully tested yet // not fully tested yet
if (DetectPCFX()) if (DetectPCFX())
return DiscType.PCFX; return DiscType.PCFX;
//check track 1's data type. if it's an audio track, further data-track testing is useless
//furthermore, it's probably senseless (no binary data there to read)
//NOTE: PCE-CD detection goes through here (no good way to detect PCE cd)
if (!_disc.TOC.TOCItems[1].IsData) if (!_disc.TOC.TOCItems[1].IsData)
return DiscType.AudioDisc; return DiscType.AudioDisc;
@ -179,7 +180,9 @@ namespace BizHawk.Emulation.DiscSystem
if (!_sectorCache.TryGetValue(lba, out data)) if (!_sectorCache.TryGetValue(lba, out data))
{ {
data = new byte[2048]; data = new byte[2048];
_dsr.ReadLBA_2048(lba, data, 0); int read = _dsr.ReadLBA_2048(lba, data, 0);
if (read != 2048)
return null;
_sectorCache[lba] = data; _sectorCache[lba] = data;
} }
return data; return data;
@ -188,6 +191,7 @@ namespace BizHawk.Emulation.DiscSystem
private bool StringAt(string s, int n, int lba = 0) private bool StringAt(string s, int n, int lba = 0)
{ {
var data = ReadSectorCached(lba); var data = ReadSectorCached(lba);
if (data == null) return false;
byte[] cmp = System.Text.Encoding.ASCII.GetBytes(s); byte[] cmp = System.Text.Encoding.ASCII.GetBytes(s);
byte[] cmp2 = new byte[cmp.Length]; byte[] cmp2 = new byte[cmp.Length];
Buffer.BlockCopy(data, n, cmp2, 0, cmp.Length); Buffer.BlockCopy(data, n, cmp2, 0, cmp.Length);