X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=src%2Fcodecs%2Findeo2.rs;h=00537f8684c5ea78ecf9ed1bfc7e586aaeeaea60;hb=b241aaf7543a3547f70a756fd47b44a0e756fc54;hp=1df483fc4fe3c19c1219ea2be266b4dd7e85b090;hpb=eb71d98ffafe7cc00bab4c3b7c9c97f813eca6c4;p=nihav.git diff --git a/src/codecs/indeo2.rs b/src/codecs/indeo2.rs index 1df483f..00537f8 100644 --- a/src/codecs/indeo2.rs +++ b/src/codecs/indeo2.rs @@ -183,30 +183,29 @@ impl CodebookDescReader for IR2CodeReader { fn len(&mut self) -> usize { INDEO2_CODE_LENGTHS.len() } } -pub struct Indeo2Decoder { +struct Indeo2Decoder { info: Rc, cb: Codebook, - lastfrm: Option>, + frmmgr: HAMShuffler, } impl Indeo2Decoder { - pub fn new() -> Self { + fn new() -> Self { let dummy_info = Rc::new(DUMMY_CODEC_INFO); let mut coderead = IR2CodeReader{}; let cb = Codebook::new(&mut coderead, CodebookMode::LSB).unwrap(); - Indeo2Decoder { info: dummy_info, cb: cb, lastfrm: None } + Indeo2Decoder { info: dummy_info, cb: cb, frmmgr: HAMShuffler::new() } } fn decode_plane_intra(&self, br: &mut BitReader, - frm: &mut NAFrame, planeno: usize, + buf: &mut NAVideoBuffer, planeno: usize, tableno: usize) -> DecoderResult<()> { - let offs = frm.get_offset(planeno); - let (w, h) = frm.get_dimensions(planeno); - let stride = frm.get_stride(planeno); + let offs = buf.get_offset(planeno); + let (w, h) = buf.get_dimensions(planeno); + let stride = buf.get_stride(planeno); let cb = &self.cb; - let mut buffer = frm.get_buffer_mut().unwrap(); - let mut data = buffer.get_data_mut().unwrap(); + let mut data = buf.get_data_mut(); let mut framebuf: &mut [u8] = data.as_mut_slice(); let table = &INDEO2_DELTA_TABLE[tableno]; @@ -262,15 +261,14 @@ impl Indeo2Decoder { } fn decode_plane_inter(&self, br: &mut BitReader, - frm: &mut NAFrame, planeno: usize, + buf: &mut NAVideoBuffer, planeno: usize, tableno: usize) -> DecoderResult<()> { - let offs = frm.get_offset(planeno); - let (w, h) = frm.get_dimensions(planeno); - let stride = frm.get_stride(planeno); + let offs = buf.get_offset(planeno); + let (w, h) = buf.get_dimensions(planeno); + let stride = buf.get_stride(planeno); let cb = &self.cb; - let mut buffer = frm.get_buffer_mut().unwrap(); - let mut data = buffer.get_data_mut().unwrap(); + let mut data = buf.get_data_mut(); let mut framebuf: &mut [u8] = data.as_mut_slice(); let table = &INDEO2_DELTA_TABLE[tableno]; @@ -309,7 +307,6 @@ impl Indeo2Decoder { const IR2_START: usize = 48; impl NADecoder for Indeo2Decoder { - #[allow(unused_variables)] fn init(&mut self, info: Rc) -> DecoderResult<()> { if let NACodecTypeInfo::Video(vinfo) = info.get_properties() { let w = vinfo.get_width(); @@ -318,12 +315,13 @@ impl NADecoder for Indeo2Decoder { 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.frmmgr.clear(); Ok(()) } else { Err(DecoderError::InvalidData) } } - fn decode(&mut self, pkt: &NAPacket) -> DecoderResult> { + fn decode(&mut self, pkt: &NAPacket) -> DecoderResult { let src = pkt.get_buffer(); if src.len() <= IR2_START { return Err(DecoderError::ShortData); } let interframe = src[18]; @@ -332,38 +330,46 @@ impl NADecoder for Indeo2Decoder { let luma_tab = tabs & 3; let chroma_tab = (tabs >> 2) & 3; if interframe != 0 { - let mut frm = NAFrame::new_from_pkt(pkt, self.info.clone()); + 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 mut bufinfo = bufret.unwrap(); + 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 frm, plane, tabidx)?; + self.decode_plane_intra(&mut br, &mut buf, plane, tabidx)?; } - let rcf = Rc::new(frm); - self.lastfrm = Some(rcf.clone()); - Ok(rcf) + 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))) } else { - let lf = self.lastfrm.clone(); - if let None = lf { return Err(DecoderError::MissingReference); } - let lastfr = lf.unwrap(); - let mut frm = NAFrame::from_copy(lastfr.as_ref()); - frm.fill_timestamps(pkt); + let bufret = self.frmmgr.clone_ref(); + if let None = bufret { 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 frm, plane, tabidx)?; + self.decode_plane_inter(&mut br, &mut buf, plane, tabidx)?; } - let rcf = Rc::new(frm); - self.lastfrm = Some(rcf.clone()); - Ok(rcf) + 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))) } } } +pub fn get_decoder() -> Box { + Box::new(Indeo2Decoder::new()) +} + #[cfg(test)] mod test { - use super::*; + use codecs::*; use demuxers::*; use io::byteio::*; - use std::fs::File; - use std::io::prelude::*; #[test] fn test_indeo2() { @@ -373,71 +379,38 @@ mod test { let mut br = ByteReader::new(&mut fr); let mut dmx = avi_dmx.new_demuxer(&mut br); dmx.open().unwrap(); - let mut dec = Indeo2Decoder::new(); - let mut str: u32 = 42; + let mut decs: Vec>> = Vec::new(); for i in 0..dmx.get_num_streams() { let s = dmx.get_stream(i).unwrap(); let info = s.get_info(); - if info.is_video() && info.get_name() == "indeo2" { - str = s.get_id(); - dec.init(s.get_info()).unwrap(); - break; + let decfunc = find_decoder(info.get_name()); + if let Some(df) = decfunc { + let mut dec = (df)(); + dec.init(info).unwrap(); + decs.push(Some(dec)); + } else { + decs.push(None); } } loop { let pktres = dmx.get_frame(); if let Err(e) = pktres { - if (e as i32) == (DemuxerError::EOF as i32) { break; } + if e == DemuxerError::EOF { break; } panic!("error"); } let pkt = pktres.unwrap(); - if pkt.get_stream().get_id() == str { + if pkt.get_pts().unwrap() > 10 { break; } + let streamno = pkt.get_stream().get_id() as usize; + if let Some(ref mut dec) = decs[streamno] { let frm = dec.decode(&pkt).unwrap(); - write_pgmyuv(pkt.get_pts().unwrap(), &frm); + if pkt.get_stream().get_info().is_video() { + write_pgmyuv("iv2", streamno, pkt.get_pts().unwrap(), frm); + } else { + write_sound("iv2", streamno, frm, pkt.get_pts().unwrap() == 0); + } } } } - - fn write_pgmyuv(num: u64, frm: &NAFrame) { - let name = format!("assets/out{:04}.pgm", num); - let mut ofile = File::create(name).unwrap(); - let (w, h) = frm.get_dimensions(0); - let (w2, h2) = frm.get_dimensions(1); - let tot_h = h + h2; - let hdr = format!("P5\n{} {}\n255\n", w, tot_h); - ofile.write_all(hdr.as_bytes()).unwrap(); - let buf = frm.get_buffer(); - let dta = buf.get_data(); - let ls = frm.get_stride(0); - let mut idx = 0; - let mut idx2 = ls; - let mut pad: Vec = Vec::with_capacity((w - w2 * 2) / 2); - pad.resize((w - w2 * 2) / 2, 0xFF); - for _ in 0..h { - let line = &dta[idx..idx2]; - ofile.write_all(line).unwrap(); - idx += ls; - idx2 += ls; - } - let mut base1 = frm.get_offset(1); - let stride1 = frm.get_stride(1); - let mut base2 = frm.get_offset(2); - let stride2 = frm.get_stride(2); - for _ in 0..h2 { - let bend1 = base1 + w2; - let line = &dta[base1..bend1]; - ofile.write_all(line).unwrap(); - ofile.write_all(pad.as_slice()).unwrap(); - - let bend2 = base2 + w2; - let line = &dta[base2..bend2]; - ofile.write_all(line).unwrap(); - ofile.write_all(pad.as_slice()).unwrap(); - - base1 += stride1; - base2 += stride2; - } - } }