diff options
| author | Matthew Hoops | 2012-04-07 19:35:45 -0400 |
|---|---|---|
| committer | D G Turner | 2012-04-08 03:29:56 +0100 |
| commit | 744528cb18ef6b79703a77804acf01864aaaf39e (patch) | |
| tree | e4fd93e989541776cd008dfbcba27910d987053f /video/codecs/svq1.h | |
| parent | 8e107f8c78e9c17fd908c205c12fbb718f868648 (diff) | |
| download | scummvm-rg350-744528cb18ef6b79703a77804acf01864aaaf39e.tar.gz scummvm-rg350-744528cb18ef6b79703a77804acf01864aaaf39e.tar.bz2 scummvm-rg350-744528cb18ef6b79703a77804acf01864aaaf39e.zip | |
VIDEO: Clean up the SVQ1 code
Diffstat (limited to 'video/codecs/svq1.h')
| -rw-r--r-- | video/codecs/svq1.h | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/video/codecs/svq1.h b/video/codecs/svq1.h index 2c35f6cb46..df22d4b7de 100644 --- a/video/codecs/svq1.h +++ b/video/codecs/svq1.h @@ -55,16 +55,26 @@ private: Common::Huffman *_interMean; Common::Huffman *_motionComponent; - bool svq1DecodeBlockIntra(Common::BitStream *s, uint8 *pixels, int pitch); - bool svq1DecodeBlockNonIntra(Common::BitStream *s, uint8 *pixels, int pitch); + 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); - void svq1SkipBlock(uint8 *current, uint8 *previous, int pitch, int x, int y); - bool svq1MotionInterBlock(Common::BitStream *ss, uint8 *current, uint8 *previous, int pitch, + void svq1SkipBlock(byte *current, byte *previous, int pitch, int x, int y); + bool svq1MotionInterBlock(Common::BitStream *ss, byte *current, byte *previous, int pitch, Common::Point *motion, int x, int y); - bool svq1MotionInter4vBlock(Common::BitStream *ss, uint8 *current, uint8 *previous, int pitch, + bool svq1MotionInter4vBlock(Common::BitStream *ss, byte *current, byte *previous, int pitch, Common::Point *motion, int x, int y); - bool svq1DecodeDeltaBlock(Common::BitStream *ss, uint8 *current, uint8 *previous, int pitch, + bool svq1DecodeDeltaBlock(Common::BitStream *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); + void putPixels8L2(byte *dst, const byte *src1, const byte *src2, int dstStride, int srcStride1, int srcStride2, int h); + void putPixels8X2C(byte *block, const byte *pixels, int lineSize, int h); + void putPixels8Y2C(byte *block, const byte *pixels, int lineSize, int h); + void putPixels8XY2C(byte *block, const byte *pixels, int lineSize, int h); + void putPixels16C(byte *block, const byte *pixels, int lineSize, int h); + void putPixels16X2C(byte *block, const byte *pixels, int lineSize, int h); + void putPixels16Y2C(byte *block, const byte *pixels, int lineSize, int h); + void putPixels16XY2C(byte *block, const byte *pixels, int lineSize, int h); }; } // End of namespace Video |