rename register_all_codecs to register_all_decoders

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

diff --git a/nihav-duck/src/codecs/vp3.rs b/nihav-duck/src/codecs/vp3.rs
index 8c72f7ff0677e540b397a9abd228aa2891b531f2..9d6ef6aff37bb321f9ef0ebc08609646630dc9dc 100644 (file)
--- a/nihav-duck/src/codecs/vp3.rs
+++ b/nihav-duck/src/codecs/vp3.rs
@@ -1,7 +1,8 @@
 use std::mem;
 use std::ptr;
 use nihav_core::codecs::*;
-use nihav_core::codecs::blockdsp::*;
+use nihav_codec_support::codecs::{MV, ZERO_MV, ZIGZAG};
+use nihav_codec_support::codecs::blockdsp::*;
 use nihav_core::io::bitreader::*;
 use nihav_core::io::codebook::*;
 use nihav_core::io::intcode::*;
@@ -167,6 +168,7 @@ impl VP40AuxCodes {
     }
 }
 
+#[allow(clippy::large_enum_variant)]
 enum Codes {
     None,
     VP30(VP30Codes),
@@ -289,7 +291,7 @@ fn vp30_read_coded_run1(br: &mut BitReader) -> DecoderResult<usize> {
     let idx                                     = br.peek(5) as usize;
     let sym = (VP30_CRUN1_LUT[idx] >> 4) as usize;
     let bits = VP30_CRUN1_LUT[idx] & 0xF;
-                                                br.skip(bits as u32)?;
+                                                br.skip(u32::from(bits))?;
     if sym < 7 {
         Ok(sym)
     } else if sym == 7 {
@@ -545,7 +547,7 @@ fn expand_token(blk: &mut Block, br: &mut BitReader, eob_run: &mut usize, token:
 macro_rules! fill_dc_pred {
     ($self: expr, $ref_id: expr, $pred: expr, $pp: expr, $bit: expr, $idx: expr) => {
         if $self.blocks[$idx].coded && $self.blocks[$idx].btype.get_ref_id() == $ref_id {
-            $pred[$bit] = $self.blocks[$idx].coeffs[0] as i32;
+            $pred[$bit] = i32::from($self.blocks[$idx].coeffs[0]);
             $pp |= 1 << $bit;
         }
     };
@@ -1132,11 +1134,11 @@ impl VP34Decoder {
                     let saddr = (self.blk_addr[cur_blk] >> 2).min(self.blk_addr[cur_blk + 1] >> 2).min(self.blk_addr[cur_blk + 2] >> 2).min(self.blk_addr[cur_blk + 3] >> 2);
                     for i in 0..4 {
                         let blk = &mut self.blocks[saddr + (i & 1) + (i >> 1) * self.mb_w * 2];
-                        blk.mv.x = br.read_cb(x_cb)? as i16;
+                        blk.mv.x = i16::from(br.read_cb(x_cb)?);
                         if x_sign {
                             blk.mv.x = -blk.mv.x;
                         }
-                        blk.mv.y = br.read_cb(y_cb)? as i16;
+                        blk.mv.y = i16::from(br.read_cb(y_cb)?);
                         if y_sign {
                             blk.mv.y = -blk.mv.y;
                         }
@@ -1154,8 +1156,8 @@ impl VP34Decoder {
                             let y_cb = &codes.mv_y_cb[VP40_MV_LUT_INDEX[last_mv.y.abs() as usize]];
                             let x_sign = last_mv.x < 0;
                             let y_sign = last_mv.y < 0;
-                            let x               = br.read_cb(x_cb)? as i16;
-                            let y               = br.read_cb(y_cb)? as i16;
+                            let x               = i16::from(br.read_cb(x_cb)?);
+                            let y               = i16::from(br.read_cb(y_cb)?);
                             cur_mv = MV { x: if !x_sign { x } else { -x }, y: if !y_sign { y } else { -y } };
                             last2_mv = last_mv;
                             last_mv = cur_mv;
@@ -1172,8 +1174,8 @@ impl VP34Decoder {
                             let y_cb = &codes.mv_y_cb[VP40_MV_LUT_INDEX[last_mv_g.y.abs() as usize]];
                             let x_sign = last_mv_g.x < 0;
                             let y_sign = last_mv_g.y < 0;
-                            let x               = br.read_cb(x_cb)? as i16;
-                            let y               = br.read_cb(y_cb)? as i16;
+                            let x               = i16::from(br.read_cb(x_cb)?);
+                            let y               = i16::from(br.read_cb(y_cb)?);
                             cur_mv = MV { x: if !x_sign { x } else { -x }, y: if !y_sign { y } else { -y } };
                             last_mv_g = cur_mv;
                         },
@@ -1449,10 +1451,10 @@ impl VP34Decoder {
         let mut pred = 0i32;
         for i in 0..4 {
             if (pp & (1 << i)) != 0 {
-                pred += (preds[i] as i32) * (VP31_DC_WEIGHTS[pp][i] as i32);
+                pred += (preds[i] as i32) * i32::from(VP31_DC_WEIGHTS[pp][i]);
             }
         }
-        pred /= VP31_DC_WEIGHTS[pp][4] as i32;
+        pred /= i32::from(VP31_DC_WEIGHTS[pp][4]);
         if (pp & 7) == 7 {
             if (pred - preds[2]).abs() > 128 { return preds[2] as i16; }
             if (pred - preds[0]).abs() > 128 { return preds[0] as i16; }
@@ -1551,6 +1553,7 @@ impl VP34Decoder {
             }
         }
     }
+    #[allow(clippy::cyclomatic_complexity)]
     fn output_blocks_inter(&mut self, frm: &mut NASimpleVideoFrame<u8>) {
         let mut blk_idx = 0;
         let bstride = self.mb_w * 2;
@@ -1863,6 +1866,12 @@ impl NADecoder for VP34Decoder {
     }
 }
 
+impl NAOptionHandler for VP34Decoder {
+    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_vp3() -> Box<NADecoder + Send> {
     Box::new(VP34Decoder::new(3))
 }
@@ -1875,16 +1884,16 @@ pub fn get_decoder_vp4() -> Box<NADecoder + Send> {
 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_vp30() {
         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);
 
         test_decoding("avi", "vp3", "assets/Duck/vp30-logo.avi", Some(23), &dmx_reg, &dec_reg,
                       ExpectedTestResult::MD5([0x51aba7df, 0x6e42534d, 0xef6c5b13, 0x26c38d1f]));
@@ -1895,7 +1904,7 @@ mod test {
         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/vp31.avi";
 //        let file = "assets/Duck/vp31_crash.avi";
@@ -1911,7 +1920,7 @@ mod test {
         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);
 
         test_decoding("avi", "vp3", "assets/Duck/ot171_vp40.avi", Some(86), &dmx_reg, &dec_reg,
                       ExpectedTestResult::MD5([0xd41d8cd9, 0x8f00b204, 0xe9800998, 0xecf8427e]));