}
let is_intra = (src[off] & 2) == 2;
- let mut br = BitReader::new(&src[(off + 1)..], src.len() - (off + 1), BitReaderMode::BE);
+ let mut br = BitReader::new(&src[(off + 1)..], BitReaderMode::BE);
let vinfo = self.info.get_properties().get_video_info().unwrap();
let bufinfo = alloc_video_buffer(vinfo, self.tsize)?;
self.decode_frame_intra(&mut br, &mut buf, vinfo.get_width(), vinfo.get_height())?;
extend_edges(&mut buf, 1 << self.tsize);
} else {
- let mut prev = self.frmmgr.clone_ref().unwrap();
+ let pref = self.frmmgr.clone_ref();
+ if pref.is_none() { return Err(DecoderError::MissingReference); }
+ let mut prev = pref.unwrap();
extend_edges(&mut prev, 1 << self.tsize);
self.decode_frame_inter(&mut br, &mut buf, &mut prev, vinfo.get_width(), vinfo.get_height())?;
extend_edges(&mut buf, 1 << self.tsize);
}
Ok(frm.into_ref())
}
+ fn flush(&mut self) {
+ self.frmmgr.clear();
+ }
}
-pub fn get_decoder() -> Box<dyn NADecoder> {
+pub fn get_decoder() -> Box<dyn NADecoder + Send> {
Box::new(ClearVideoDecoder::new(false))
}
-pub fn get_decoder_rm() -> Box<dyn NADecoder> {
+pub fn get_decoder_rm() -> Box<dyn NADecoder + Send> {
Box::new(ClearVideoDecoder::new(true))
}
mod test {
use nihav_core::codecs::RegisteredDecoders;
use nihav_core::demuxers::RegisteredDemuxers;
- use nihav_core::test::dec_video::test_file_decoding;
+ use nihav_core::test::dec_video::*;
use crate::codecs::generic_register_all_codecs;
use crate::demuxers::generic_register_all_demuxers;
#[test]
generic_register_all_demuxers(&mut dmx_reg);
let mut dec_reg = RegisteredDecoders::new();
generic_register_all_codecs(&mut dec_reg);
- test_file_decoding("avi", "assets/Misc/TalkingHead_352x288.avi", Some(10), true, false, None/*Some("clv")*/, &dmx_reg, &dec_reg);
-// test_file_decoding("avi", "assets/Misc/basketball.avi", None/*Some(10)*/, true, false, Some("clv1"));
-//panic!("debug");
+ test_decoding("avi", "clearvideo", "assets/Misc/TalkingHead_352x288.avi", Some(10), &dmx_reg,
+ &dec_reg, ExpectedTestResult::MD5Frames(vec![
+ [0xb432376c, 0xf1dce57b, 0x8e79c7ee, 0xdd51850d],
+ [0x76eb9726, 0x7ca1aabd, 0xf3f0740c, 0xf804dd0e],
+ [0xc639b32c, 0x1f53f1f4, 0x50c34651, 0xc49cd2ac],
+ [0x55408f2a, 0x37b01de0, 0xcc6aeadd, 0x09768735],
+ [0xea219c51, 0xed72710c, 0x6c4b2bb0, 0xbfab0cb7],
+ [0xfbf56708, 0x7f6597c7, 0x08ce894d, 0x9c4c7f60],
+ [0x3dbf8b57, 0x9e1513ef, 0x209309a6, 0x56f0aca7],
+ [0xc5fb6cb7, 0x1b9b092f, 0xe11127be, 0xe4fe8f45],
+ [0x81a4a122, 0xb2b84bcf, 0xa478bd80, 0x12c78fb6],
+ [0xb5b43c22, 0xd9c457fa, 0xcc5390d8, 0x1201ef22],
+ [0x27a206e9, 0x88085556, 0x1114fb62, 0x77f1ebed]]));
}
}
const CLV_AC_ESCAPE: u16 = 0x1BFF;
-const ZIGZAG: &[usize] = &[
- 0, 1, 8, 16, 9, 2, 3, 10,
- 17, 24, 32, 25, 18, 11, 4, 5,
- 12, 19, 26, 33, 40, 48, 41, 34,
- 27, 20, 13, 6, 7, 14, 21, 28,
- 35, 42, 49, 56, 57, 50, 43, 36,
- 29, 22, 15, 23, 30, 37, 44, 51,
- 58, 59, 52, 45, 38, 31, 39, 46,
- 53, 60, 61, 54, 47, 55, 62, 63
-];
-
const CLV_BIAS_ESCAPE: u16 = 0x100;
const CLV_MVY_0_BITS: &[u8] = &[