diff options
| author | Willem Jan Palenstijn | 2017-07-24 21:01:19 +0200 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2017-08-24 19:46:59 +0200 |
| commit | dde259f06813534c7179a714403d8fd6fe918d09 (patch) | |
| tree | 1379a5c2600057ba53032c722e3a5a1578db8507 /image/codecs/svq1.h | |
| parent | 265fc48d1590cdd503187c79dc254d65623c8d7b (diff) | |
| download | scummvm-rg350-dde259f06813534c7179a714403d8fd6fe918d09.tar.gz scummvm-rg350-dde259f06813534c7179a714403d8fd6fe918d09.tar.bz2 scummvm-rg350-dde259f06813534c7179a714403d8fd6fe918d09.zip | |
COMMON: Remove BitStream base class to allow inlining calls
All users of BitStream were in fact using a specific, hardcoded variant,
so we can hardcode that variant, removing the need for virtual calls,
and enabling inlining.
Diffstat (limited to 'image/codecs/svq1.h')
| -rw-r--r-- | image/codecs/svq1.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/image/codecs/svq1.h b/image/codecs/svq1.h index 236b810294..148501d17f 100644 --- a/image/codecs/svq1.h +++ b/image/codecs/svq1.h @@ -23,10 +23,10 @@ #ifndef IMAGE_CODECS_SVQ1_H #define IMAGE_CODECS_SVQ1_H +#include "common/bitstream.h" #include "image/codecs/codec.h" namespace Common { -class BitStream; class Huffman; struct Point; } @@ -60,15 +60,15 @@ private: Common::Huffman *_interMean; Common::Huffman *_motionComponent; - bool svq1DecodeBlockIntra(Common::BitStream *s, byte *pixels, int pitch); - bool svq1DecodeBlockNonIntra(Common::BitStream *s, byte *pixels, int pitch); - bool svq1DecodeMotionVector(Common::BitStream *s, Common::Point *mv, Common::Point **pmv); + bool svq1DecodeBlockIntra(Common::BitStream32BEMSB *s, byte *pixels, int pitch); + bool svq1DecodeBlockNonIntra(Common::BitStream32BEMSB *s, byte *pixels, int pitch); + bool svq1DecodeMotionVector(Common::BitStream32BEMSB *s, Common::Point *mv, Common::Point **pmv); void svq1SkipBlock(byte *current, byte *previous, int pitch, int x, int y); - bool svq1MotionInterBlock(Common::BitStream *ss, byte *current, byte *previous, int pitch, + bool svq1MotionInterBlock(Common::BitStream32BEMSB *ss, byte *current, byte *previous, int pitch, Common::Point *motion, int x, int y); - bool svq1MotionInter4vBlock(Common::BitStream *ss, byte *current, byte *previous, int pitch, + bool svq1MotionInter4vBlock(Common::BitStream32BEMSB *ss, byte *current, byte *previous, int pitch, Common::Point *motion, int x, int y); - bool svq1DecodeDeltaBlock(Common::BitStream *ss, byte *current, byte *previous, int pitch, + bool svq1DecodeDeltaBlock(Common::BitStream32BEMSB *ss, byte *current, byte *previous, int pitch, Common::Point *motion, int x, int y); void putPixels8C(byte *block, const byte *pixels, int lineSize, int h); |