projects
/
nihav.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vp3: remove debug leftovers
[nihav.git]
/
nihav-duck
/
src
/
codecs
/
vp3.rs
diff --git
a/nihav-duck/src/codecs/vp3.rs
b/nihav-duck/src/codecs/vp3.rs
index 8612831d20dbf17b9b93817217f7fbadc31029f7..eace89e0c2383ebb7a77e89bddaa15482e0fb600 100644
(file)
--- a/
nihav-duck/src/codecs/vp3.rs
+++ b/
nihav-duck/src/codecs/vp3.rs
@@
-611,7
+611,6
@@
impl VP34Decoder {
validate!(self.version == 3 || self.version == 30);
let mb_w = br.read(8)? as usize;
let mb_h = br.read(8)? as usize;
validate!(self.version == 3 || self.version == 30);
let mb_w = br.read(8)? as usize;
let mb_h = br.read(8)? as usize;
-println!(" VP30 {}x{} ({}x{})", mb_w, mb_h, self.mb_w, self.mb_h);
validate!(mb_w == self.mb_w && mb_h == self.mb_h);
if self.version == 3 {
self.version = 30;
validate!(mb_w == self.mb_w && mb_h == self.mb_h);
if self.version == 3 {
self.version = 30;
@@
-619,7
+618,6
@@
println!(" VP30 {}x{} ({}x{})", mb_w, mb_h, self.mb_w, self.mb_h);
}
} else {
let version = br.read(13)?;
}
} else {
let version = br.read(13)?;
-println!("intra, ver {} (self {})", version, self.version);
let coding_type = br.read(1)?;
validate!(coding_type == 0);
br.skip(2)?;
let coding_type = br.read(1)?;
validate!(coding_type == 0);
br.skip(2)?;
@@
-633,7
+631,6
@@
println!("intra, ver {} (self {})", version, self.version);
validate!(self.version == 4);
let mb_h = br.read(8)? as usize;
let mb_w = br.read(8)? as usize;
validate!(self.version == 4);
let mb_h = br.read(8)? as usize;
let mb_w = br.read(8)? as usize;
-//println!(" VP40 {}x{} ({}x{})", mb_w, mb_h, self.mb_w, self.mb_h);
validate!(mb_w == self.mb_w && mb_h == self.mb_h);
let fact1 = br.read(5)?;
let fact2 = br.read(3)?;
validate!(mb_w == self.mb_w && mb_h == self.mb_h);
let fact1 = br.read(5)?;
let fact2 = br.read(3)?;
@@
-652,7
+649,6
@@
println!("intra, ver {} (self {})", version, self.version);
} else {
VP40_LOOP_STRENGTH[self.quant]
};
} else {
VP40_LOOP_STRENGTH[self.quant]
};
-//println!("decode frame({},{},{})", self.is_intra as u8, self.is_intra as u8, self.quant);
Ok(())
}
fn vp30_unpack_sb_info(&mut self, br: &mut BitReader) -> DecoderResult<()> {
Ok(())
}
fn vp30_unpack_sb_info(&mut self, br: &mut BitReader) -> DecoderResult<()> {
@@
-1888,11
+1884,13
@@
mod test {
let mut dec_reg = RegisteredDecoders::new();
duck_register_all_codecs(&mut dec_reg);
let mut dec_reg = RegisteredDecoders::new();
duck_register_all_codecs(&mut dec_reg);
- let file = "assets/Duck/vp31.avi";
+
//
let file = "assets/Duck/vp31.avi";
// let file = "assets/Duck/vp31_crash.avi";
// let file = "assets/Duck/01-vp31-0500.avi";
// let file = "assets/Duck/vp31_crash.avi";
// let file = "assets/Duck/01-vp31-0500.avi";
- test_file_decoding("avi", file, Some(3), true, false, None/*Some("vp31")*/, &dmx_reg, &dec_reg);
+
//
test_file_decoding("avi", file, Some(3), true, false, None/*Some("vp31")*/, &dmx_reg, &dec_reg);
//panic!("end");
//panic!("end");
+ test_decoding("avi", "vp3", "assets/Duck/01-vp31-0500.avi", Some(16), &dmx_reg, &dec_reg,
+ ExpectedTestResult::MD5([0x65112f7e, 0x2914f29b, 0x2908ed2f, 0xce5fc8c5]));
}
#[test]
}
#[test]