X-Git-Url: https://git.nihav.org/?p=nihav.git;a=blobdiff_plain;f=nihav-realmedia%2Fsrc%2Fcodecs%2Frv40.rs;h=bcd600b83dba6a1ae98f1b05ae636f094eec764d;hp=272226d3d73c6b2955d361fc07ef9c407c30fd27;hb=78fb6560c73965d834b215fb0b49505ae5443288;hpb=3c69ce1b2da6d6c9d1fa9962616f4e4e8d1d06df

diff --git a/nihav-realmedia/src/codecs/rv40.rs b/nihav-realmedia/src/codecs/rv40.rs
index 272226d..bcd600b 100644
--- a/nihav-realmedia/src/codecs/rv40.rs
+++ b/nihav-realmedia/src/codecs/rv40.rs
@@ -4,6 +4,7 @@ use nihav_core::io::bitreader::*;
 use nihav_core::io::codebook::*;
 use nihav_core::io::intcode::*;
 use nihav_core::codecs::*;
+use nihav_codec_support::codecs::{MV, ZERO_MV};
 use super::rv3040::*;
 use super::rv40dsp::*;
 
@@ -97,15 +98,15 @@ impl RealVideo40BR {
         RealVideo40BR {
             width:          0,
             height:         0,
-            aic_top_cb:     aic_top_cb,
-            aic_mode1_cb:   aic_mode1_cb,
-            aic_mode2_cb:   aic_mode2_cb,
-            ptype_cb:       ptype_cb,
-            btype_cb:       btype_cb,
+            aic_top_cb,
+            aic_mode1_cb,
+            aic_mode2_cb,
+            ptype_cb,
+            btype_cb,
             had_skip_run:   false,
         }
     }
