diff options
| author | Paul Gilbert | 2016-09-06 08:13:10 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2016-09-10 10:08:12 -0400 |
| commit | c165826316a71b378e3493a4a5fb6a6e1740bbab (patch) | |
| tree | fc657dae321669b08bb962510002dd8d0c01535a /image/codecs/indeo4.h | |
| parent | 5f0962696f97df2cce27d065d99b04243de59334 (diff) | |
| download | scummvm-rg350-c165826316a71b378e3493a4a5fb6a6e1740bbab.tar.gz scummvm-rg350-c165826316a71b378e3493a4a5fb6a6e1740bbab.tar.bz2 scummvm-rg350-c165826316a71b378e3493a4a5fb6a6e1740bbab.zip | |
IMAGE: Created Indeo decoder base class for shared Indeo4/5 functionality
Diffstat (limited to 'image/codecs/indeo4.h')
| -rw-r--r-- | image/codecs/indeo4.h | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/image/codecs/indeo4.h b/image/codecs/indeo4.h index 838b0c3aef..b2d89d5d55 100644 --- a/image/codecs/indeo4.h +++ b/image/codecs/indeo4.h @@ -33,7 +33,6 @@ #ifndef IMAGE_CODECS_INDEO4_H #define IMAGE_CODECS_INDEO4_H -#include "image/codecs/codec.h" #include "image/codecs/indeo/get_bits.h" #include "image/codecs/indeo/indeo.h" #include "graphics/managed_surface.h" @@ -50,26 +49,21 @@ using namespace Indeo; * Used in video: * - AVIDecoder */ -class Indeo4Decoder : public Codec { +class Indeo4Decoder : public IndeoDecoderBase { public: Indeo4Decoder(uint16 width, uint16 height); - ~Indeo4Decoder(); + virtual ~Indeo4Decoder() {} - const Graphics::Surface *decodeFrame(Common::SeekableReadStream &stream); - Graphics::PixelFormat getPixelFormat() const { return _pixelFormat; } + virtual const Graphics::Surface *decodeFrame(Common::SeekableReadStream &stream); static bool isIndeo4(Common::SeekableReadStream &stream); -private: - Graphics::PixelFormat _pixelFormat; - Graphics::ManagedSurface *_surface; - IVI45DecContext _ctx; - +protected: /** * Decode the Indeo 4 picture header. * @returns 0 = Ok, negative number = error */ - int decodePictureHeader(); - + virtual int decodePictureHeader(); +private: int scaleTileSize(int def_size, int size_factor); /** |