rv10: use OBMC if the codec flavour requires it

[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 0e2ad986f828a7aa83e003db26e98668e887c1c7..7cfc4c360a2d8277a8cae02e9bfc47229700a15f 100644 (file)
--- a/nihav-realmedia/src/codecs/rv10.rs
+++ b/nihav-realmedia/src/codecs/rv10.rs
@@ -158,6 +158,7 @@ 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 {
@@ -170,7 +171,11 @@ impl<'a> RealVideo10BR<'a> {
                 level = code.get_level();
                 last  = code.is_last();
                 if br.read_bool()? { level = -level; }
-                level = (level * q) + q_add;
+                if level >= 0 {
+                    level = (level * q) + q_add;
+                } else {
+                    level = (level * q) - q_add;
+                }
             } else {
                 last  = br.read_bool()?;
                 run   = br.read(6)? as u8;
@@ -180,7 +185,11 @@ impl<'a> RealVideo10BR<'a> {
                     let top = br.read_s(6)? as i16;
                     level = (top << 5) | low;
                 }
-                level = (level * q) + q_add;
+                if level >= 0 {
+                    level = (level * q) + q_add;
+                } else {
+                    level = (level * q) - q_add;
+                }
                 if level < -2048 { level = -2048; }
                 if level >  2047 { level =  2047; }
             }
@@ -392,7 +401,7 @@ impl RealVideo10Decoder {
 
         RealVideo10Decoder{
             info:           NACodecInfoRef::default(),
-            dec:            H263BaseDecoder::new_with_opts(false, false, false),
+            dec:            H263BaseDecoder::new_with_opts(0),
             tables,
             w:              0,
             h:              0,
@@ -422,6 +431,9 @@ impl NADecoder for RealVideo10Decoder {
 println!("ver {:06X} -> {}", ver, mic_ver);
             validate!(maj_ver == 1);
             self.new_ver = mic_ver > 1;
+            if mic_ver == 2 {
+                self.dec = H263BaseDecoder::new_with_opts(H263DEC_OPT_HAS_OBMC);
+            }
             if (src[3] & 1) != 0 {
                 self.mvmode = MVMode::UMV;
             }
@@ -464,7 +476,7 @@ pub fn get_decoder() -> Box<dyn NADecoder + Send> {
 mod test {
     use nihav_core::codecs::RegisteredDecoders;
     use nihav_core::demuxers::RegisteredDemuxers;
-    use nihav_core::test::dec_video::*;
+    use nihav_codec_support::test::dec_video::*;
     use crate::realmedia_register_all_codecs;
     use crate::realmedia_register_all_demuxers;
     #[test]