diff options
Diffstat (limited to 'video/psx_decoder.h')
| -rw-r--r-- | video/psx_decoder.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/video/psx_decoder.h b/video/psx_decoder.h index b19bd72fa0..fa36af1bb3 100644 --- a/video/psx_decoder.h +++ b/video/psx_decoder.h @@ -23,6 +23,7 @@ #ifndef VIDEO_PSX_DECODER_H #define VIDEO_PSX_DECODER_H +#include "common/bitstream.h" #include "common/endian.h" #include "common/rational.h" #include "common/rect.h" @@ -35,7 +36,6 @@ class QueuingAudioStream; } namespace Common { -class BitStream; class Huffman; class SeekableReadStream; } @@ -108,19 +108,19 @@ private: uint16 _macroBlocksW, _macroBlocksH; byte *_yBuffer, *_cbBuffer, *_crBuffer; - void decodeMacroBlock(Common::BitStream *bits, int mbX, int mbY, uint16 scale, uint16 version); - void decodeBlock(Common::BitStream *bits, byte *block, int pitch, uint16 scale, uint16 version, PlaneType plane); + void decodeMacroBlock(Common::BitStream16LEMSB *bits, int mbX, int mbY, uint16 scale, uint16 version); + void decodeBlock(Common::BitStream16LEMSB *bits, byte *block, int pitch, uint16 scale, uint16 version, PlaneType plane); - void readAC(Common::BitStream *bits, int *block); + void readAC(Common::BitStream16LEMSB *bits, int *block); Common::Huffman *_acHuffman; - int readDC(Common::BitStream *bits, uint16 version, PlaneType plane); + int readDC(Common::BitStream16LEMSB *bits, uint16 version, PlaneType plane); Common::Huffman *_dcHuffmanLuma, *_dcHuffmanChroma; int _lastDC[3]; void dequantizeBlock(int *coefficients, float *block, uint16 scale); void idct(float *dequantData, float *result); - int readSignedCoefficient(Common::BitStream *bits); + int readSignedCoefficient(Common::BitStream16LEMSB *bits); }; class PSXAudioTrack : public AudioTrack { |