use nihav_core::codecs::*;
use nihav_core::io::byteio::*;
-use nihav_core::data::GenericCache;
+use nihav_codec_support::codecs::{MV, ZERO_MV};
+use nihav_codec_support::data::GenericCache;
use super::vpcommon::*;
use super::vp7data::*;
use super::vp7dsp::*;
qmat: &'a [i16; 16],
}
-fn decode_subblock<'a>(bc: &mut BoolCoder, coeffs: &mut [i16; 16], ctype: usize, pctx: u8, sbparams: &SBParams) -> u8 {
+fn decode_subblock(bc: &mut BoolCoder, coeffs: &mut [i16; 16], ctype: usize, pctx: u8, sbparams: &SBParams) -> u8 {
const COEF_BANDS: [usize; 16] = [ 0, 1, 2, 3, 6, 4, 5, 6, 6, 6, 6, 6, 6, 6, 6, 7 ];
let mut has_nz = 0;
if pitch_smode == 0 {
mc_block8x8(dst, uoff, ustride, mb_x * 8, mb_y * 8, chroma_mv.x, chroma_mv.y, refframe.clone(), 1, &mut mc_buf);
- mc_block8x8(dst, voff, vstride, mb_x * 8, mb_y * 8, chroma_mv.x, chroma_mv.y, refframe.clone(), 2, &mut mc_buf);
+ mc_block8x8(dst, voff, vstride, mb_x * 8, mb_y * 8, chroma_mv.x, chroma_mv.y, refframe, 2, &mut mc_buf);
} else {
mc_block_special(dst, uoff, ustride, mb_x * 8, mb_y * 8, chroma_mv.x, chroma_mv.y,
refframe.clone(), 1, &mut mc_buf, 8, pitch_smode);
mc_block_special(dst, voff, vstride, mb_x * 8, mb_y * 8, chroma_mv.x, chroma_mv.y,
- refframe.clone(), 2, &mut mc_buf, 8, pitch_smode);
+ refframe, 2, &mut mc_buf, 8, pitch_smode);
}
} else {
for y in 0..2 {
2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2
]];
- let edge_thr = (loop_str as i16) + 2;
- let luma_thr = loop_str as i16;
- let chroma_thr = (loop_str as i16) * 2;
+ let edge_thr = i16::from(loop_str) + 2;
+ let luma_thr = i16::from(loop_str);
+ let chroma_thr = i16::from(loop_str) * 2;
let inner_thr = if self.dstate.loop_sharpness == 0 {
- loop_str as i16
+ i16::from(loop_str)
} else {
- let bound1 = (9 - self.dstate.loop_sharpness) as i16;
+ let bound1 = i16::from(9 - self.dstate.loop_sharpness);
let shift = (self.dstate.loop_sharpness + 3) >> 2;
- ((loop_str as i16) >> shift).min(bound1)
+ (i16::from(loop_str) >> shift).min(bound1)
};
- let hev_thr = HIGH_EDGE_VAR_THR[if self.dstate.is_intra { 1 } else { 0 }][loop_str as usize] as i16;
+ let hev_thr = i16::from(HIGH_EDGE_VAR_THR[if self.dstate.is_intra { 1 } else { 0 }][loop_str as usize]);
let ystride = dframe.stride[0];
let ustride = dframe.stride[1];
if let NACodecTypeInfo::Video(vinfo) = info.get_properties() {
let fmt = YUV420_FORMAT;
let myvinfo = NAVideoInfo::new(vinfo.get_width(), vinfo.get_height(), false, fmt);
- let myinfo = NACodecTypeInfo::Video(myvinfo.clone());
+ let myinfo = NACodecTypeInfo::Video(myvinfo);
self.info = NACodecInfo::new_ref(info.get_name(), myinfo, info.get_extradata()).into_ref();
supp.pool_u8.set_dec_bufs(4);
Err(DecoderError::InvalidData)
}
}
+ #[allow(clippy::cognitive_complexity)]
fn decode(&mut self, supp: &mut NADecoderSupport, pkt: &NAPacket) -> DecoderResult<NAFrameRef> {
let src = pkt.get_buffer();
}
}
-pub fn get_decoder() -> Box<NADecoder + Send> {
+impl NAOptionHandler for VP7Decoder {
+ fn get_supported_options(&self) -> &[NAOptionDefinition] { &[] }
+ fn set_options(&mut self, _options: &[NAOption]) { }
+ fn query_option_value(&self, _name: &str) -> Option<NAValue> { None }
+}
+
+pub fn get_decoder() -> Box<dyn NADecoder + Send> {
Box::new(VP7Decoder::new())
}
mod test {
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 nihav_codec_support::test::dec_video::*;
+ use crate::duck_register_all_decoders;
+ use nihav_commonfmt::generic_register_all_demuxers;
#[test]
fn test_vp7() {
let mut dmx_reg = RegisteredDemuxers::new();
generic_register_all_demuxers(&mut dmx_reg);
let mut dec_reg = RegisteredDecoders::new();
- duck_register_all_codecs(&mut dec_reg);
-
- //let file = "assets/Duck/potter-40.vp7";
- //let file = "assets/Duck/potter-500.vp7";
- //let file = "assets/Duck/starsky-700.vp7";
- //let file = "assets/Duck/taking-700.vp7";
- //let file = "assets/Duck/troy-700.vp7";
- let file = "assets/Duck/interlaced_blit_pitch.avi";
- //let file = "assets/Duck/vp7.avi";
- test_file_decoding("avi", file, Some(12), true, false, None/*Some("vp7")*/, &dmx_reg, &dec_reg);
+ duck_register_all_decoders(&mut dec_reg);
+
+ test_decoding("avi", "vp7", "assets/Duck/interlaced_blit_pitch.avi", Some(12), &dmx_reg,
+ &dec_reg, ExpectedTestResult::MD5Frames(vec![
+ [0xb79fb6f8, 0xed51ac9e, 0x9e423456, 0xc0918e7f],
+ [0xbf8d1274, 0x83515e15, 0x8c0887de, 0xfbfd05d3],
+ [0x8ad00466, 0x80b6cbfb, 0x54de408e, 0x9efbc05e],
+ [0x144122c5, 0x6897b553, 0x93474d29, 0x1a1274ec],
+ [0x06ff5d07, 0x55825d38, 0x072b0a78, 0xfcb5020f],
+ [0xfd01591b, 0xc42113e7, 0xc5a5550f, 0xb30f3b02],
+ [0x155e0d6e, 0x96d75e06, 0x9bd7ce87, 0xacf868e1],
+ [0xfd79103a, 0x695d21d3, 0xfeacb5b4, 0x1d869d08],
+ [0xf4bcfeac, 0x0d2c305c, 0x11416c96, 0x626a5ef6],
+ [0x3579b66c, 0x0a7d7dc0, 0xe80b0395, 0xf6a70661],
+ [0x5773768c, 0x813442e9, 0x4dd6f793, 0xb10fe55f],
+ [0xcaaf0ddb, 0x65c2410e, 0x95da5bba, 0x3b90128e],
+ [0x74773773, 0xe1dbadeb, 0x57aaf64b, 0x9c21e3c7]]));
}
}