[Scummvm-cvs-logs] SF.net SVN: scummvm:[54930] scummvm/trunk/graphics/video
mthreepwood at users.sourceforge.net
mthreepwood at users.sourceforge.net
Thu Dec 16 03:02:53 CET 2010
Revision: 54930
http://scummvm.svn.sourceforge.net/scummvm/?rev=54930&view=rev
Author: mthreepwood
Date: 2010-12-16 02:02:53 +0000 (Thu, 16 Dec 2010)
Log Message:
-----------
VIDEO: Make Codec::decodeImage() return a const Surface pointer
Modified Paths:
--------------
scummvm/trunk/graphics/video/avi_decoder.cpp
scummvm/trunk/graphics/video/codecs/cinepak.cpp
scummvm/trunk/graphics/video/codecs/cinepak.h
scummvm/trunk/graphics/video/codecs/codec.h
scummvm/trunk/graphics/video/codecs/indeo3.cpp
scummvm/trunk/graphics/video/codecs/indeo3.h
scummvm/trunk/graphics/video/codecs/mjpeg.cpp
scummvm/trunk/graphics/video/codecs/mjpeg.h
scummvm/trunk/graphics/video/codecs/msrle.cpp
scummvm/trunk/graphics/video/codecs/msrle.h
scummvm/trunk/graphics/video/codecs/msvideo1.cpp
scummvm/trunk/graphics/video/codecs/msvideo1.h
scummvm/trunk/graphics/video/codecs/qtrle.cpp
scummvm/trunk/graphics/video/codecs/qtrle.h
scummvm/trunk/graphics/video/codecs/rpza.cpp
scummvm/trunk/graphics/video/codecs/rpza.h
scummvm/trunk/graphics/video/codecs/smc.cpp
scummvm/trunk/graphics/video/codecs/smc.h
scummvm/trunk/graphics/video/codecs/truemotion1.cpp
scummvm/trunk/graphics/video/codecs/truemotion1.h
scummvm/trunk/graphics/video/coktel_decoder.cpp
scummvm/trunk/graphics/video/qt_decoder.cpp
scummvm/trunk/graphics/video/qt_decoder.h
Modified: scummvm/trunk/graphics/video/avi_decoder.cpp
===================================================================
--- scummvm/trunk/graphics/video/avi_decoder.cpp 2010-12-16 01:49:29 UTC (rev 54929)
+++ scummvm/trunk/graphics/video/avi_decoder.cpp 2010-12-16 02:02:53 UTC (rev 54930)
@@ -357,7 +357,7 @@
return NULL;
Common::SeekableReadStream *frameData = _fileStream->readStream(chunkSize);
- Graphics::Surface *surface = _videoCodec->decodeImage(frameData);
+ const Graphics::Surface *surface = _videoCodec->decodeImage(frameData);
delete frameData;
_fileStream->skip(chunkSize & 1); // Alignment
return surface;
Modified: scummvm/trunk/graphics/video/codecs/cinepak.cpp
===================================================================
--- scummvm/trunk/graphics/video/codecs/cinepak.cpp 2010-12-16 01:49:29 UTC (rev 54929)
+++ scummvm/trunk/graphics/video/codecs/cinepak.cpp 2010-12-16 02:02:53 UTC (rev 54930)
@@ -68,7 +68,7 @@
delete[] _curFrame.strips;
}
-Surface *CinepakDecoder::decodeImage(Common::SeekableReadStream *stream) {
+const Surface *CinepakDecoder::decodeImage(Common::SeekableReadStream *stream) {
_curFrame.flags = stream->readByte();
_curFrame.length = (stream->readByte() << 16) + stream->readUint16BE();
_curFrame.width = stream->readUint16BE();
Modified: scummvm/trunk/graphics/video/codecs/cinepak.h
===================================================================
--- scummvm/trunk/graphics/video/codecs/cinepak.h 2010-12-16 01:49:29 UTC (rev 54929)
+++ scummvm/trunk/graphics/video/codecs/cinepak.h 2010-12-16 02:02:53 UTC (rev 54930)
@@ -64,7 +64,7 @@
CinepakDecoder(int bitsPerPixel = 24);
~CinepakDecoder();
- Surface *decodeImage(Common::SeekableReadStream *stream);
+ const Surface *decodeImage(Common::SeekableReadStream *stream);
PixelFormat getPixelFormat() const { return _pixelFormat; }
private:
Modified: scummvm/trunk/graphics/video/codecs/codec.h
===================================================================
--- scummvm/trunk/graphics/video/codecs/codec.h 2010-12-16 01:49:29 UTC (rev 54929)
+++ scummvm/trunk/graphics/video/codecs/codec.h 2010-12-16 02:02:53 UTC (rev 54930)
@@ -40,7 +40,7 @@
Codec() {}
virtual ~Codec() {}
- virtual Surface *decodeImage(Common::SeekableReadStream *stream) = 0;
+ virtual const Surface *decodeImage(Common::SeekableReadStream *stream) = 0;
virtual PixelFormat getPixelFormat() const = 0;
};
Modified: scummvm/trunk/graphics/video/codecs/indeo3.cpp
===================================================================
--- scummvm/trunk/graphics/video/codecs/indeo3.cpp 2010-12-16 01:49:29 UTC (rev 54929)
+++ scummvm/trunk/graphics/video/codecs/indeo3.cpp 2010-12-16 02:02:53 UTC (rev 54930)
@@ -168,7 +168,7 @@
}
}
-Surface *Indeo3Decoder::decodeImage(Common::SeekableReadStream *stream) {
+const Surface *Indeo3Decoder::decodeImage(Common::SeekableReadStream *stream) {
// Not Indeo 3? Fail
if (!isIndeo3(*stream))
return 0;
Modified: scummvm/trunk/graphics/video/codecs/indeo3.h
===================================================================
--- scummvm/trunk/graphics/video/codecs/indeo3.h 2010-12-16 01:49:29 UTC (rev 54929)
+++ scummvm/trunk/graphics/video/codecs/indeo3.h 2010-12-16 02:02:53 UTC (rev 54930)
@@ -46,7 +46,7 @@
Indeo3Decoder(uint16 width, uint16 height);
~Indeo3Decoder();
- Surface *decodeImage(Common::SeekableReadStream *stream);
+ const Surface *decodeImage(Common::SeekableReadStream *stream);
PixelFormat getPixelFormat() const;
static bool isIndeo3(Common::SeekableReadStream &stream);
Modified: scummvm/trunk/graphics/video/codecs/mjpeg.cpp
===================================================================
--- scummvm/trunk/graphics/video/codecs/mjpeg.cpp 2010-12-16 01:49:29 UTC (rev 54929)
+++ scummvm/trunk/graphics/video/codecs/mjpeg.cpp 2010-12-16 02:02:53 UTC (rev 54930)
@@ -45,7 +45,7 @@
}
}
-Surface *JPEGDecoder::decodeImage(Common::SeekableReadStream* stream) {
+const Surface *JPEGDecoder::decodeImage(Common::SeekableReadStream* stream) {
_jpeg->read(stream);
Surface *ySurface = _jpeg->getComponent(1);
Surface *uSurface = _jpeg->getComponent(2);
Modified: scummvm/trunk/graphics/video/codecs/mjpeg.h
===================================================================
--- scummvm/trunk/graphics/video/codecs/mjpeg.h 2010-12-16 01:49:29 UTC (rev 54929)
+++ scummvm/trunk/graphics/video/codecs/mjpeg.h 2010-12-16 02:02:53 UTC (rev 54930)
@@ -43,7 +43,7 @@
JPEGDecoder();
~JPEGDecoder();
- Surface *decodeImage(Common::SeekableReadStream *stream);
+ const Surface *decodeImage(Common::SeekableReadStream *stream);
PixelFormat getPixelFormat() const { return _pixelFormat; }
private:
Modified: scummvm/trunk/graphics/video/codecs/msrle.cpp
===================================================================
--- scummvm/trunk/graphics/video/codecs/msrle.cpp 2010-12-16 01:49:29 UTC (rev 54929)
+++ scummvm/trunk/graphics/video/codecs/msrle.cpp 2010-12-16 02:02:53 UTC (rev 54930)
@@ -41,7 +41,7 @@
delete _surface;
}
-Surface *MSRLEDecoder::decodeImage(Common::SeekableReadStream *stream) {
+const Surface *MSRLEDecoder::decodeImage(Common::SeekableReadStream *stream) {
if (_bitsPerPixel == 8) {
decode8(stream);
} else
Modified: scummvm/trunk/graphics/video/codecs/msrle.h
===================================================================
--- scummvm/trunk/graphics/video/codecs/msrle.h 2010-12-16 01:49:29 UTC (rev 54929)
+++ scummvm/trunk/graphics/video/codecs/msrle.h 2010-12-16 02:02:53 UTC (rev 54930)
@@ -35,7 +35,7 @@
MSRLEDecoder(uint16 width, uint16 height, byte bitsPerPixel);
~MSRLEDecoder();
- Surface *decodeImage(Common::SeekableReadStream *stream);
+ const Surface *decodeImage(Common::SeekableReadStream *stream);
PixelFormat getPixelFormat() const { return PixelFormat::createFormatCLUT8(); }
private:
Modified: scummvm/trunk/graphics/video/codecs/msvideo1.cpp
===================================================================
--- scummvm/trunk/graphics/video/codecs/msvideo1.cpp 2010-12-16 01:49:29 UTC (rev 54929)
+++ scummvm/trunk/graphics/video/codecs/msvideo1.cpp 2010-12-16 02:02:53 UTC (rev 54930)
@@ -126,7 +126,7 @@
}
}
-Surface *MSVideo1Decoder::decodeImage(Common::SeekableReadStream *stream) {
+const Surface *MSVideo1Decoder::decodeImage(Common::SeekableReadStream *stream) {
if (_bitsPerPixel == 8)
decode8(stream);
else {
Modified: scummvm/trunk/graphics/video/codecs/msvideo1.h
===================================================================
--- scummvm/trunk/graphics/video/codecs/msvideo1.h 2010-12-16 01:49:29 UTC (rev 54929)
+++ scummvm/trunk/graphics/video/codecs/msvideo1.h 2010-12-16 02:02:53 UTC (rev 54930)
@@ -35,7 +35,7 @@
MSVideo1Decoder(uint16 width, uint16 height, byte bitsPerPixel);
~MSVideo1Decoder();
- Surface *decodeImage(Common::SeekableReadStream *stream);
+ const Surface *decodeImage(Common::SeekableReadStream *stream);
PixelFormat getPixelFormat() const { return PixelFormat::createFormatCLUT8(); }
private:
Modified: scummvm/trunk/graphics/video/codecs/qtrle.cpp
===================================================================
--- scummvm/trunk/graphics/video/codecs/qtrle.cpp 2010-12-16 01:49:29 UTC (rev 54929)
+++ scummvm/trunk/graphics/video/codecs/qtrle.cpp 2010-12-16 02:02:53 UTC (rev 54930)
@@ -354,7 +354,7 @@
}
}
-Surface *QTRLEDecoder::decodeImage(Common::SeekableReadStream *stream) {
+const Surface *QTRLEDecoder::decodeImage(Common::SeekableReadStream *stream) {
uint16 start_line = 0;
uint16 height = _surface->h;
Modified: scummvm/trunk/graphics/video/codecs/qtrle.h
===================================================================
--- scummvm/trunk/graphics/video/codecs/qtrle.h 2010-12-16 01:49:29 UTC (rev 54929)
+++ scummvm/trunk/graphics/video/codecs/qtrle.h 2010-12-16 02:02:53 UTC (rev 54930)
@@ -36,7 +36,7 @@
QTRLEDecoder(uint16 width, uint16 height, byte bitsPerPixel);
~QTRLEDecoder();
- Surface *decodeImage(Common::SeekableReadStream *stream);
+ const Surface *decodeImage(Common::SeekableReadStream *stream);
PixelFormat getPixelFormat() const { return _pixelFormat; }
private:
Modified: scummvm/trunk/graphics/video/codecs/rpza.cpp
===================================================================
--- scummvm/trunk/graphics/video/codecs/rpza.cpp 2010-12-16 01:49:29 UTC (rev 54929)
+++ scummvm/trunk/graphics/video/codecs/rpza.cpp 2010-12-16 02:02:53 UTC (rev 54930)
@@ -69,7 +69,7 @@
} \
blockPtr++
-Surface *RPZADecoder::decodeImage(Common::SeekableReadStream *stream) {
+const Surface *RPZADecoder::decodeImage(Common::SeekableReadStream *stream) {
uint16 colorA = 0, colorB = 0;
uint16 color4[4];
Modified: scummvm/trunk/graphics/video/codecs/rpza.h
===================================================================
--- scummvm/trunk/graphics/video/codecs/rpza.h 2010-12-16 01:49:29 UTC (rev 54929)
+++ scummvm/trunk/graphics/video/codecs/rpza.h 2010-12-16 02:02:53 UTC (rev 54930)
@@ -36,7 +36,7 @@
RPZADecoder(uint16 width, uint16 height);
~RPZADecoder() { delete _surface; }
- Surface *decodeImage(Common::SeekableReadStream *stream);
+ const Surface *decodeImage(Common::SeekableReadStream *stream);
PixelFormat getPixelFormat() const { return _pixelFormat; }
private:
Modified: scummvm/trunk/graphics/video/codecs/smc.cpp
===================================================================
--- scummvm/trunk/graphics/video/codecs/smc.cpp 2010-12-16 01:49:29 UTC (rev 54929)
+++ scummvm/trunk/graphics/video/codecs/smc.cpp 2010-12-16 02:02:53 UTC (rev 54930)
@@ -52,7 +52,7 @@
_surface->create(width, height, 1);
}
-Graphics::Surface *SMCDecoder::decodeImage(Common::SeekableReadStream *stream) {
+const Graphics::Surface *SMCDecoder::decodeImage(Common::SeekableReadStream *stream) {
byte *pixels = (byte *)_surface->pixels;
uint32 numBlocks = 0;
Modified: scummvm/trunk/graphics/video/codecs/smc.h
===================================================================
--- scummvm/trunk/graphics/video/codecs/smc.h 2010-12-16 01:49:29 UTC (rev 54929)
+++ scummvm/trunk/graphics/video/codecs/smc.h 2010-12-16 02:02:53 UTC (rev 54930)
@@ -42,7 +42,7 @@
SMCDecoder(uint16 width, uint16 height);
~SMCDecoder() { delete _surface; }
- Surface *decodeImage(Common::SeekableReadStream *stream);
+ const Surface *decodeImage(Common::SeekableReadStream *stream);
PixelFormat getPixelFormat() const { return PixelFormat::createFormatCLUT8(); }
private:
Modified: scummvm/trunk/graphics/video/codecs/truemotion1.cpp
===================================================================
--- scummvm/trunk/graphics/video/codecs/truemotion1.cpp 2010-12-16 01:49:29 UTC (rev 54929)
+++ scummvm/trunk/graphics/video/codecs/truemotion1.cpp 2010-12-16 02:02:53 UTC (rev 54930)
@@ -395,7 +395,7 @@
}
}
-Surface *TrueMotion1Decoder::decodeImage(Common::SeekableReadStream *stream) {
+const Surface *TrueMotion1Decoder::decodeImage(Common::SeekableReadStream *stream) {
decodeHeader(stream);
if (compressionTypes[_header.compression].algorithm == ALGO_NOP)
Modified: scummvm/trunk/graphics/video/codecs/truemotion1.h
===================================================================
--- scummvm/trunk/graphics/video/codecs/truemotion1.h 2010-12-16 01:49:29 UTC (rev 54929)
+++ scummvm/trunk/graphics/video/codecs/truemotion1.h 2010-12-16 02:02:53 UTC (rev 54930)
@@ -40,7 +40,7 @@
TrueMotion1Decoder(uint16 width, uint16 height);
~TrueMotion1Decoder();
- Surface *decodeImage(Common::SeekableReadStream *stream);
+ const Surface *decodeImage(Common::SeekableReadStream *stream);
// Always return RGB565
PixelFormat getPixelFormat() const { return Graphics::PixelFormat(2, 5, 6, 5, 0, 11, 5, 0, 0); }
Modified: scummvm/trunk/graphics/video/coktel_decoder.cpp
===================================================================
--- scummvm/trunk/graphics/video/coktel_decoder.cpp 2010-12-16 01:49:29 UTC (rev 54929)
+++ scummvm/trunk/graphics/video/coktel_decoder.cpp 2010-12-16 02:02:53 UTC (rev 54930)
@@ -2093,7 +2093,7 @@
return false;
Common::MemoryReadStream frameStream(_frameData, _frameDataLen);
- Surface *codecSurf = _codec->decodeImage(&frameStream);
+ const Surface *codecSurf = _codec->decodeImage(&frameStream);
if (!codecSurf)
return false;
Modified: scummvm/trunk/graphics/video/qt_decoder.cpp
===================================================================
--- scummvm/trunk/graphics/video/qt_decoder.cpp 2010-12-16 01:49:29 UTC (rev 54929)
+++ scummvm/trunk/graphics/video/qt_decoder.cpp 2010-12-16 02:02:53 UTC (rev 54930)
@@ -242,7 +242,7 @@
if (!entry->videoCodec)
return 0;
- Surface *frame = entry->videoCodec->decodeImage(frameData);
+ const Surface *frame = entry->videoCodec->decodeImage(frameData);
delete frameData;
// Update the palette in case it changes between video descriptions
@@ -256,7 +256,7 @@
return scaleSurface(frame);
}
-Surface *QuickTimeDecoder::scaleSurface(Surface *frame) {
+const Surface *QuickTimeDecoder::scaleSurface(const Surface *frame) {
if (getScaleFactorX() == 1 && getScaleFactorY() == 1)
return frame;
Modified: scummvm/trunk/graphics/video/qt_decoder.h
===================================================================
--- scummvm/trunk/graphics/video/qt_decoder.h 2010-12-16 01:49:29 UTC (rev 54929)
+++ scummvm/trunk/graphics/video/qt_decoder.h 2010-12-16 02:02:53 UTC (rev 54930)
@@ -251,7 +251,7 @@
int8 _videoStreamIndex;
Surface *_scaledSurface;
- Surface *scaleSurface(Surface *frame);
+ const Surface *scaleSurface(const Surface *frame);
Common::Rational getScaleFactorX() const;
Common::Rational getScaleFactorY() const;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list