X-Git-Url: https://git.nihav.org/?p=nihav.git;a=blobdiff_plain;f=nihav-indeo%2Fsrc%2Fcodecs%2Findeo4.rs;h=474a8d5c7b159a21f620d7df5520d9b4cdc097da;hp=15cae6d2ad2eb80bfd33849979b627eb592d80f5;hb=78fb6560c73965d834b215fb0b49505ae5443288;hpb=64e8b9711a54641d4155d01f095053233c79a9bf

diff --git a/nihav-indeo/src/codecs/indeo4.rs b/nihav-indeo/src/codecs/indeo4.rs
index 15cae6d..474a8d5 100644
--- a/nihav-indeo/src/codecs/indeo4.rs
+++ b/nihav-indeo/src/codecs/indeo4.rs
@@ -2,6 +2,7 @@ use nihav_core::io::bitreader::*;
 use nihav_core::formats;
 use nihav_core::frame::*;
 use nihav_core::codecs::*;
+use nihav_codec_support::codecs::ZIGZAG;
 use super::ivi::*;
 use super::ivibr::*;
 
@@ -227,7 +228,7 @@ impl IndeoXParser for Indeo4Parser {
         Ok(BandHeader::new(plane_no, band_no, mb_size, blk_size, mv_mode == 1, inherit_mv, false, inherit_qd, quant, rvmap_idx, num_corr, corr_map, blk_cb, tr, txtype))
     }
 
