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

cdvd: Fix writing of CD blockdumps 

Write the full CD sector (not including subchannels) to a blockdump
instead of just a partial CD sector that isn't offset correctly.
This commit is contained in:
Jonathan Li 2018-01-23 19:07:25 +00:00
parent 79d57e2949
commit eeca9f61bf
3 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pcsx2/CDVD/CDVDaccess.cpp
View File

@ -439,7 +439,16 @@ s32 DoCDVDreadSector(u8* buffer, u32 lsn, int mode)
if (ret == 0 && blockDumpFile.IsOpened())
{
blockDumpFile.WriteSector(buffer, lsn);
if (blockDumpFile.GetBlockSize() == CD_FRAMESIZE_RAW && mode != CDVD_MODE_2352)
{
u8 blockDumpBuffer[CD_FRAMESIZE_RAW];
if (CDVD->readSector(blockDumpBuffer, lsn, CDVD_MODE_2352) == 0)
blockDumpFile.WriteSector(blockDumpBuffer, lsn);
}
else
{
blockDumpFile.WriteSector(buffer, lsn);
}
}
return ret;
@ -478,7 +487,16 @@ s32 DoCDVDgetBuffer(u8* buffer)
if (ret == 0 && blockDumpFile.IsOpened())
{
blockDumpFile.WriteSector(buffer, lastLSN);
if (blockDumpFile.GetBlockSize() == CD_FRAMESIZE_RAW && lastReadSize != 2352)
{
u8 blockDumpBuffer[CD_FRAMESIZE_RAW];
if (CDVD->readSector(blockDumpBuffer, lastLSN, CDVD_MODE_2352) == 0)
blockDumpFile.WriteSector(blockDumpBuffer, lastLSN);
}
else
{
blockDumpFile.WriteSector(buffer, lastLSN);
}
}
return ret;

2
pcsx2/CDVD/IsoFileFormats.h
View File

@ -123,7 +123,7 @@ public:
virtual ~OutputIsoFile();
bool IsOpened() const;
u32 GetBlockSize() const;
const wxString& GetFilename() const
{

5
pcsx2/CDVD/OutputIsoFile.cpp
View File

@ -133,3 +133,8 @@ bool OutputIsoFile::IsOpened() const
{
return m_outstream && m_outstream->IsOk();
}
u32 OutputIsoFile::GetBlockSize() const
{
return m_blocksize;
}