mb_h: usize,
version: u8,
is_intra: bool,
+ update_gf: bool,
quant: usize,
shuf: VPShuffler,
codes: Codes,
mb_h: 0,
version,
is_intra: true,
+ update_gf: false,
quant: 0,
shuf: VPShuffler::new(),
codes: Codes::None,
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;
}
} 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)?;
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)?;
} 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<()> {
}
let dc_quant = VP30_DC_SCALES[self.quant] * 10;
let ac_quant = VP30_AC_SCALES[self.quant];
+
+ self.update_gf = ac_quant <= 50;
+
rescale_qmat(&mut self.qmat_y, VP3_QMAT_Y, dc_quant, ac_quant, 2);
rescale_qmat(&mut self.qmat_c, VP3_QMAT_C, dc_quant, ac_quant, 2);
rescale_qmat(&mut self.qmat_y_p, VP3_QMAT_INTER, dc_quant, ac_quant, 4);
_ => return Err(DecoderError::Bug),
}
- if self.is_intra {
+ if self.is_intra || self.update_gf {
self.shuf.add_golden_frame(buf.clone());
}
self.shuf.add_frame(buf.clone());
let mut dec_reg = RegisteredDecoders::new();
duck_register_all_codecs(&mut dec_reg);
- let file = "assets/Duck/vp30-logo.avi";
- test_file_decoding("avi", file, Some(23), true, false, None/*Some("vp30")*/, &dmx_reg, &dec_reg);
+ test_decoding("avi", "vp3", "assets/Duck/vp30-logo.avi", Some(23), &dmx_reg, &dec_reg,
+ ExpectedTestResult::MD5([0x51aba7df, 0x6e42534d, 0xef6c5b13, 0x26c38d1f]));
}
#[test]
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";
- 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");
+ test_decoding("avi", "vp3", "assets/Duck/01-vp31-0500.avi", Some(16), &dmx_reg, &dec_reg,
+ ExpectedTestResult::MD5([0x65112f7e, 0x2914f29b, 0x2908ed2f, 0xce5fc8c5]));
}
#[test]