-use std::rc::Rc;
-use std::cell::RefCell;
use nihav_core::formats;
use nihav_core::codecs::*;
use nihav_core::io::byteio::*;
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;
}
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]; }
}
struct Indeo3Decoder {
- info: Rc<NACodecInfo>,
+ info: NACodecInfoRef,
bpos: u8,
bbuf: u8,
width: u16,
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() }
const FLAG_NONREF: u16 = 1 << 8;
impl NADecoder for Indeo3Decoder {
- fn init(&mut self, info: Rc<NACodecInfo>) -> 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 {
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);
}
}