X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcodecs%2Freal%2Frv40.rs;h=c6645989f4f174f5638e92629b6539995705bc8f;hb=4a9d2671dbfa6cab657ef52d321f153174cb6e1b;hp=a9619d483bc4124e6b606c47892fbf1e001d4531;hpb=4752773296e6f84e69045aed2d948a66a6a031a5;p=nihav.git

diff --git a/src/codecs/real/rv40.rs b/src/codecs/real/rv40.rs
index a9619d4..c664598 100644
--- a/src/codecs/real/rv40.rs
+++ b/src/codecs/real/rv40.rs
@@ -1,8 +1,8 @@
-use formats;
-use io::bitreader::*;
-use io::codebook::*;
-use io::intcode::*;
-use codecs::*;
+use crate::formats;
+use crate::io::bitreader::*;
+use crate::io::codebook::*;
+use crate::io::intcode::*;
+use crate::codecs::*;
 use super::rv3040::*;
 use super::rv40dsp::*;
 
@@ -188,7 +188,6 @@ impl RV34BitstreamDecoder for RealVideo40BR {
             h = old_h;
         }
         let start               = br.read(get_slice_start_offset_bits(w, h))? as usize;
-//println!(" type {:?} q {} set {} pts {} {}x{} start {} @ {}", ftype, q, set_idx, pts, w, h, start, br.tell());
 
         self.had_skip_run = false;
 
@@ -196,7 +195,6 @@ impl RV34BitstreamDecoder for RealVideo40BR {
     }
     fn decode_intra_pred(&mut self, br: &mut BitReader, types: &mut [i8], mut pos: usize, tstride: usize, has_top: bool) -> DecoderResult<()> {
         let start;
-//println!(" @ {}", br.tell());
         if has_top {
             start = 0;
         } else {
@@ -205,7 +203,6 @@ impl RV34BitstreamDecoder for RealVideo40BR {
             types[pos + 1] = (code >> 1) & 2;
             types[pos + 2] = (code >> 0) & 2;
             types[pos + 3] = (code << 1) & 2;
-//println!("  first line {} {} {} {} @ {}", types[pos +0],types[pos+1],types[pos+2],types[pos+3],br.tell());
             pos += tstride;
             start = 1;
         }
@@ -215,14 +212,12 @@ impl RV34BitstreamDecoder for RealVideo40BR {
                 let tr = types[pos + x - tstride + 1];
                 let t  = types[pos + x - tstride];
                 let l  = types[pos + x - 1];
-//println!(" x = {} ctx {} {} {} @ {}", x, l, t, tr, br.tell());
                 let ctx = if x < 3 { ((tr & 0xF) as u16) + (((t as u16) & 0xF) << 4) + (((l as u16) & 0xF) << 8) } else { 0xFFF };
                 let res = RV40_AIC_PATTERNS.iter().position(|&x| x == ctx);
                 if let Some(idx) = res {
                     let code = br.read_cb(&self.aic_mode2_cb[idx])?;
                     types[pos + x + 0] = code / 9;
                     types[pos + x + 1] = code % 9;
-//println!("   -> {} {}", types[pos + x + 0], types[pos + x + 1]);
                     x += 2;
                 } else {
                     if (t != -1) && (l != -1) {
@@ -235,7 +230,6 @@ impl RV34BitstreamDecoder for RealVideo40BR {
                             _           => { types[pos + x] = 0; },
                         };
                     }
-//println!("   -> {}", types[pos + x]);
                     x += 1;
                 }
             }
@@ -345,8 +339,6 @@ println!("???");
     fn decode(&mut self, pkt: &NAPacket) -> DecoderResult<NAFrameRef> {
         let src = pkt.get_buffer();
 
-//println!(" decode frame size {}, {} slices", src.len(), src[0]+1);
-
         let (bufinfo, ftype, ts) = self.dec.parse_frame(src.as_slice(), &mut self.bd)?;
 
         let mut frm = NAFrame::new_from_pkt(pkt, self.info.clone(), bufinfo);
@@ -363,13 +355,13 @@ pub fn get_decoder() -> Box<NADecoder> {
 
 #[cfg(test)]
 mod test {
-    use test::dec_video::test_file_decoding;
+    use crate::test::dec_video::test_file_decoding;
     #[test]
     fn test_rv40() {
 //         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")*/);
 //         test_file_decoding("realmedia", "assets/RV/rv40_weighted_mc_2.rmvb", Some(1000), true, false, /*None*/Some("rv40"));
-panic!("end");
+//panic!("end");
     }
 }