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

IMAGE: Make Codec take a stream reference; change function name to decodeFrame

Browse source
This commit is contained in:
Matthew Hoops 2014-02-27 21:27:24 -05:00
parent e6717aaf43
commit 08ea14a8d0
30 changed files with 290 additions and 291 deletions
Download patch file Download diff file Expand all files Collapse all files

6
image/codecs/mpeg.cpp
View file

@ -52,13 +52,13 @@ MPEGDecoder::~MPEGDecoder() {
}
}
const Graphics::Surface *MPEGDecoder::decodeImage(Common::SeekableReadStream *stream) {
const Graphics::Surface *MPEGDecoder::decodeFrame(Common::SeekableReadStream &stream) {
uint32 framePeriod;
decodePacket(stream, framePeriod);
return _surface;
}
bool MPEGDecoder::decodePacket(Common::SeekableReadStream *packet, uint32 &framePeriod, Graphics::Surface *dst) {
bool MPEGDecoder::decodePacket(Common::SeekableReadStream &packet, uint32 &framePeriod, Graphics::Surface *dst) {
// Decode as much as we can out of this packet
uint32 size = 0xFFFFFFFF;
mpeg2_state_t state;
@ -70,7 +70,7 @@ bool MPEGDecoder::decodePacket(Common::SeekableReadStream *packet, uint32 &frame
switch (state) {
case STATE_BUFFER:
size = packet->read(_buffer, BUFFER_SIZE);
size = packet.read(_buffer, BUFFER_SIZE);
mpeg2_buffer(_mpegDecoder, _buffer, _buffer + size);
break;
case STATE_SLICE: