rename register_all_codecs to register_all_decoders

[nihav.git] / nihav-realmedia / src / codecs / rv10.rs

diff --git a/nihav-realmedia/src/codecs/rv10.rs b/nihav-realmedia/src/codecs/rv10.rs
index dda653b490109b2d30f3c86b2ae882f4536c27c2..7c317af52db93c91fe1f30de49cdf0118f7ad1bf 100644 (file)
--- a/nihav-realmedia/src/codecs/rv10.rs
+++ b/nihav-realmedia/src/codecs/rv10.rs
@@ -158,7 +158,6 @@ impl<'a> RealVideo10BR<'a> {
         if !coded { return Ok(()); }
 
         let rl_cb = &self.tables.rl_cb; // could be aic too
-        let quant = if plane_no == 0 { quant } else { H263_CHROMA_QUANT[quant as usize] };
         let q_add = if quant == 0 { 0i16 } else { ((quant - 1) | 1) as i16 };
         let q = (quant * 2) as i16;
         while idx < 64 {
@@ -461,6 +460,12 @@ impl NADecoder for RealVideo10Decoder {
     }
 }
 
+impl NAOptionHandler for RealVideo10Decoder {
+    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<dyn NADecoder + Send> {
     Box::new(RealVideo10Decoder::new())
@@ -471,16 +476,51 @@ mod test {
     use nihav_core::codecs::RegisteredDecoders;
     use nihav_core::demuxers::RegisteredDemuxers;
     use nihav_codec_support::test::dec_video::*;
-    use crate::realmedia_register_all_codecs;
+    use crate::realmedia_register_all_decoders;
     use crate::realmedia_register_all_demuxers;
     #[test]
-    fn test_rv10() {
+    fn test_rv10_old() {
         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);
-
-        test_file_decoding("realmedia", "assets/RV/rv10_dnet_640x352_realvideo_encoder_4.0.rm", Some(1000), true, false, None/*Some("rv10")*/, &dmx_reg, &dec_reg);
+        realmedia_register_all_decoders(&mut dec_reg);
+
+        test_decoding("realmedia", "realvideo1", "assets/RV/thankyou.rm",
+                      Some(1000), &dmx_reg, &dec_reg, ExpectedTestResult::MD5Frames(vec![
+                            [0x8bba459c, 0xe6e8e01c, 0x36f90595, 0xb268adee],
+                            [0x32ca9567, 0xedc13b6f, 0xbee77cfd, 0xc7ebe24b],
+                            [0xcf1865b6, 0xea7cf1b2, 0x30a5a622, 0xe5775b0d],
+                            [0x8d984cfd, 0xcbc81a8d, 0x71d5b37a, 0x74115bba],
+                            [0x7ec2a9e8, 0x291fc62a, 0x5fc62722, 0xf2072b87],
+                            [0xa150585b, 0x9d608fe7, 0xb8d42676, 0x070103f7],
+                            [0x8aadd96f, 0xa02e0627, 0xa89e104f, 0xf47d1227],
+                            [0xa4416bb1, 0xc9ca7a61, 0xad43de90, 0x3e9ec5b7]]));
+    }
+    #[test]
+    fn test_rv10_obmc() {
+        let mut dmx_reg = RegisteredDemuxers::new();
+        realmedia_register_all_demuxers(&mut dmx_reg);
+        let mut dec_reg = RegisteredDecoders::new();
+        realmedia_register_all_decoders(&mut dec_reg);
+
+        test_decoding("realmedia", "realvideo1",
+                      "assets/RV/rv10_dnet_640x352_realvideo_encoder_4.0.rm",
+                      Some(1000), &dmx_reg, &dec_reg, ExpectedTestResult::MD5Frames(vec![
+                            [0x23599d2e, 0xf7212b24, 0x6b34b848, 0xbca84641],
+                            [0x23599d2e, 0xf7212b24, 0x6b34b848, 0xbca84641],
+                            [0x23599d2e, 0xf7212b24, 0x6b34b848, 0xbca84641],
+                            [0x23599d2e, 0xf7212b24, 0x6b34b848, 0xbca84641],
+                            [0x23599d2e, 0xf7212b24, 0x6b34b848, 0xbca84641],
+                            [0x23599d2e, 0xf7212b24, 0x6b34b848, 0xbca84641],
+                            [0x23599d2e, 0xf7212b24, 0x6b34b848, 0xbca84641],
+                            [0x23599d2e, 0xf7212b24, 0x6b34b848, 0xbca84641],
+                            [0x5cb179dc, 0x56ce9d07, 0x2439dd68, 0x80fec0bf],
+                            [0x00de945d, 0xf44b71d3, 0x1dd93df9, 0x468bdcd5],
+                            [0x7deb3aae, 0x8856c5da, 0x53011115, 0xed91377b],
+                            [0x73afc311, 0xa61d36dc, 0x4e6ba0a3, 0x6dc64514],
+                            [0xee35a8ce, 0x8edf5f32, 0x601d238f, 0xe5fa7ea7],
+                            [0xe9aeaaa9, 0x876a221b, 0xe2d70923, 0x611849fd],
+                            [0x0ff535cf, 0xf9e6ee1c, 0xed3a822c, 0x915056c0]]));
     }
 }
 
@@ -570,7 +610,7 @@ const RV10_LUMA_DC_BITS: &[u8] = &[
 ];
 
 const RV10_CHROMA_DC_CODES: &[u16] = &[
-    0x003f, 0x3f00, 0x3f01, 0x3f02, 0x3f03, 0x3f04, 0x3f05, 0x3f06,
+    0x0000, 0x3f00, 0x3f01, 0x3f02, 0x3f03, 0x3f04, 0x3f05, 0x3f06,
     0x3f07, 0x3f08, 0x3f09, 0x3f0a, 0x3f0b, 0x3f0c, 0x3f0d, 0x3f0e,
     0x3f0f, 0x3f10, 0x3f11, 0x3f12, 0x3f13, 0x3f14, 0x3f15, 0x3f16,
     0x3f17, 0x3f18, 0x3f19, 0x3f1a, 0x3f1b, 0x3f1c, 0x3f1d, 0x3f1e,
@@ -605,7 +645,7 @@ const RV10_CHROMA_DC_CODES: &[u16] = &[
 ];
 
 const RV10_CHROMA_DC_BITS: &[u8] = &[
-     7, 14, 14, 14, 14, 14, 14, 14,
+     0, 14, 14, 14, 14, 14, 14, 14,
     14, 14, 14, 14, 14, 14, 14, 14,
     14, 14, 14, 14, 14, 14, 14, 14,
     14, 14, 14, 14, 14, 14, 14, 14,