X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-rad%2Fsrc%2Fcodecs%2Fbinkvid.rs;h=e68f1f3033e2434cfb1cd13691aa1fc6465a4ef2;hb=4e376911a139fb42d62c31eb02563da3614b2baa;hp=ac434adea52248ffef70fb5b271c18a66f24610f;hpb=d24468d9dbd54f5cbe414649ff061699337fa7fe;p=nihav.git

diff --git a/nihav-rad/src/codecs/binkvid.rs b/nihav-rad/src/codecs/binkvid.rs
index ac434ad..e68f1f3 100644
--- a/nihav-rad/src/codecs/binkvid.rs
+++ b/nihav-rad/src/codecs/binkvid.rs
@@ -3,6 +3,7 @@ use nihav_core::codecs::*;
 use nihav_core::io::byteio::*;
 use nihav_core::io::bitreader::*;
 use nihav_core::io::codebook::*;
+use nihav_codec_support::codecs::{IPShuffler, HAMShuffler};
 
 const SKIP_BLOCK: u8 = 0;
 const SCALED_BLOCK: u8 = 1;
@@ -125,7 +126,6 @@ impl<T:Copy> Bundle<T> {
             self.dec_pos = self.data.len();
             self.read_pos = self.data.len() - 1;
         }
-println!("    read {} of {} bits", len, self.bits);
         Ok(len)
     }
     fn get_val(&mut self) -> DecoderResult<T> {
@@ -534,6 +534,7 @@ impl BinkDecoder {
         self.run.data.resize(size, 0);
     }
     fn init_bundle_lengths(&mut self, w: usize, bw: usize) {
+        let w = (w + 7) & !7;
         self.btype.bits     = calc_len(w >> 3);
         self.sbtype.bits    = calc_len(w >> 4);
         self.colors.bits    = calc_len(bw * 64);
@@ -574,25 +575,15 @@ impl BinkDecoder {
     }
     fn read_bundles_binkb(&mut self, br: &mut BitReader) -> DecoderResult<()> {
         self.btype.read_binkb(br)?;
-println!("   @ {}", br.tell());
         self.colors.read_binkb(br)?;
-println!("   @ {}", br.tell());
         self.pattern.read_binkb(br)?;
-println!("   @ {}", br.tell());
         self.xoff.read_binkb(br)?;
-println!("   @ {}", br.tell());
         self.yoff.read_binkb(br)?;
-println!("   @ {}", br.tell());
         self.intradc.read_binkb(br)?;
-println!("   @ {}", br.tell());
         self.interdc.read_binkb(br)?;
-println!("   @ {}", br.tell());
         self.intraq.read_binkb(br)?;
-println!("   @ {}", br.tell());
         self.interq.read_binkb(br)?;
-println!("   @ {}", br.tell());
         self.nresidues.read_binkb(br)?;
-println!("   @ {}", br.tell());
         Ok(())
     }
     fn read_bundles(&mut self, br: &mut BitReader) -> DecoderResult<()> {
@@ -656,7 +647,6 @@ println!("   @ {}", br.tell());
         let ybias = if self.key_frame { -15 } else { 0 };
         let yoff = yoff1 + ybias;
 
-println!("     copy from {}.{} + {},{}({})", bx*8, by*8, xoff, yoff, ybias);
         let xpos = ((bx * 8) as isize) + (xoff as isize);
         let ypos = ((by * 8) as isize) + (yoff as isize);
         validate!((xpos >= 0) && (xpos + 8 <= (self.cur_w as isize)));
@@ -727,14 +717,11 @@ println!("     copy from {}.{} + {},{}({})", bx*8, by*8, xoff, yoff, ybias);
         self.cur_h = (height + 7) & !7;
         self.cur_plane = plane_no;
         self.init_bundle_lengths_binkb();
-println!(" plane {}", plane_no);
         for by in 0..bh {
             self.read_bundles_binkb(br)?;
-println!("  bline {} @ {}", by, br.tell());
             for bx in 0..bw {
                 let mut coeffs: [i32; 64] = [0; 64];
                 let btype = self.btype.get_val()?;
-println!("  blk {}.{} type {}", bx,by,btype);
                 match btype {
                     0 => { // skip
                         },
@@ -1229,7 +1216,6 @@ impl NADecoder for BinkDecoder {
             buf = bufinfo.get_vbuf().unwrap();
         }
 
-println!("decode frame {} b={} i={}", pkt.get_pts().unwrap(), self.is_ver_b, self.is_ver_i);
         let nplanes = if self.is_gray { 1 } else { 3 };
         if self.has_alpha {
             validate!(!self.is_ver_b);
@@ -1271,9 +1257,9 @@ 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 crate::codecs::rad_register_all_codecs;
-    use crate::demuxers::rad_register_all_demuxers;
+    use nihav_codec_support::test::dec_video::*;
+    use crate::rad_register_all_codecs;
+    use crate::rad_register_all_demuxers;
     #[test]
     fn test_binkvid() {
         let mut dmx_reg = RegisteredDemuxers::new();