thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use a BufferedReadStream to buffer ArjFile's input to reduce memory usage

Browse source 
svn-id: r42637
This commit is contained in:
Willem Jan Palenstijn 2009-07-21 09:39:58 +00:00
parent 004b313ae0
commit 4c797d57d0
1 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
common/unarj.cpp
View file

@ -105,7 +105,7 @@ public:
void decode(int32 origsize); void decode(int32 origsize);
void decode_f(int32 origsize); void decode_f(int32 origsize);
MemoryReadStream *_compressed; BufferedReadStream *_compressed;
MemoryWriteStream *_outstream; MemoryWriteStream *_outstream;
//protected: //protected:
@ -360,6 +360,9 @@ bool ArjFile::open(const Common::String &filename) {
return false; return false;
ArjHeader *hdr = _headers[_fileMap[filename]]; ArjHeader *hdr = _headers[_fileMap[filename]];
// TODO: It would be good if ArjFile could decompress files in a streaming
// mode, so it would not need to pre-allocate the entire output.
byte *uncompressedData = (byte *)malloc(hdr->origSize); byte *uncompressedData = (byte *)malloc(hdr->origSize);
File archiveFile; File archiveFile;
@ -372,10 +375,11 @@ bool ArjFile::open(const Common::String &filename) {
} else { } else {
ArjDecoder *decoder = new ArjDecoder(hdr); ArjDecoder *decoder = new ArjDecoder(hdr);
byte *compressedData = (byte *)malloc(hdr->compSize); // TODO: It might not be appropriate to use this wrapper inside ArjFile.
archiveFile.read(compressedData, hdr->compSize); // If reading from archiveFile directly is too slow to be usable,
// maybe the filesystem code should instead wrap its files
decoder->_compressed = new MemoryReadStream(compressedData, hdr->compSize, true); // in a BufferedReadStream.
decoder->_compressed = new BufferedReadStream(&archiveFile, 4096, false);
decoder->_outstream = new MemoryWriteStream(uncompressedData, hdr->origSize); decoder->_outstream = new MemoryWriteStream(uncompressedData, hdr->origSize);
if (hdr->method == 1 || hdr->method == 2 || hdr->method == 3) if (hdr->method == 1 || hdr->method == 2 || hdr->method == 3)