X-Git-Url: https://git.nihav.org/?p=nihav.git;a=blobdiff_plain;f=nihav-indeo%2Fsrc%2Fcodecs%2Findeo2.rs;h=32e54f854c3b10bd7a2d222b3b882a65d76f99fe;hp=c3a8a4772ebd9b182339f557ec7673f3c8ee740b;hb=78fb6560c73965d834b215fb0b49505ae5443288;hpb=1a967e6bad5f17943b4de0607078eb940ad5adfe diff --git a/nihav-indeo/src/codecs/indeo2.rs b/nihav-indeo/src/codecs/indeo2.rs index c3a8a47..32e54f8 100644 --- a/nihav-indeo/src/codecs/indeo2.rs +++ b/nihav-indeo/src/codecs/indeo2.rs @@ -1,9 +1,8 @@ -use std::rc::Rc; -use std::cell::RefCell; use nihav_core::io::bitreader::*; use nihav_core::io::codebook::*; use nihav_core::formats; use nihav_core::codecs::*; +use nihav_codec_support::codecs::HAMShuffler; static INDEO2_DELTA_TABLE: [[u8; 256]; 4] = [ [ @@ -178,7 +177,7 @@ struct IR2CodeReader { } impl CodebookDescReader for IR2CodeReader { fn bits(&mut self, idx: usize) -> u8 { INDEO2_CODE_LENGTHS[idx] } - fn code(&mut self, idx: usize) -> u32 { INDEO2_CODE_CODES[idx] as u32 } + fn code(&mut self, idx: usize) -> u32 { u32::from(INDEO2_CODE_CODES[idx]) } fn sym (&mut self, idx: usize) -> u8 { if idx < 0x7F { (idx + 1) as u8 } else { (idx + 2) as u8 } } @@ -186,17 +185,17 @@ impl CodebookDescReader for IR2CodeReader { } struct Indeo2Decoder { - info: Rc, + info: NACodecInfoRef, cb: Codebook, - frmmgr: HAMShuffler, + frmmgr: HAMShuffler, } impl Indeo2Decoder { fn new() -> Self { - let dummy_info = Rc::new(DUMMY_CODEC_INFO); + let dummy_info = NACodecInfo::new_dummy(); let mut coderead = IR2CodeReader{}; let cb = Codebook::new(&mut coderead, CodebookMode::LSB).unwrap(); - Indeo2Decoder { info: dummy_info, cb: cb, frmmgr: HAMShuffler::new() } + Indeo2Decoder { info: dummy_info, cb, frmmgr: HAMShuffler::new() } } fn decode_plane_intra(&self, br: &mut BitReader, @@ -207,7 +206,7 @@ impl Indeo2Decoder { let stride = buf.get_stride(planeno); let cb = &self.cb; - let data = buf.get_data_mut().unwrap(); + let data = buf.get_data_mut().unwrap(); let framebuf: &mut [u8] = data.as_mut_slice(); let table = &INDEO2_DELTA_TABLE[tableno]; @@ -242,10 +241,10 @@ impl Indeo2Decoder { } x += run; } else { - let delta0 = (table[idx * 2 + 0] as i16) - 0x80; - let delta1 = (table[idx * 2 + 1] as i16) - 0x80; - let mut pix0 = framebuf[base + x + 0 - stride] as i16; - let mut pix1 = framebuf[base + x + 1 - stride] as i16; + let delta0 = i16::from(table[idx * 2 + 0]) - 0x80; + let delta1 = i16::from(table[idx * 2 + 1]) - 0x80; + let mut pix0 = i16::from(framebuf[base + x + 0 - stride]); + let mut pix1 = i16::from(framebuf[base + x + 1 - stride]); pix0 += delta0; pix1 += delta1; if pix0 < 0 { pix0 = 0; } @@ -285,12 +284,12 @@ impl Indeo2Decoder { if x + run > w { return Err(DecoderError::InvalidData); } x += run; } else { - let delta0 = (table[idx * 2 + 0] as i16) - 0x80; - let delta1 = (table[idx * 2 + 1] as i16) - 0x80; - let mut pix0 = framebuf[base + x + 0] as i16; - let mut pix1 = framebuf[base + x + 1] as i16; - pix0 += delta0 * 3 >> 2; - pix1 += delta1 * 3 >> 2; + let delta0 = i16::from(table[idx * 2 + 0]) - 0x80; + let delta1 = i16::from(table[idx * 2 + 1]) - 0x80; + let mut pix0 = i16::from(framebuf[base + x + 0]); + let mut pix1 = i16::from(framebuf[base + x + 1]); + pix0 += (delta0 * 3) >> 2; + pix1 += (delta1 * 3) >> 2; if pix0 < 0 { pix0 = 0; } if pix1 < 0 { pix1 = 0; } if pix0 > 255 { pix0 = 255; } @@ -309,61 +308,70 @@ impl Indeo2Decoder { const IR2_START: usize = 48; impl NADecoder for Indeo2Decoder { - fn init(&mut self, info: Rc) -> DecoderResult<()> { + fn init(&mut self, _supp: &mut NADecoderSupport, info: NACodecInfoRef) -> DecoderResult<()> { if let NACodecTypeInfo::Video(vinfo) = info.get_properties() { let w = vinfo.get_width(); let h = vinfo.get_height(); let f = vinfo.is_flipped(); let fmt = formats::YUV410_FORMAT; let myinfo = NACodecTypeInfo::Video(NAVideoInfo::new(w, h, f, fmt)); - self.info = Rc::new(NACodecInfo::new_ref(info.get_name(), myinfo, info.get_extradata())); + self.info = NACodecInfo::new_ref(info.get_name(), myinfo, info.get_extradata()).into_ref(); self.frmmgr.clear(); Ok(()) } else { Err(DecoderError::InvalidData) } } - fn decode(&mut self, pkt: &NAPacket) -> DecoderResult { + fn decode(&mut self, _supp: &mut NADecoderSupport, pkt: &NAPacket) -> DecoderResult { let src = pkt.get_buffer(); if src.len() <= IR2_START { return Err(DecoderError::ShortData); } let interframe = src[18]; let tabs = src[34]; - let mut br = BitReader::new(&src[IR2_START..], src.len() - IR2_START, BitReaderMode::LE); + let mut br = BitReader::new(&src[IR2_START..], BitReaderMode::LE); let luma_tab = tabs & 3; let chroma_tab = (tabs >> 2) & 3; if interframe != 0 { let vinfo = self.info.get_properties().get_video_info().unwrap(); - let bufret = alloc_video_buffer(vinfo, 2); - if let Err(_) = bufret { return Err(DecoderError::InvalidData); } - let bufinfo = bufret.unwrap(); + let bufinfo = alloc_video_buffer(vinfo, 2)?; let mut buf = bufinfo.get_vbuf().unwrap(); for plane in 0..3 { let tabidx = (if plane == 0 { luma_tab } else { chroma_tab }) as usize; - self.decode_plane_intra(&mut br, &mut buf, plane, tabidx)?; + let planeno = if plane == 0 { 0 } else { plane ^ 3 }; + self.decode_plane_intra(&mut br, &mut buf, planeno, tabidx)?; } self.frmmgr.add_frame(buf); let mut frm = NAFrame::new_from_pkt(pkt, self.info.clone(), bufinfo); frm.set_keyframe(true); frm.set_frame_type(FrameType::I); - Ok(Rc::new(RefCell::new(frm))) + Ok(frm.into_ref()) } else { let bufret = self.frmmgr.clone_ref(); - if let None = bufret { return Err(DecoderError::MissingReference); } + if bufret.is_none() { return Err(DecoderError::MissingReference); } let mut buf = bufret.unwrap(); for plane in 0..3 { let tabidx = (if plane == 0 { luma_tab } else { chroma_tab }) as usize; - self.decode_plane_inter(&mut br, &mut buf, plane, tabidx)?; + let planeno = if plane == 0 { 0 } else { plane ^ 3 }; + self.decode_plane_inter(&mut br, &mut buf, planeno, tabidx)?; } let mut frm = NAFrame::new_from_pkt(pkt, self.info.clone(), NABufferType::Video(buf)); frm.set_keyframe(false); frm.set_frame_type(FrameType::P); - Ok(Rc::new(RefCell::new(frm))) + Ok(frm.into_ref()) } } + fn flush(&mut self) { + self.frmmgr.clear(); + } +} + +impl NAOptionHandler for Indeo2Decoder { + 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(Indeo2Decoder::new()) } @@ -371,16 +379,28 @@ 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::indeo_register_all_codecs; - use nihav_commonfmt::demuxers::generic_register_all_demuxers; + use nihav_codec_support::test::dec_video::*; + use crate::indeo_register_all_decoders; + use nihav_commonfmt::generic_register_all_demuxers; #[test] fn test_indeo2() { let mut dmx_reg = RegisteredDemuxers::new(); generic_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - indeo_register_all_codecs(&mut dec_reg); + indeo_register_all_decoders(&mut dec_reg); - test_file_decoding("avi", "assets/Indeo/laser05.avi", Some(10), true, false, None, &dmx_reg, &dec_reg); + test_decoding("avi", "indeo2", "assets/Indeo/laser05.avi", Some(10), + &dmx_reg, &dec_reg, ExpectedTestResult::MD5Frames(vec![ + [0x55f509ad, 0x62fb52d5, 0x6e9a86b2, 0x3910ce74], + [0x76a2b95d, 0x97bd2eca, 0xc9815f99, 0xe196b47a], + [0x4ce19793, 0x46ff7429, 0x89d5c3aa, 0x822b8825], + [0xb9cd338f, 0x3d4884a7, 0x5a9e978d, 0xc5abcfe8], + [0xc4c6997a, 0x7dbb3a97, 0x1e4e65f6, 0xb5b6fba5], + [0xe315980e, 0x817f51e5, 0xf9a45363, 0x943c94b9], + [0x09b8c723, 0xb39aa17e, 0x6de2a61b, 0xaceca224], + [0xdc1b1966, 0xba5a13b3, 0x3a7fbdab, 0xdebb504c], + [0xd33eed2a, 0x7b3834a6, 0x2d57cd23, 0x73644cd9], + [0xd7bd2ade, 0x114f973e, 0xe9a9cf45, 0x3c04297e], + [0x4d851f61, 0x519c41df, 0x325dc9f9, 0xdf88b57a]])); } }