ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-05-21 05:40:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

VIDEO: 4XM: swap bitstream LE to BE

Browse Source
This commit is contained in:
Vladimir Menshakov
2025-12-17 23:17:45 +00:00
committed by Eugene Sandulenko
parent c3321f1671
commit 82abc38095
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
video/4xm_decoder.cpp
+5 -5
View File
@@ -132,7 +132,7 @@ public:
void decode_cfrm(Common::SeekableReadStream *stream);
private:
void decode_pfrm_block(Graphics::Surface *frame, int x, int y, int log2w, int log2h, FourXM::LEWordBitStream &bitStream, Common::MemoryReadStream &wordStream, Common::MemoryReadStream &byteStream);
void decode_pfrm_block(Graphics::Surface *frame, int x, int y, int log2w, int log2h, FourXM::BEWordBitStream &bitStream, Common::MemoryReadStream &wordStream, Common::MemoryReadStream &byteStream);
Common::Rational getFrameRate() const override { return _frameRate; }
};
@@ -383,7 +383,7 @@ void mcdc(uint16_t *dst, const uint16_t *src, int log2w,
}
} // namespace
void FourXMDecoder::FourXMVideoTrack::decode_pfrm_block(Graphics::Surface *frame, int x, int y, int log2w, int log2h, FourXM::LEWordBitStream &bs, Common::MemoryReadStream &wordStream, Common::MemoryReadStream &byteStream) {
void FourXMDecoder::FourXMVideoTrack::decode_pfrm_block(Graphics::Surface *frame, int x, int y, int log2w, int log2h, FourXM::BEWordBitStream &bs, Common::MemoryReadStream &wordStream, Common::MemoryReadStream &byteStream) {
assert(log2w >= 0 && log2h >= 0);
auto index = size2index[log2h][log2w];
assert(index >= 0);
@@ -454,7 +454,7 @@ void FourXMDecoder::FourXMVideoTrack::decode_pfrm(Common::SeekableReadStream *st
Common::Array<byte> byteStreamData(byteStreamSize);
stream->read(byteStreamData.data(), byteStreamData.size());
FourXM::LEWordBitStream bitStream(reinterpret_cast<const uint32 *>(bitStreamData.data()), bitStreamData.size() / 4, 0);
FourXM::BEWordBitStream bitStream(reinterpret_cast<const uint32 *>(bitStreamData.data()), bitStreamData.size() / 4, 0);
Common::MemoryReadStream wordStream(wordStreamData.data(), wordStreamData.size());
Common::MemoryReadStream byteStream(byteStreamData.data(), byteStreamData.size());
@@ -483,8 +483,8 @@ void FourXMDecoder::FourXMVideoTrack::decode_cfrm(Common::SeekableReadStream *st
if (cframe.size() >= frameSize) {
assert(_dec->_curFrame == frameIdx);
Common::MemoryReadStream ms(cframe.data(), cframe.size());
debug("PFRAME");
Common::hexdump(cframe.data(), cframe.size());
// debug("PFRAME");
// Common::hexdump(cframe.data(), cframe.size());
// decode_pfrm(&ms);
_cframes.erase(frameIdx);
}
video/4xm_utils.cpp
+2
View File
@@ -39,6 +39,8 @@ uint HuffmanDecoder::next(BitStreamType &bs) {
}
template uint HuffmanDecoder::next(LEByteBitStream &bs);
template uint HuffmanDecoder::next(BEByteBitStream &bs);
template uint HuffmanDecoder::next(LEWordBitStream &bs);
template uint HuffmanDecoder::next(BEWordBitStream &bs);
template<typename Word>
Common::Array<byte> HuffmanDecoder::unpackStream(const byte *huff, uint huffSize, uint &offset) {
video/4xm_utils.h
+1
View File
@@ -85,6 +85,7 @@ public:
using LEByteBitStream = BitStream<byte, false>;
using BEByteBitStream = BitStream<byte, true>;
using LEWordBitStream = BitStream<uint32, false>;
using BEWordBitStream = BitStream<uint32, true>;
class HuffmanDecoder {
static constexpr uint kMaxTableSize = 514;