X-Git-Url: https://git.nihav.org/?p=nihav.git;a=blobdiff_plain;f=nihav-rad%2Fsrc%2Fcodecs%2Fbink2.rs;h=9ae02a710468ddaa349d0f004dc1e2d526557424;hp=0bcfdd4d81605b9511c7aa6c29650c1a0f24285c;hb=78fb6560c73965d834b215fb0b49505ae5443288;hpb=6011e20199143f519881660144a4ca95ba77fd2d diff --git a/nihav-rad/src/codecs/bink2.rs b/nihav-rad/src/codecs/bink2.rs index 0bcfdd4..9ae02a7 100644 --- a/nihav-rad/src/codecs/bink2.rs +++ b/nihav-rad/src/codecs/bink2.rs @@ -4,6 +4,7 @@ use nihav_core::io::byteio::*; use nihav_core::io::bitreader::*; use nihav_core::io::codebook::*; use nihav_core::io::intcode::*; +use nihav_codec_support::codecs::{IPShuffler, MV, ZERO_MV}; macro_rules! mktag { ($a:expr, $b:expr, $c:expr, $d:expr) => ({ @@ -53,7 +54,7 @@ macro_rules! idct { }; (float; $src: expr, $sstep: expr, $off: expr, $dst: expr, $dstep: expr, $doff: expr, $bias: expr, $shift: expr) => { let t00 = $src[$off + $sstep * 2] + $src[$off + $sstep * 6]; - let t01 = ($src[$off + $sstep * 2] - $src[$off + $sstep * 6]) * 1.4142135 - t00; + let t01 = ($src[$off + $sstep * 2] - $src[$off + $sstep * 6]) * std::f32::consts::SQRT_2 - t00; let t02 = $src[$off + $sstep * 0] + $src[$off + $sstep * 4]; let t03 = $src[$off + $sstep * 0] - $src[$off + $sstep * 4]; let t04 = $src[$off + $sstep * 3] + $src[$off + $sstep * 5]; @@ -65,7 +66,7 @@ macro_rules! idct { let t10 = t03 + t01; let t11 = t03 - t01; let t12 = t06 + t04; - let t13 = (t06 - t04) * 1.4142135; + let t13 = (t06 - t04) * std::f32::consts::SQRT_2; let t14 = (t07 - t05) * 1.847759; let t15 = t05 * 2.613126 + t14 - t12; let t16 = t13 - t15; @@ -82,6 +83,7 @@ macro_rules! idct { }; } +#[allow(clippy::erasing_op)] fn bink2_idct(coeffs: &mut [i32; 64]) { let mut tmp: [i32; 64] = [0; 64]; for i in 0..8 { @@ -92,6 +94,7 @@ fn bink2_idct(coeffs: &mut [i32; 64]) { } } +#[allow(clippy::erasing_op)] fn bink2_idct_old(coeffs: &mut [f32; 64]) { let mut tmp: [f32; 64] = [0.0; 64]; coeffs[0] += 512.5; @@ -148,6 +151,7 @@ macro_rules! avg_tree { ($a: expr, $b: expr, $c: expr, $d: expr) => (avg_tree!(avg_tree!($a, $b), avg_tree!($c, $d))); } +#[allow(clippy::erasing_op)] impl Bink2DSP { fn calc_dc(src: &[u8], stride: usize) -> i32 { let mut sums = [0u16; 8]; @@ -275,7 +279,7 @@ impl Bink2DSP { 0 => { let src = &ppix[poff..]; for (out, row) in dst.chunks_mut(stride).take(16).zip(src.chunks(pstride)) { - for i in 0..16 { out[i] = row[i]; } + out[..16].copy_from_slice(&row[..16]); } }, 1 => { @@ -334,7 +338,7 @@ impl Bink2DSP { if (mx == 0) && (my == 0) { let inpix = &ppix[poff..]; for (out, src) in dst.chunks_mut(stride).take(8).zip(inpix.chunks(pstride)) { - for i in 0..8 { out[i] = src[i]; } + out[..8].copy_from_slice(&src[..8]); } } else if my == 0 { chroma_interp!(dst, stride, 8, u8, &ppix[poff..], pstride, 1, mx, 2); @@ -970,7 +974,7 @@ struct Bink2Codes { } fn map_ac(idx: usize) -> u8 { idx as u8 } -fn map_mv(idx: usize) -> i8 { BINK2_MV_SYMS[idx] } +fn map_mv(idx: usize) -> i8 { BINK2_MV_SYMS[idx] } impl Default for Bink2Codes { fn default() -> Self { @@ -1017,11 +1021,13 @@ struct Bink2Decoder { codes: Bink2Codes, } +#[allow(clippy::erasing_op)] impl Bink2Decoder { fn new() -> Self { Self::default() } + #[allow(clippy::cyclomatic_complexity)] fn decode_frame_new(&mut self, br: &mut BitReader, buf: &mut NAVideoBuffer, is_intra: bool) -> DecoderResult<()> { let (stride_y, stride_u, stride_v, stride_a) = (buf.get_stride(0), buf.get_stride(1), buf.get_stride(2), buf.get_stride(3)); let (mut off_y, mut off_u, mut off_v, mut off_a) = (buf.get_offset(0), buf.get_offset(1), buf.get_offset(2), buf.get_offset(3)); @@ -1709,11 +1715,11 @@ fn decode_cbp_luma_old(br: &mut BitReader, prev_cbp: u32) -> DecoderResult if !br.read_bool()? { nib1 = br.read(4)?; } - new_cbp = new_cbp | (nib1 << 4); + new_cbp |= nib1 << 4; if !br.read_bool()? { nib1 = br.read(4)?; } - new_cbp = new_cbp | (nib1 << 8); + new_cbp |= nib1 << 8; if !br.read_bool()? { nib1 = br.read(4)?; } @@ -1917,14 +1923,12 @@ impl NADecoder for Bink2Decoder { fn decode(&mut self, _supp: &mut NADecoderSupport, pkt: &NAPacket) -> DecoderResult { let src = pkt.get_buffer(); - let mut br = BitReader::new(&src, src.len(), BitReaderMode::LE); + let mut br = BitReader::new(&src, BitReaderMode::LE); let mut buf; self.key_frame = pkt.is_keyframe(); - let bufret = alloc_video_buffer(self.info.get_properties().get_video_info().unwrap(), 5); - if let Err(_) = bufret { return Err(DecoderError::InvalidData); } - let bufinfo = bufret.unwrap(); + let bufinfo = alloc_video_buffer(self.info.get_properties().get_video_info().unwrap(), 5)?; buf = bufinfo.get_vbuf().unwrap(); self.decode_frame_new(&mut br, &mut buf, pkt.is_keyframe())?; @@ -1935,9 +1939,18 @@ impl NADecoder for Bink2Decoder { frm.set_frame_type(if self.key_frame { FrameType::I } else { FrameType::P }); Ok(frm.into_ref()) } + fn flush(&mut self) { + self.ips.clear(); + } +} + +impl NAOptionHandler for Bink2Decoder { + fn get_supported_options(&self) -> &[NAOptionDefinition] { &[] } + fn set_options(&mut self, _options: &[NAOption]) { } + fn query_option_value(&self, _name: &str) -> Option { None } } -pub fn get_decoder() -> Box { +pub fn get_decoder() -> Box { Box::new(Bink2Decoder::new()) } @@ -1945,15 +1958,15 @@ pub fn get_decoder() -> Box { 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_decoders; + use crate::rad_register_all_demuxers; #[test] fn test_bink2() { let mut dmx_reg = RegisteredDemuxers::new(); rad_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - rad_register_all_codecs(&mut dec_reg); + rad_register_all_decoders(&mut dec_reg); //let file = "assets/RAD/Open_Logos_partial.bik"; //let file = "assets/RAD/sc13_01_partial.bk2";