}
fn decode_plane_intra(&self, br: &mut BitReader,
- frm: &mut NAFrame, planeno: usize,
+ buf: &mut NAVideoBuffer<u8>, 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();
- let mut data = buffer.get_data_mut();
+ let mut data = buf.get_data_mut();
let mut framebuf: &mut [u8] = data.as_mut_slice();
let table = &INDEO2_DELTA_TABLE[tableno];
}
fn decode_plane_inter(&self, br: &mut BitReader,
- frm: &mut NAFrame, planeno: usize,
+ buf: &mut NAVideoBuffer<u8>, 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();
- let mut data = buffer.get_data_mut();
+ let mut data = buf.get_data_mut();
let mut framebuf: &mut [u8] = data.as_mut_slice();
let table = &INDEO2_DELTA_TABLE[tableno];
const IR2_START: usize = 48;
impl NADecoder for Indeo2Decoder {
- #[allow(unused_variables)]
fn init(&mut self, info: Rc<NACodecInfo>) -> DecoderResult<()> {
if let NACodecTypeInfo::Video(vinfo) = info.get_properties() {
let w = vinfo.get_width();
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());
- frm.set_keyframe(true);
- frm.set_frame_type(FrameType::I);
+ 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)?;
}
- self.frmmgr.add_frame(frm);
+ 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 frmref = self.frmmgr.clone_ref();
- if let None = frmref { return Err(DecoderError::MissingReference); }
- let ffrmref = frmref.unwrap();
- let mut frm = ffrmref.borrow_mut();
- frm.set_keyframe(false);
- frm.set_frame_type(FrameType::P);
- 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 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(self.frmmgr.get_output_frame().unwrap())
}
}
#[cfg(test)]
mod test {
- use codecs;
+ use codecs::*;
use demuxers::*;
use frame::NAFrameRef;
use io::byteio::*;
- use std::fs::File;
- use std::io::prelude::*;
#[test]
fn test_indeo2() {
let mut br = ByteReader::new(&mut fr);
let mut dmx = avi_dmx.new_demuxer(&mut br);
dmx.open().unwrap();
- let mut dec = (codecs::find_decoder("indeo2").unwrap())();//Indeo2Decoder::new();
- let mut str: u32 = 42;
+ let mut decs: Vec<Option<Box<NADecoder>>> = 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);
}
}
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, frmref: NAFrameRef) {
- let frm = frmref.borrow();
- 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<u8> = 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;
- }
- }
}
projects / nihav.git / blobdiff