diff options
| author | Paul Gilbert | 2016-09-10 11:16:07 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2016-09-10 11:16:07 -0400 |
| commit | bd010bc79f6a56b51c1414a8cafc64bc248496fe (patch) | |
| tree | a1b2d0642709e4d79dce8774ba218d107c13e0c9 /video | |
| parent | 9c7b9e166746a903dc0b7e87967ec257967e1359 (diff) | |
| download | scummvm-rg350-bd010bc79f6a56b51c1414a8cafc64bc248496fe.tar.gz scummvm-rg350-bd010bc79f6a56b51c1414a8cafc64bc248496fe.tar.bz2 scummvm-rg350-bd010bc79f6a56b51c1414a8cafc64bc248496fe.zip | |
COMMON: Converted Common::BitStream to use DisposeAfterUse
Diffstat (limited to 'video')
| -rw-r--r-- | video/bink_decoder.cpp | 4 | ||||
| -rw-r--r-- | video/smk_decoder.cpp | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/video/bink_decoder.cpp b/video/bink_decoder.cpp index a228377a27..cf37e0f06b 100644 --- a/video/bink_decoder.cpp +++ b/video/bink_decoder.cpp @@ -187,7 +187,7 @@ void BinkDecoder::readNextPacket() { audio.sampleCount = _bink->readUint32LE() / (2 * audio.channels); audio.bits = new Common::BitStream32LELSB(new Common::SeekableSubReadStream(_bink, - audioPacketStart + 4, audioPacketEnd), true); + audioPacketStart + 4, audioPacketEnd), DisposeAfterUse::YES); audioTrack->decodePacket(); @@ -204,7 +204,7 @@ void BinkDecoder::readNextPacket() { uint32 videoPacketEnd = _bink->pos() + frameSize; frame.bits = new Common::BitStream32LELSB(new Common::SeekableSubReadStream(_bink, - videoPacketStart, videoPacketEnd), true); + videoPacketStart, videoPacketEnd), DisposeAfterUse::YES); videoTrack->decodePacket(frame); diff --git a/video/smk_decoder.cpp b/video/smk_decoder.cpp index ee7a4ce689..4a2ada0e3a 100644 --- a/video/smk_decoder.cpp +++ b/video/smk_decoder.cpp @@ -386,7 +386,7 @@ bool SmackerDecoder::loadStream(Common::SeekableReadStream *stream) { byte *huffmanTrees = (byte *) malloc(_header.treesSize); _fileStream->read(huffmanTrees, _header.treesSize); - Common::BitStream8LSB bs(new Common::MemoryReadStream(huffmanTrees, _header.treesSize, DisposeAfterUse::YES), true); + Common::BitStream8LSB bs(new Common::MemoryReadStream(huffmanTrees, _header.treesSize, DisposeAfterUse::YES), DisposeAfterUse::YES); videoTrack->readTrees(bs, _header.mMapSize, _header.mClrSize, _header.fullSize, _header.typeSize); _firstFrameStart = _fileStream->pos(); @@ -469,7 +469,7 @@ void SmackerDecoder::readNextPacket() { _fileStream->read(frameData, frameDataSize); - Common::BitStream8LSB bs(new Common::MemoryReadStream(frameData, frameDataSize + 1, DisposeAfterUse::YES), true); + Common::BitStream8LSB bs(new Common::MemoryReadStream(frameData, frameDataSize + 1, DisposeAfterUse::YES), DisposeAfterUse::YES); videoTrack->decodeFrame(bs); _fileStream->seek(startPos + frameSize); @@ -773,7 +773,7 @@ Audio::AudioStream *SmackerDecoder::SmackerAudioTrack::getAudioStream() const { } void SmackerDecoder::SmackerAudioTrack::queueCompressedBuffer(byte *buffer, uint32 bufferSize, uint32 unpackedSize) { - Common::BitStream8LSB audioBS(new Common::MemoryReadStream(buffer, bufferSize), true); + Common::BitStream8LSB audioBS(new Common::MemoryReadStream(buffer, bufferSize), DisposeAfterUse::YES); bool dataPresent = audioBS.getBit(); if (!dataPresent) |