X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-indeo%2Fsrc%2Fcodecs%2Findeo3.rs;h=eaef84b2eb31b76aeb7e0ee75bd98d76b701af98;hb=171860fcc4a4ba3ec28bc4b720b9f582377be4cf;hp=793ef630a0c275affd71049c2e39520cebea1719;hpb=3167c45c8087a692192021e08a8063dff680001c;p=nihav.git diff --git a/nihav-indeo/src/codecs/indeo3.rs b/nihav-indeo/src/codecs/indeo3.rs index 793ef63..eaef84b 100644 --- a/nihav-indeo/src/codecs/indeo3.rs +++ b/nihav-indeo/src/codecs/indeo3.rs @@ -1,8 +1,5 @@ -use std::rc::Rc; -use std::cell::RefCell; use nihav_core::formats; use nihav_core::codecs::*; -use nihav_core::frame::*; use nihav_core::io::byteio::*; use std::io::SeekFrom; use std::mem; @@ -21,6 +18,8 @@ struct MV { struct Buffers { width: usize, height: usize, + cw: usize, + ch: usize, buf1: Vec, buf2: Vec, fbuf: bool, @@ -29,7 +28,7 @@ struct Buffers { const DEFAULT_PIXEL: u8 = 0x40; impl Buffers { - fn new() -> Self { Buffers { width: 0, height: 0, buf1: Vec::new(), buf2: Vec::new(), fbuf: true } } + fn new() -> Self { Buffers { width: 0, height: 0, cw: 0, ch: 0, buf1: Vec::new(), buf2: Vec::new(), fbuf: true } } fn reset(&mut self) { self.width = 0; self.height = 0; @@ -39,17 +38,19 @@ impl Buffers { fn alloc(&mut self, w: usize, h: usize) { self.width = w; self.height = h; - self.buf1.resize(w * h + (w >> 2) * (h >> 2) * 2, DEFAULT_PIXEL); - self.buf2.resize(w * h + (w >> 2) * (h >> 2) * 2, DEFAULT_PIXEL); + self.cw = ((w >> 2) + 3) & !3; + self.ch = ((h >> 2) + 3) & !3; + self.buf1.resize(w * h + self.cw * self.ch * 2, DEFAULT_PIXEL); + self.buf2.resize(w * h + self.cw * self.ch * 2, DEFAULT_PIXEL); } fn flip(&mut self) { self.fbuf = !self.fbuf; } fn get_stride(&mut self, planeno: usize) -> usize { - if planeno == 0 { self.width } else { self.width >> 2 } + if planeno == 0 { self.width } else { self.cw } } fn get_offset(&mut self, planeno: usize) -> usize { match planeno { 1 => self.width * self.height, - 2 => self.width * self.height + (self.width >> 2) * (self.height >> 2), + 2 => self.width * self.height + self.cw * self.ch, _ => 0, } } @@ -59,10 +60,10 @@ impl Buffers { let mut doff = fbuf.get_offset(planeno); let sstride = self.get_stride(planeno); let dstride = fbuf.get_stride(planeno); - let width = if planeno == 0 { self.width } else { self.width >> 2 }; + let width = if planeno == 0 { self.width } else { self.width >> 2 }; let height = if planeno == 0 { self.height } else { self.height >> 2 }; let src = if self.fbuf { &self.buf1[0..] } else { &self.buf2[0..] }; - let mut dst = fbuf.get_data_mut(); + let dst = fbuf.get_data_mut().unwrap(); for _ in 0..height { for x in 0..width { dst[doff + x] = src[soff + x] * 2; @@ -234,6 +235,9 @@ fn fill_block8x8(bufs: &mut Buffers, doff: usize, stride: usize, h: usize, topli } let start = if !topline { 0 } else { 1 }; + if topline { + didx += stride; + } if bufs.fbuf { for _ in start..h { for i in 0..8 { bufs.buf1[didx + i] = buf[i]; } @@ -248,7 +252,7 @@ fn fill_block8x8(bufs: &mut Buffers, doff: usize, stride: usize, h: usize, topli } struct Indeo3Decoder { - info: Rc, + info: NACodecInfoRef, bpos: u8, bbuf: u8, width: u16, @@ -324,7 +328,7 @@ const SKIP_OR_TREE: u8 = 2; impl Indeo3Decoder { fn new() -> Self { - let dummy_info = Rc::new(DUMMY_CODEC_INFO); + let dummy_info = NACodecInfo::new_dummy(); Indeo3Decoder { info: dummy_info, bpos: 0, bbuf: 0, width: 0, height: 0, mvs: Vec::new(), altquant: [0; 16], vq_offset: 0, bufs: Buffers::new() } @@ -646,8 +650,9 @@ impl Indeo3Decoder { } let shift = if planeno == 0 { 2 } else { 4 }; - let cell = IV3Cell::new((self.bufs.width >> shift) as u16, - (self.bufs.height >> shift) as u16); + let round = (1 << shift) - 1; + let cell = IV3Cell::new(((self.bufs.width + round) >> shift) as u16, + ((self.bufs.height + round) >> shift) as u16); self.br_reset(); self.parse_tree(br, cell, offs, stride, if planeno > 0 { 10 } else { 40 }, true)?; validate!(br.tell() <= end); @@ -683,13 +688,13 @@ const FLAG_KEYFRAME: u16 = 1 << 2; const FLAG_NONREF: u16 = 1 << 8; impl NADecoder for Indeo3Decoder { - fn init(&mut self, info: Rc) -> DecoderResult<()> { + fn init(&mut self, info: NACodecInfoRef) -> DecoderResult<()> { if let NACodecTypeInfo::Video(vinfo) = info.get_properties() { let w = vinfo.get_width(); let h = vinfo.get_height(); let fmt = formats::YUV410_FORMAT; let myinfo = NACodecTypeInfo::Video(NAVideoInfo::new(w, h, false, 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.bufs.reset(); Ok(()) } else { @@ -752,9 +757,11 @@ impl NADecoder for Indeo3Decoder { let intraframe = (flags & FLAG_KEYFRAME) != 0; let vinfo = self.info.get_properties().get_video_info().unwrap(); - let bufret = alloc_video_buffer(vinfo, 2); + validate!((vinfo.get_width() & !3) == (self.width & !3).into()); + validate!((vinfo.get_height() & !3) == (self.height & !3).into()); + let bufret = alloc_video_buffer(vinfo, 4); if let Err(_) = bufret { return Err(DecoderError::InvalidData); } - let mut bufinfo = bufret.unwrap(); + let bufinfo = bufret.unwrap(); let mut buf = bufinfo.get_vbuf().unwrap(); let ystart = data_start + (yoff as u64); let ustart = data_start + (uoff as u64); @@ -776,7 +783,7 @@ impl NADecoder for Indeo3Decoder { let mut frm = NAFrame::new_from_pkt(pkt, self.info.clone(), bufinfo); frm.set_keyframe(intraframe); frm.set_frame_type(if intraframe { FrameType::I } else { FrameType::P }); - Ok(Rc::new(RefCell::new(frm))) + Ok(frm.into_ref()) } } @@ -798,7 +805,7 @@ mod test { let mut dec_reg = RegisteredDecoders::new(); indeo_register_all_codecs(&mut dec_reg); - test_file_decoding("avi", "assets/iv32_example.avi", Some(10), true, false, None, &dmx_reg, &dec_reg); + test_file_decoding("avi", "assets/Indeo/iv32_example.avi", Some(10), true, false, None, &dmx_reg, &dec_reg); } }