Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Open ISOs very slightly faster by not reopening

Browse source
This commit is contained in:
Henrik Rydgard 2013-06-19 14:41:42 +02:00
parent 0839a6ed07
commit 61b510b753
2 changed files with 14 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
Core/FileSystems/BlockDevices.cpp
View file

@ -34,19 +34,18 @@ BlockDevice *constructBlockDevice(const char *filename) {
return 0;
char buffer[4];
auto size = fread(buffer, 1, 4, f); //size_t
fclose(f);
fseek(f, 0, SEEK_SET);
if (!memcmp(buffer, "CISO", 4) && size == 4)
return new CISOFileBlockDevice(filename);
return new CISOFileBlockDevice(f);
else if (!memcmp(buffer, "\x00PBP", 4) && size == 4)
return new NPDRMDemoBlockDevice(filename);
return new NPDRMDemoBlockDevice(f);
else
return new FileBlockDevice(filename);
return new FileBlockDevice(f);
}
FileBlockDevice::FileBlockDevice(std::string _filename)
: filename(_filename)
FileBlockDevice::FileBlockDevice(FILE *file)
: f(file)
{
f = fopen(_filename.c_str(), "rb");
fseek(f,0,SEEK_END);
filesize = ftell(f);
fseek(f,0,SEEK_SET);
@ -94,12 +93,12 @@ typedef struct ciso_header
// TODO: Need much better error handling.
CISOFileBlockDevice::CISOFileBlockDevice(std::string _filename)
: filename(_filename)
CISOFileBlockDevice::CISOFileBlockDevice(FILE *file)
: f(file)
{
// CISO format is EXTREMELY crappy and incomplete. All tools make broken CISO.
f = fopen(_filename.c_str(), "rb");
f = file;
CISO_H hdr;
size_t readSize = fread(&hdr, sizeof(CISO_H), 1, f);
if (readSize != 1 || memcmp(hdr.magic, "CISO", 4) != 0)
@ -206,8 +205,8 @@ bool CISOFileBlockDevice::ReadBlock(int blockNumber, u8 *outPtr)
}
NPDRMDemoBlockDevice::NPDRMDemoBlockDevice(std::string _filename)
: filename_(_filename)
NPDRMDemoBlockDevice::NPDRMDemoBlockDevice(FILE *file)
: f(file)
{
MAC_KEY mkey;
CIPHER_KEY ckey;
@ -215,8 +214,6 @@ NPDRMDemoBlockDevice::NPDRMDemoBlockDevice(std::string _filename)
u32 tableOffset, tableSize;
u32 lbaStart, lbaEnd;
f = fopen(_filename.c_str(), "rb");
fseek(f, 0x24, SEEK_SET);
fread(&psarOffset, 1, 4, f);
fseek(f, psarOffset, SEEK_SET);

9
Core/FileSystems/BlockDevices.h
View file

@ -39,13 +39,12 @@ public:
class CISOFileBlockDevice : public BlockDevice
{
public:
CISOFileBlockDevice(std::string _filename);
CISOFileBlockDevice(FILE *file);
~CISOFileBlockDevice();
bool ReadBlock(int blockNumber, u8 *outPtr);
u32 GetNumBlocks() { return numBlocks;}
private:
std::string filename;
FILE *f;
u32 *index;
int indexShift;
@ -57,13 +56,12 @@ private:
class FileBlockDevice : public BlockDevice
{
public:
FileBlockDevice(std::string _filename);
FileBlockDevice(FILE *file);
~FileBlockDevice();
bool ReadBlock(int blockNumber, u8 *outPtr);
u32 GetNumBlocks() {return (u32)(filesize / GetBlockSize());}
private:
std::string filename;
FILE *f;
size_t filesize;
};
@ -82,14 +80,13 @@ struct table_info {
class NPDRMDemoBlockDevice : public BlockDevice
{
public:
NPDRMDemoBlockDevice(std::string _filename);
NPDRMDemoBlockDevice(FILE *file);
~NPDRMDemoBlockDevice();
bool ReadBlock(int blockNumber, u8 *outPtr);
u32 GetNumBlocks() {return (u32)lbaSize;}
private:
std::string filename_;
FILE *f;
u32 lbaSize;