X-Git-Url: https://git.nihav.org/?p=nihav.git;a=blobdiff_plain;f=nihav-rad%2Fsrc%2Fcodecs%2Fbinkvid.rs;h=5f5bb566aa528603e7b3515f5f813f4bdd468e2f;hp=e091b72f92ccee55170700179debee6614ac9591;hb=78fb6560c73965d834b215fb0b49505ae5443288;hpb=01613464323864a655c994820d3c43df1954e3b2 diff --git a/nihav-rad/src/codecs/binkvid.rs b/nihav-rad/src/codecs/binkvid.rs index e091b72..5f5bb56 100644 --- a/nihav-rad/src/codecs/binkvid.rs +++ b/nihav-rad/src/codecs/binkvid.rs @@ -3,6 +3,7 @@ use nihav_core::codecs::*; use nihav_core::io::byteio::*; use nihav_core::io::bitreader::*; use nihav_core::io::codebook::*; +use nihav_codec_support::codecs::{IPShuffler, HAMShuffler}; const SKIP_BLOCK: u8 = 0; const SCALED_BLOCK: u8 = 1; @@ -30,7 +31,7 @@ impl Tree { if br.read_bool()? { let len = br.read(3)? as usize; let mut present: [bool; 16] = [false; 16]; - for i in 0..len+1 { + for i in 0..=len { self.syms[i] = br.read(4)? as u8; present[self.syms[i] as usize] = true; } @@ -44,7 +45,7 @@ impl Tree { let len = br.read(2)? as usize; let mut syms: [u8; 16] = [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]; let mut tmp: [u8; 16] = [0; 16]; - for bits in 0..len+1 { + for bits in 0..=len { let size = 1 << bits; for arr in syms.chunks_mut(size * 2) { let mut ptr0 = 0; @@ -125,7 +126,6 @@ impl Bundle { self.dec_pos = self.data.len(); self.read_pos = self.data.len() - 1; } -println!(" read {} of {} bits", len, self.bits); Ok(len) } fn get_val(&mut self) -> DecoderResult { @@ -476,7 +476,7 @@ impl Default for QuantMats { struct BinkDecoder { info: NACodecInfoRef, ips: IPShuffler, - hams: HAMShuffler, + hams: HAMShuffler, is_ver_b: bool, is_ver_i: bool, @@ -534,6 +534,7 @@ impl BinkDecoder { self.run.data.resize(size, 0); } fn init_bundle_lengths(&mut self, w: usize, bw: usize) { + let w = (w + 7) & !7; self.btype.bits = calc_len(w >> 3); self.sbtype.bits = calc_len(w >> 4); self.colors.bits = calc_len(bw * 64); @@ -574,25 +575,15 @@ impl BinkDecoder { } fn read_bundles_binkb(&mut self, br: &mut BitReader) -> DecoderResult<()> { self.btype.read_binkb(br)?; -println!(" @ {}", br.tell()); self.colors.read_binkb(br)?; -println!(" @ {}", br.tell()); self.pattern.read_binkb(br)?; -println!(" @ {}", br.tell()); self.xoff.read_binkb(br)?; -println!(" @ {}", br.tell()); self.yoff.read_binkb(br)?; -println!(" @ {}", br.tell()); self.intradc.read_binkb(br)?; -println!(" @ {}", br.tell()); self.interdc.read_binkb(br)?; -println!(" @ {}", br.tell()); self.intraq.read_binkb(br)?; -println!(" @ {}", br.tell()); self.interq.read_binkb(br)?; -println!(" @ {}", br.tell()); self.nresidues.read_binkb(br)?; -println!(" @ {}", br.tell()); Ok(()) } fn read_bundles(&mut self, br: &mut BitReader) -> DecoderResult<()> { @@ -656,7 +647,6 @@ println!(" @ {}", br.tell()); let ybias = if self.key_frame { -15 } else { 0 }; let yoff = yoff1 + ybias; -println!(" copy from {}.{} + {},{}({})", bx*8, by*8, xoff, yoff, ybias); let xpos = ((bx * 8) as isize) + (xoff as isize); let ypos = ((by * 8) as isize) + (yoff as isize); validate!((xpos >= 0) && (xpos + 8 <= (self.cur_w as isize))); @@ -727,14 +717,11 @@ println!(" copy from {}.{} + {},{}({})", bx*8, by*8, xoff, yoff, ybias); self.cur_h = (height + 7) & !7; self.cur_plane = plane_no; self.init_bundle_lengths_binkb(); -println!(" plane {}", plane_no); for by in 0..bh { self.read_bundles_binkb(br)?; -println!(" bline {} @ {}", by, br.tell()); for bx in 0..bw { let mut coeffs: [i32; 64] = [0; 64]; let btype = self.btype.get_val()?; -println!(" blk {}.{} type {}", bx,by,btype); match btype { 0 => { // skip }, @@ -1053,7 +1040,7 @@ fn read_dct_coefficients(br: &mut BitReader, block: &mut [i32; 64], scan: &[usiz let q_index = if let Some(qidx) = q { qidx } else { br.read(4)? as usize }; let qmat = &quant_matrices[q_index]; block[0] = block[0].wrapping_mul(qmat[0]) >> 11; - for idx in coef_idx.into_iter().take(coef_count) { + for idx in coef_idx.iter().take(coef_count) { block[scan[*idx]] = block[scan[*idx]].wrapping_mul(qmat[*idx]) >> 11; } @@ -1149,7 +1136,7 @@ fn read_residue(br: &mut BitReader, block: &mut [i32; 64], mut masks_count: usiz } mask >>= 1; } - + Ok(()) } @@ -1209,7 +1196,7 @@ impl NADecoder for BinkDecoder { 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(); @@ -1218,22 +1205,17 @@ impl NADecoder for BinkDecoder { if let Some(bbuf) = bufret { buf = bbuf; } else { - let bufret = alloc_video_buffer(self.info.get_properties().get_video_info().unwrap(), 4); - 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(), 4)?; buf = bufinfo.get_vbuf().unwrap(); self.key_frame = true; self.hams.add_frame(buf); buf = self.hams.get_output_frame().unwrap(); } } else { - let bufret = alloc_video_buffer(self.info.get_properties().get_video_info().unwrap(), 4); - 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(), 4)?; buf = bufinfo.get_vbuf().unwrap(); } -println!("decode frame {} b={} i={}", pkt.get_pts().unwrap(), self.is_ver_b, self.is_ver_i); let nplanes = if self.is_gray { 1 } else { 3 }; if self.has_alpha { validate!(!self.is_ver_b); @@ -1262,9 +1244,18 @@ println!("decode frame {} b={} i={}", pkt.get_pts().unwrap(), self.is_ver_b, sel frm.set_frame_type(FrameType::P); Ok(frm.into_ref()) } + fn flush(&mut self) { + self.ips.clear(); + } } -pub fn get_decoder() -> Box { +impl NAOptionHandler for BinkDecoder { + 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 { Box::new(BinkDecoder::new()) } @@ -1272,26 +1263,46 @@ 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_binkvid_b() { + let mut dmx_reg = RegisteredDemuxers::new(); + rad_register_all_demuxers(&mut dmx_reg); + let mut dec_reg = RegisteredDecoders::new(); + rad_register_all_decoders(&mut dec_reg); + + test_decoding("bink", "bink-video", "assets/RAD/NEW.BIK", Some(16), &dmx_reg, &dec_reg, + ExpectedTestResult::MD5Frames(vec![ + [0x00edef7e, 0x7efad3b1, 0x7e8bdd74, 0x3f6b00ba], + [0xbc40683f, 0xbeb1c5e4, 0x934777b5, 0x8a8a350d], + [0x68b78627, 0x28ceb63d, 0xfdb1171a, 0x23e69d90], + [0xc8d907a0, 0xb8d44079, 0x0286336b, 0x996479f3], + [0x57bbe4ec, 0xdb8bb9c2, 0x0e6f1fd6, 0xe180125e], + [0xd43c2ae0, 0x4010007f, 0x2a6360a1, 0xb5203a05], + [0xa883acf6, 0x25843f92, 0x4ced9a46, 0x6d513ad9], + [0x959e843f, 0x8d8182b9, 0x3f12d29b, 0x2af8d39f], + [0x93840946, 0x1188c6d1, 0xd5499833, 0x62aac0c6], + [0x4e5a56a6, 0x21517d9a, 0xbe1f270d, 0xe5621945], + [0x1b133742, 0x1eb1bf0a, 0x68cab2e3, 0x92176b5d], + [0x0cf78c43, 0x4bc15549, 0x3dd94323, 0x737eaaae], + [0xdd731c4a, 0x801453b3, 0xa38bef3e, 0x285cfdfe], + [0xe1fec4ee, 0x46737abc, 0x8c452209, 0xc8c6addd], + [0x2978aa50, 0x5f1e6d5a, 0x1f5b0fba, 0xb8e32196], + [0x2e1e95ab, 0x8e31a0b0, 0xfe998512, 0xea9397b6], + [0xf7f6c0d8, 0x893e77a7, 0xdfe0309f, 0xf5e644e2]])); + } #[test] fn test_binkvid() { 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); - - let file = "assets/RAD/NEW.BIK"; - //let file = "assets/RAD/NWCLOGO.BIK"; - test_file_decoding("bink", file, Some(42), true, false, None/*Some("bink-b")*/, &dmx_reg, &dec_reg); - - //let file = "assets/RAD/bink_dct.bik"; - //let file = "assets/RAD/day3-b.bik"; - let file = "assets/RAD/ActivisionLogo.bik"; - //let file = "assets/RAD/ATI-9700-Animusic-Movie-v1.0.bik"; - //let file = "assets/RAD/original.bik"; - test_file_decoding("bink", file, Some(42), true, false, None/*Some("bink-")*/, &dmx_reg, &dec_reg); + rad_register_all_decoders(&mut dec_reg); + + test_decoding("bink", "bink-video", "assets/RAD/ActivisionLogo.bik", Some(42), + &dmx_reg, &dec_reg, + ExpectedTestResult::MD5([0x41128884, 0x73a8c710, 0x5072ea4a, 0x8caca428])); } }