-    fn predict_b_mv_component(&self, sstate: &SState, mvi: &MVInfo, mbinfo: &Vec<RV34MBInfo>, mbtype: MBType, fwd: bool) -> MV {
+    fn predict_b_mv_component(&self, sstate: &SState, mvi: &MVInfo, mbinfo: &[RV34MBInfo], mbtype: MBType, fwd: bool) -> MV {
         let mut pred_mvs: [MV; 3] = [ZERO_MV; 3];
         let mut mv_count: usize = 0;
         let mb_x = sstate.mb_x;
@@ -192,7 +193,7 @@ impl RV34BitstreamDecoder for RealVideo40BR {
 
         self.had_skip_run = false;
 
-        Ok(RV34SliceHeader{ ftype: ftype, quant: q, deblock: deblock, pts: pts, width: w, height: h, start: start, end: 0, set_idx: set_idx })
+        Ok(RV34SliceHeader{ ftype, quant: q, deblock, pts, width: w, height: h, start, end: 0, set_idx })
     }
     fn decode_intra_pred(&mut self, br: &mut BitReader, types: &mut [i8], mut pos: usize, tstride: usize, has_top: bool) -> DecoderResult<()> {
         let start;
@@ -276,9 +277,9 @@ impl RV34BitstreamDecoder for RealVideo40BR {
             mbtype = if ftype == FrameType::P { br.read_cb(&self.ptype_cb[idx])? }
                      else { br.read_cb(&self.btype_cb[idx])? };
         }
-        Ok(MBInfo { mbtype: mbtype, skip_run: 0, dquant: dquant })
+        Ok(MBInfo { mbtype, skip_run: 0, dquant })
     }
-    fn predict_b_mv(&self, sstate: &SState, mvi: &MVInfo, mbtype: MBType, mvs: &[MV], mbinfo: &Vec<RV34MBInfo>) -> (MV, MV) {
+    fn predict_b_mv(&self, sstate: &SState, mvi: &MVInfo, mbtype: MBType, mvs: &[MV], mbinfo: &[RV34MBInfo]) -> (MV, MV) {
         let mut mv_f = self.predict_b_mv_component(sstate, mvi, mbinfo, mbtype, true);
         let mut mv_b = self.predict_b_mv_component(sstate, mvi, mbinfo, mbtype, false);
 
@@ -325,7 +326,7 @@ impl NADecoder for RealVideo40Decoder {
 
 {
 println!("edata:");
-for i in 0..src.len() { print!(" {:02X}", src[i]); } println!("");
+for i in 0..src.len() { print!(" {:02X}", src[i]); } println!();
 }
             if src.len() < 2 { return Err(DecoderError::InvalidData); }
 
@@ -352,9 +353,18 @@ println!("???");
         frm.set_pts(Some(ts));
         Ok(frm.into_ref())
     }
+    fn flush(&mut self) {
+        self.dec.flush();
+    }
+}
+
+impl NAOptionHandler for RealVideo40Decoder {
+    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<dyn NADecoder + Send> {
     Box::new(RealVideo40Decoder::new())
 }
 
@@ -362,20 +372,36 @@ 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::realmedia_register_all_codecs;
-    use crate::demuxers::realmedia_register_all_demuxers;
+    use nihav_codec_support::test::dec_video::*;
+    use crate::realmedia_register_all_decoders;
+    use crate::realmedia_register_all_demuxers;
     #[test]
     fn test_rv40() {
         let mut dmx_reg = RegisteredDemuxers::new();
         realmedia_register_all_demuxers(&mut dmx_reg);
         let mut dec_reg = RegisteredDecoders::new();
-        realmedia_register_all_codecs(&mut dec_reg);
+        realmedia_register_all_decoders(&mut dec_reg);
 
-//         test_file_decoding("realmedia", "assets/RV/rv40_ralf.rmvb", Some(1000), true, false, /*None*/Some("rv40"));
-        test_file_decoding("realmedia", "assets/RV/rv40_weighted_mc.rmvb", Some(400), true, false, None/*Some("rv40")*/, &dmx_reg, &dec_reg);
-//         test_file_decoding("realmedia", "assets/RV/rv40_weighted_mc_2.rmvb", Some(1000), true, false, /*None*/Some("rv40"));
-//panic!("end");
+        test_decoding("realmedia", "realvideo4", "assets/RV/rv40_weighted_mc.rmvb", Some(1500),
+                      &dmx_reg, &dec_reg,ExpectedTestResult::MD5Frames(vec![
+                            [0x27cf336a, 0xc1686c50, 0x5304783d, 0x6e77ffa2],
+                            [0x91f236c7, 0x3bda2d38, 0x961a0243, 0xda803cf1],
+                            [0x4075d7e8, 0xbcd7f85b, 0x1c0dd34b, 0x405d0a5d],
+                            [0x642498b7, 0xb57aa202, 0x69ea0d23, 0x1cc0794f],
+                            [0x1c1a4df8, 0x7e3fbd7d, 0x7fdeb57f, 0xf5d65179],
+                            [0x86a5dcdd, 0xd66caabf, 0xdfe1fc99, 0xb3443375],
+                            [0x86846664, 0xbee4268d, 0xc1e017e6, 0xc9d984c8],
+                            [0x0ecbe176, 0x81e5aca6, 0xb7bda49c, 0x34007e7b],
+                            [0x48c8a90e, 0xed003b8a, 0xc9e7e9a6, 0x54b1eca8],
+                            [0x540cbc0b, 0x6d7afaa8, 0xb0951c1f, 0xed22089e],
+                            [0x73190f85, 0x9cd72603, 0x1063ca54, 0xd4f82c7f],
+                            [0xef6206e8, 0x6affb292, 0xe12b7c9c, 0x37416240],
+                            [0x59f61c91, 0x66b2a632, 0x46556395, 0x74fbc1de],
+                            [0xd75635ca, 0x60d13826, 0xfa41d914, 0x9cfded0e],
+                            [0x7a8c4396, 0x6f3eda39, 0x4238dbaf, 0xa9052803]]));
+        test_decoding("realmedia", "realvideo4", "assets/RV/rv40_weighted_mc_2.rmvb", Some(2000),
+                      &dmx_reg, &dec_reg,
+                      ExpectedTestResult::MD5([0x4224b9d6, 0x32e3ff63, 0x02df9e60, 0xfa0548ee]));
     }
 }