rename register_all_codecs to register_all_decoders

[nihav.git] / nihav-duck / src / codecs / vp5.rs

diff --git a/nihav-duck/src/codecs/vp5.rs b/nihav-duck/src/codecs/vp5.rs
index abfd4d0af88b73a1c77c2361e55c6d000fd3f9c2..70c26c6fa77d57f734abb21edb59839f3d0da9c2 100644 (file)
--- a/nihav-duck/src/codecs/vp5.rs
+++ b/nihav-duck/src/codecs/vp5.rs
@@ -1,5 +1,6 @@
 use nihav_core::codecs::*;
 use nihav_core::io::bitreader::*;
+use nihav_codec_support::codecs::{MV, ZIGZAG};
 use super::vpcommon::*;
 use super::vp56::*;
 
@@ -32,7 +33,7 @@ impl VP56Parser for VP5BR {
             validate!((hdr.disp_w <= hdr.mb_w) && (hdr.disp_h <= hdr.mb_h));
             hdr.scale                           = bc.read_bits(2) as u8;
         }
-        
+
         Ok(hdr)
     }
     fn decode_mv(&self, bc: &mut BoolCoder, model: &VP56MVModel) -> i16 {
@@ -192,7 +193,7 @@ impl VP56Parser for VP5BR {
             if idx > 0 {
                 coeffs[ZIGZAG[idx]] *= fstate.ac_quant;
             }
-            
+
             idx += 1;
             if idx >= 64 {
                 break;
@@ -219,11 +220,16 @@ impl VP56Parser for VP5BR {
     }
     fn mc_block(&self, dst: &mut NASimpleVideoFrame<u8>, mc_buf: NAVideoBufferRef<u8>, src: NAVideoBufferRef<u8>, plane: usize, x: usize, y: usize, mv: MV, loop_str: i16) {
         let (sx, sy, mx, my) = if (plane != 1) && (plane != 2) {
-                (mv.x / 2, mv.y / 2, mv.x & 1, mv.y & 1)
+                (mv.x >> 1, mv.y >> 1, mv.x & 1, mv.y & 1)
+            } else {
+                (mv.x >> 2, mv.y >> 2, if (mv.x & 3) != 0 { 1 } else { 0 }, if (mv.y & 3) != 0 { 1 } else { 0 })
+            };
+        let mode1 = (mx as usize) + (my as usize) * 2;
+        let mode = if (mode1 == 3) && (mv.x ^ mv.y < 0) {
+                4
             } else {
-                (mv.x / 4, mv.y / 4, (mv.x >> 1) & 1, (mv.y >> 1) & 1)
+                mode1
             };
-        let mode = (mx as usize) + (my as usize) * 2;
         vp_copy_block(dst, src, plane, x, y, sx, sy, 0, 1, loop_str,
                       mode, VP3_INTERP_FUNCS, mc_buf);
     }
@@ -249,7 +255,7 @@ impl NADecoder for VP5Decoder {
     fn init(&mut self, supp: &mut NADecoderSupport, info: NACodecInfoRef) -> DecoderResult<()> {
         if let NACodecTypeInfo::Video(vinfo) = info.get_properties() {
             let myvinfo = NAVideoInfo::new(vinfo.get_width(), vinfo.get_height(), false, YUV420_FORMAT);
-            let myinfo = NACodecTypeInfo::Video(myvinfo.clone());
+            let myinfo = NACodecTypeInfo::Video(myvinfo);
             self.info = NACodecInfo::new_ref(info.get_name(), myinfo, info.get_extradata()).into_ref();
             self.dec.init(supp, myvinfo)?;
             Ok(())
@@ -267,9 +273,18 @@ impl NADecoder for VP5Decoder {
         frm.set_frame_type(ftype);
         Ok(frm.into_ref())
     }
+    fn flush(&mut self) {
+        self.dec.flush();
+    }
+}
+
+impl NAOptionHandler for VP5Decoder {
+    fn get_supported_options(&self) -> &[NAOptionDefinition] { &[] }
+    fn set_options(&mut self, _options: &[NAOption]) { }
+    fn query_option_value(&self, _name: &str) -> Option<NAValue> { None }
 }
 
-pub fn get_decoder() -> Box<NADecoder> {
+pub fn get_decoder() -> Box<NADecoder + Send> {
     Box::new(VP5Decoder::new())
 }
 
@@ -277,21 +292,21 @@ pub fn get_decoder() -> Box<NADecoder> {
 mod test {
     use nihav_core::codecs::RegisteredDecoders;
     use nihav_core::demuxers::RegisteredDemuxers;
-    use nihav_core::test::dec_video::*;
-    use crate::codecs::duck_register_all_codecs;
-    use nihav_commonfmt::demuxers::generic_register_all_demuxers;
+    use nihav_codec_support::test::dec_video::*;
+    use crate::duck_register_all_decoders;
+    use nihav_commonfmt::generic_register_all_demuxers;
 
     #[test]
     fn test_vp5() {
         let mut dmx_reg = RegisteredDemuxers::new();
         generic_register_all_demuxers(&mut dmx_reg);
         let mut dec_reg = RegisteredDecoders::new();
-        duck_register_all_codecs(&mut dec_reg);
+        duck_register_all_decoders(&mut dec_reg);
 
         let file = "assets/Duck/Cell-140.vp5";
         //let file = "assets/Duck/Chocolat-500.vp5";
-        test_file_decoding("avi", file, Some(13), true, false, None/*Some("vp5")*/, &dmx_reg, &dec_reg);
-//panic!("end");
+        test_decoding("avi", "vp5", file, Some(96), &dmx_reg, &dec_reg,
+                      ExpectedTestResult::MD5([0x9ad78b0f, 0xed988ead, 0x88ed2ea9, 0xcdb75cdf]));
     }
 }