-    fn decode_mb_info(&mut self, br: &mut BitReader, pic_hdr: &PictureHeader, band: &BandHeader, tile: &mut IVITile, ref_tile: Option<Ref<IVITile>>, mv_scale: u8) -> DecoderResult<()> {
+    fn decode_mb_info(&mut self, br: &mut BitReader, pic_hdr: &PictureHeader, band: &BandHeader, tile: &mut IVITile, ref_tile: Option<&IVITile>, mv_scale: u8) -> DecoderResult<()> {
         let mut mv_x = 0;
         let mut mv_y = 0;
         let mut mb_idx = 0;
@@ -446,7 +447,7 @@ impl NADecoder for Indeo4Decoder {
     }
     fn decode(&mut self, _supp: &mut NADecoderSupport, pkt: &NAPacket) -> DecoderResult<NAFrameRef> {
         let src = pkt.get_buffer();
-        let mut br = BitReader::new(src.as_slice(), src.len(), BitReaderMode::LE);
+        let mut br = BitReader::new(src.as_slice(), BitReaderMode::LE);
 
         let mut ip = Indeo4Parser::new();
         let bufinfo = self.dec.decode_frame(&mut ip, &mut br)?;
@@ -455,6 +456,15 @@ impl NADecoder for Indeo4Decoder {
         frm.set_frame_type(self.dec.get_frame_type());
         Ok(frm.into_ref())
     }
+    fn flush(&mut self) {
+        self.dec.flush();
+    }
+}
+
+impl NAOptionHandler for Indeo4Decoder {
+    fn get_supported_options(&self) -> &[NAOptionDefinition] { &[] }
+    fn set_options(&mut self, _options: &[NAOption]) { }
+    fn query_option_value(&self, _name: &str) -> Option<NAValue> { None }
 }
 
 const INDEO4_PICTURE_SIZE_TAB: [[usize; 2]; 7] = [
@@ -758,7 +768,7 @@ const INDEO4_Q4_INTER: [&[u16; 16]; 5] = [
     &INDEO4_QUANT4X4_INTER[3], &INDEO4_QUANT4X4_INTER[4]
 ];
 
-pub fn get_decoder() -> Box<dyn NADecoder> {
+pub fn get_decoder() -> Box<dyn NADecoder + Send> {
     Box::new(Indeo4Decoder::new())
 }
 
@@ -766,17 +776,45 @@ pub fn get_decoder() -> Box<dyn NADecoder> {
 mod test {
     use nihav_core::codecs::RegisteredDecoders;
     use nihav_core::demuxers::RegisteredDemuxers;
-    use nihav_core::test::dec_video::*;
-    use crate::codecs::indeo_register_all_codecs;
-    use nihav_commonfmt::demuxers::generic_register_all_demuxers;
+    use nihav_codec_support::test::dec_video::*;
+    use crate::indeo_register_all_decoders;
+    use nihav_commonfmt::generic_register_all_demuxers;
     #[test]
     fn test_indeo4() {
         let mut dmx_reg = RegisteredDemuxers::new();
         generic_register_all_demuxers(&mut dmx_reg);
         let mut dec_reg = RegisteredDecoders::new();
-        indeo_register_all_codecs(&mut dec_reg);
-
-        test_file_decoding("avi", "assets/Indeo/IV4/volcano.avi", /*None*/Some(16), true, false, None/*Some("iv4")*/, &dmx_reg, &dec_reg);
-//panic!("the end");
+        indeo_register_all_decoders(&mut dec_reg);
+
+        test_decoding("avi", "indeo4", "assets/Indeo/IV4/volcano.avi", Some(16),
+                      &dmx_reg, &dec_reg, ExpectedTestResult::MD5Frames(vec![
+                            [0x194f626b, 0x023fdfd0, 0x9809665a, 0xd68f6f47],
+                            [0x194f626b, 0x023fdfd0, 0x9809665a, 0xd68f6f47],
+                            [0x194f626b, 0x023fdfd0, 0x9809665a, 0xd68f6f47],
+                            [0x194f626b, 0x023fdfd0, 0x9809665a, 0xd68f6f47],
+                            [0x46c6719d, 0xe6415ac0, 0x3e4d9799, 0xd2f5747d],
+                            [0xe0278b0f, 0x3e4763d5, 0x88033344, 0xc9c2e6de],
+                            [0xd962be7f, 0xafc1ac64, 0x0647cdcc, 0xd06465c6],
+                            [0xedef0e19, 0xec75eed2, 0x955a2ae2, 0xd6145b4c],
+                            [0x89ec8d4b, 0x3d446d74, 0xbd3d681d, 0x2d219dca],
+                            [0x89e81643, 0x77fb2f1b, 0x2aa0782f, 0xb1b9b7ef],
+                            [0xea283aec, 0x94d7cdf9, 0x961bbb69, 0x2b38162a],
+                            [0x1d1b315c, 0x6613c5fa, 0xeff36485, 0x5025fbf2],
+                            [0x4145c6a8, 0xd8d513b1, 0x34a5d353, 0x07750cd5],
+                            [0xace12feb, 0x468754f3, 0xa72327f5, 0x1a6f6350],
+                            [0x4b04dc0e, 0x684533a7, 0x6a4e4b16, 0x0b8a5e68],
+                            [0xa3eb64fc, 0x5e02a31b, 0x6b484eae, 0xbb6e6c49],
+                            [0x7d4ef46e, 0x6761c447, 0x02e002f5, 0x02d0231c]]));
+        test_decoding("avi", "indeo4", "assets/Indeo/IV4/HRLDVIK.AVI", Some(8),
+                      &dmx_reg, &dec_reg, ExpectedTestResult::MD5Frames(vec![
+                            [0x239b8b87, 0x6dbec08c, 0x82bae1f0, 0x868e00c2],
+                            [0xe2298beb, 0x4e08866d, 0x00cb6201, 0x6b0a6df3],
+                            [0x9d7f4cf0, 0xed33df12, 0x2677be16, 0xce7e99b0],
+                            [0x0c8d7489, 0x2b3ac56e, 0x36d75559, 0x70550903],
+                            [0xc32b4b78, 0x2fc81737, 0xe4d7722b, 0xbcbbb35e],
+                            [0x20bfd5e8, 0x6cfad540, 0xfc6c6b6c, 0xa4f39a7d],
+                            [0xc327428d, 0x4e817b56, 0x4376eba2, 0xebafd04a],
+                            [0x6a53a6ec, 0x7477a471, 0xd55bc98e, 0x7498de0f],
+                            [0x398eba3a, 0x3cf3cce1, 0x90211dfe, 0x82c906f0]]));
     }
 }