X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-realmedia%2Fsrc%2Fcodecs%2Frv10.rs;h=7cfc4c360a2d8277a8cae02e9bfc47229700a15f;hb=c8cbb04cc2cb7f0de033580807b001772fdb4feb;hp=4b75a4035e95798ce706630e7b6e97e090875edb;hpb=e07387c7f125550a41faf36a509b252cf71d7f9a;p=nihav.git

diff --git a/nihav-realmedia/src/codecs/rv10.rs b/nihav-realmedia/src/codecs/rv10.rs
index 4b75a40..7cfc4c3 100644
--- a/nihav-realmedia/src/codecs/rv10.rs
+++ b/nihav-realmedia/src/codecs/rv10.rs
@@ -3,10 +3,11 @@ use nihav_core::io::codebook::*;
 use nihav_core::formats;
 use nihav_core::frame::*;
 use nihav_core::codecs::*;
-use nihav_core::codecs::h263::*;
-use nihav_core::codecs::h263::code::H263BlockDSP;
-use nihav_core::codecs::h263::decoder::*;
-use nihav_core::codecs::h263::data::*;
+use nihav_codec_support::codecs::{MV, ZIGZAG};
+use nihav_codec_support::codecs::h263::*;
+use nihav_codec_support::codecs::h263::code::H263BlockDSP;
+use nihav_codec_support::codecs::h263::decoder::*;
+use nihav_codec_support::codecs::h263::data::*;
 
 #[allow(dead_code)]
 struct Tables {
@@ -67,7 +68,7 @@ impl<'a> RealVideo10BR<'a> {
         let mut slice_offs = Vec::with_capacity(nslices);
         {
             let offs = &src[1..][..nslices * 8];
-            let mut br = BitReader::new(offs, offs.len(), BitReaderMode::BE);
+            let mut br = BitReader::new(offs, BitReaderMode::BE);
             for _ in 0..nslices {
                 br.skip(32).unwrap();
                 let off = br.read(32).unwrap();
@@ -76,7 +77,7 @@ impl<'a> RealVideo10BR<'a> {
         }
         let soff = nslices * 8 + 1;
         RealVideo10BR {
-            br:         BitReader::new(&src[soff..], src.len() - soff, BitReaderMode::BE),
+            br:         BitReader::new(&src[soff..], BitReaderMode::BE),
             tables,
             num_slices: nslices,
             slice_no:   0,
@@ -157,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 {
@@ -169,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;
@@ -179,13 +185,17 @@ 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; }
             }
             idx += run;
             validate!(idx < 64);
-            let oidx = H263_ZIGZAG[idx as usize];
+            let oidx = ZIGZAG[idx as usize];
             blk[oidx] = level;
             idx += 1;
             if last { break; }
@@ -391,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,
@@ -421,11 +431,14 @@ 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;
             }
 {
-let mut br = BitReader::new(src, src.len(), BitReaderMode::BE);
+let mut br = BitReader::new(src, BitReaderMode::BE);
 println!("edata:");
 println!("{:08X}", br.read(32).unwrap());
 println!("{:08X}", br.read(32).unwrap());
@@ -449,10 +462,13 @@ println!("???");
         frm.set_frame_type(if self.dec.is_intra() { FrameType::I } else { FrameType::P });
         Ok(frm.into_ref())
     }
+    fn flush(&mut self) {
+        self.dec.flush();
+    }
 }
 
 
-pub fn get_decoder() -> Box<dyn NADecoder> {
+pub fn get_decoder() -> Box<dyn NADecoder + Send> {
     Box::new(RealVideo10Decoder::new())
 }
 
@@ -460,9 +476,9 @@ pub fn get_decoder() -> Box<dyn 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_codecs;
+    use crate::realmedia_register_all_demuxers;
     #[test]
     fn test_rv10() {
         let mut dmx_reg = RegisteredDemuxers::new();