diff options
| author | Matthew Hoops | 2012-04-04 21:15:15 -0400 |
|---|---|---|
| committer | D G Turner | 2012-04-08 03:29:22 +0100 |
| commit | c9bbe5793cbd34138b722c3a7414c7d8c5f3d55f (patch) | |
| tree | a7baa0d775a0f9179475a168ba47b2e753b7c07d /video/codecs/svq1.h | |
| parent | 32ff1f8478bac4bb8b2ec8ee2a94eeb42e79ba77 (diff) | |
| download | scummvm-rg350-c9bbe5793cbd34138b722c3a7414c7d8c5f3d55f.tar.gz scummvm-rg350-c9bbe5793cbd34138b722c3a7414c7d8c5f3d55f.tar.bz2 scummvm-rg350-c9bbe5793cbd34138b722c3a7414c7d8c5f3d55f.zip | |
VIDEO: Rewrite the SVQ1 VLC code to use Common::Huffman
Diffstat (limited to 'video/codecs/svq1.h')
| -rw-r--r-- | video/codecs/svq1.h | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/video/codecs/svq1.h b/video/codecs/svq1.h index 786a2bbd80..2271bf4d2b 100644 --- a/video/codecs/svq1.h +++ b/video/codecs/svq1.h @@ -25,6 +25,12 @@ #include "video/codecs/codec.h" +namespace Common { +class BitStream; +class Huffman; +class Point; +} + namespace Video { class SVQ1Decoder : public Codec { @@ -40,6 +46,24 @@ private: byte *_current[3]; byte *_last[3]; + + Common::Huffman *_blockType; + Common::Huffman *_intraMultistage[6]; + Common::Huffman *_interMultistage[6]; + Common::Huffman *_intraMean; + Common::Huffman *_interMean; + Common::Huffman *_motionComponent; + + int svq1DecodeBlockIntra(Common::BitStream *s, uint8 *pixels, int pitch); + int svq1DecodeBlockNonIntra(Common::BitStream *s, uint8 *pixels, int pitch); + int svq1DecodeMotionVector(Common::BitStream *s, Common::Point *mv, Common::Point **pmv); + void svq1SkipBlock(uint8 *current, uint8 *previous, int pitch, int x, int y); + int svq1MotionInterBlock(Common::BitStream *ss, uint8 *current, uint8 *previous, int pitch, + Common::Point *motion, int x, int y); + int svq1MotionInter4vBlock(Common::BitStream *ss, uint8 *current, uint8 *previous, int pitch, + Common::Point *motion, int x, int y); + int svq1DecodeDeltaBlock(Common::BitStream *ss, uint8 *current, uint8 *previous, int pitch, + Common::Point *motion, int x, int y); }; } // End of namespace Video |