validate!((hdr.disp_w <= hdr.mb_w) && (hdr.disp_h <= hdr.mb_h));
hdr.scale = bc.read_bits(2) as u8;
}
-
+
Ok(hdr)
}
fn decode_mv(&self, bc: &mut BoolCoder, model: &VP56MVModel) -> i16 {
if idx > 0 {
coeffs[ZIGZAG[idx]] *= fstate.ac_quant;
}
-
+
idx += 1;
if idx >= 64 {
break;
}
fn mc_block(&self, dst: &mut NASimpleVideoFrame<u8>, mc_buf: NAVideoBufferRef<u8>, src: NAVideoBufferRef<u8>, plane: usize, x: usize, y: usize, mv: MV, loop_str: i16) {
let (sx, sy, mx, my) = if (plane != 1) && (plane != 2) {
- (mv.x / 2, mv.y / 2, mv.x & 1, mv.y & 1)
+ (mv.x >> 1, mv.y >> 1, mv.x & 1, mv.y & 1)
} else {
- (mv.x / 4, mv.y / 4, (mv.x >> 1) & 1, (mv.y >> 1) & 1)
+ (mv.x >> 2, mv.y >> 2, if (mv.x & 3) != 0 { 1 } else { 0 }, if (mv.y & 3) != 0 { 1 } else { 0 })
+ };
+ let mode1 = (mx as usize) + (my as usize) * 2;
+ let mode = if (mode1 == 3) && (mv.x ^ mv.y < 0) {
+ 4
+ } else {
+ mode1
};
- let mode = (mx as usize) + (my as usize) * 2;
vp_copy_block(dst, src, plane, x, y, sx, sy, 0, 1, loop_str,
mode, VP3_INTERP_FUNCS, mc_buf);
}
frm.set_frame_type(ftype);
Ok(frm.into_ref())
}
+ fn flush(&mut self) {
+ self.dec.flush();
+ }
}
-pub fn get_decoder() -> Box<NADecoder> {
+pub fn get_decoder() -> Box<NADecoder + Send> {
Box::new(VP5Decoder::new())
}
use nihav_core::codecs::RegisteredDecoders;
use nihav_core::demuxers::RegisteredDemuxers;
use nihav_core::test::dec_video::*;
- use crate::codecs::duck_register_all_codecs;
- use nihav_commonfmt::demuxers::generic_register_all_demuxers;
+ use crate::duck_register_all_codecs;
+ use nihav_commonfmt::generic_register_all_demuxers;
#[test]
fn test_vp5() {
let file = "assets/Duck/Cell-140.vp5";
//let file = "assets/Duck/Chocolat-500.vp5";
- test_file_decoding("avi", file, Some(13), true, false, None/*Some("vp5")*/, &dmx_reg, &dec_reg);
-//panic!("end");
+ test_decoding("avi", "vp5", file, Some(96), &dmx_reg, &dec_reg,
+ ExpectedTestResult::MD5([0x9ad78b0f, 0xed988ead, 0x88ed2ea9, 0xcdb75cdf]));
}
}