Err(DecoderError::InvalidData)
}
}
- #[allow(clippy::cyclomatic_complexity)]
+ #[allow(clippy::cognitive_complexity)]
fn decode(&mut self, _supp: &mut NADecoderSupport, pkt: &NAPacket) -> DecoderResult<NAFrameRef> {
let src = pkt.get_buffer();
validate!(src.len() >= 2);
let mut mr = MemoryReader::new_read(src.as_slice());
let mut br = ByteReader::new(&mut mr);
- let id = br.read_byte()?;
- validate!(id == 0x80);
+ let _flags = br.read_byte()?;
let length = br.read_u24be()? as usize;
validate!(length == src.len());
llblock = lblock;
},
2 => {
- for i in 0..len {
+ validate!(blockpos + len * 2 <= nblocks);
+ for i in 0..len*2 {
if (i & 1) == 0 {
Self::put_block(&mut frm.data[doff + x..], stride, &llblock);
} else {
doff += stride * 4;
}
}
+ blockpos += len;
},
3 => {
let clr = br.read_byte()?;
use nihav_core::codecs::RegisteredDecoders;
use nihav_core::demuxers::RegisteredDemuxers;
use nihav_codec_support::test::dec_video::*;
- use crate::qt_register_all_codecs;
+ use crate::qt_register_all_decoders;
use nihav_commonfmt::generic_register_all_demuxers;
+ // samples from https://samples.mplayerhq.hu/V-codecs/SMC
#[test]
fn test_smc() {
let mut dmx_reg = RegisteredDemuxers::new();
generic_register_all_demuxers(&mut dmx_reg);
let mut dec_reg = RegisteredDecoders::new();
- qt_register_all_codecs(&mut dec_reg);
+ qt_register_all_decoders(&mut dec_reg);
test_decoding("mov", "qt-smc", "assets/QT/aletrek-smc.mov", Some(6), &dmx_reg, &dec_reg,
ExpectedTestResult::MD5Frames(vec![
let mut dmx_reg = RegisteredDemuxers::new();
generic_register_all_demuxers(&mut dmx_reg);
let mut dec_reg = RegisteredDecoders::new();
- qt_register_all_codecs(&mut dec_reg);
+ qt_register_all_decoders(&mut dec_reg);
test_decoding("mov", "qt-smc", "assets/QT/aletrek-smc-gray.mov", Some(6), &dmx_reg, &dec_reg,
ExpectedTestResult::MD5Frames(vec![