-use std::rc::Rc;
-use std::cell::RefCell;
use nihav_core::io::byteio::{ByteReader,MemoryReader};
use nihav_core::io::bitreader::*;
use nihav_core::io::codebook::*;
use nihav_core::formats;
use nihav_core::codecs::*;
-use nihav_core::frame::*;
use std::fmt;
use std::ops::{Add, Sub};
let mut idxu = buf.get_offset(1) + xpos * 8 + ypos * 8 * strideu;
let mut idxv = buf.get_offset(2) + xpos * 8 + ypos * 8 * stridev;
- let mut data = buf.get_data_mut();
+ let data = buf.get_data_mut().unwrap();
let framebuf: &mut [u8] = data.as_mut_slice();
for j in 0..8 {
let sbuf: &[u8] = sdta.as_slice();
let dstride = dst.get_stride(plane);
let mut doff = dst.get_offset(plane) + x + y * dstride;
- let mut ddta = dst.get_data_mut();
+ let ddta = dst.get_data_mut().unwrap();
let dbuf: &mut [u8] = ddta.as_mut_slice();
for _ in 0..size {
let dst = &mut dbuf[doff..][..size];
let sbuf: &[u8] = sdta.as_slice();
let dstride = dst.get_stride(plane);
let mut doff = dst.get_offset(plane) + x + y * dstride;
- let mut ddta = dst.get_data_mut();
+ let ddta = dst.get_data_mut().unwrap();
let dbuf: &mut [u8] = ddta.as_mut_slice();
for _ in 0..size {
let dst = &mut dbuf[doff..][..size];
let size = if comp == 0 { tile_size } else { tile_size >> 1 };
let stride = buf.get_stride(comp);
let planeoff = buf.get_offset(comp);
- let mut data = buf.get_data_mut();
+ let data = buf.get_data_mut().unwrap();
let framebuf: &mut [u8] = data.as_mut_slice();
let right = size - (w & (size - 1));
#[allow(dead_code)]
struct ClearVideoDecoder {
- info: Rc<NACodecInfo>,
+ info: NACodecInfoRef,
dc_cb: Codebook<i8>,
ac_cb: Codebook<u16>,
frmmgr: HAMShuffler,
impl ClearVideoDecoder {
fn new(is_rm: bool) -> Self {
- let dummy_info = Rc::new(DUMMY_CODEC_INFO);
+ let dummy_info = NACodecInfo::new_dummy();
let mut coderead = CLVDCCodeReader{};
let dc_cb = Codebook::new(&mut coderead, CodebookMode::MSB).unwrap();
let mut coderead = CLVACCodeReader{};
}
impl NADecoder for ClearVideoDecoder {
- fn init(&mut self, info: Rc<NACodecInfo>) -> DecoderResult<()> {
+ fn init(&mut self, _supp: &mut NADecoderSupport, info: NACodecInfoRef) -> DecoderResult<()> {
if info.get_extradata().is_none() { return Err(DecoderError::InvalidData); }
if let NACodecTypeInfo::Video(vinfo) = info.get_properties() {
let w = vinfo.get_width();
let f = vinfo.is_flipped();
let fmt = formats::YUV420_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();
let edata = info.get_extradata().unwrap();
//todo detect simply by extradata contents?
Err(DecoderError::InvalidData)
}
}
- fn decode(&mut self, pkt: &NAPacket) -> DecoderResult<NAFrameRef> {
+ fn decode(&mut self, _supp: &mut NADecoderSupport, pkt: &NAPacket) -> DecoderResult<NAFrameRef> {
let src = pkt.get_buffer();
if src.len() <= 1 { return Err(DecoderError::ShortData); }
let off = if self.is_rm {
let mut frm = NAFrame::new_from_pkt(pkt, self.info.clone(), NABufferType::None);
frm.set_keyframe(false);
frm.set_frame_type(FrameType::Skip);
- return Ok(Rc::new(RefCell::new(frm)));
+ return Ok(frm.into_ref());
}
let is_intra = (src[off] & 2) == 2;
let vinfo = self.info.get_properties().get_video_info().unwrap();
let bufret = alloc_video_buffer(vinfo, self.tsize);
if let Err(_) = bufret { return Err(DecoderError::InvalidData); }
- let mut bufinfo = bufret.unwrap();
+ let bufinfo = bufret.unwrap();
let mut buf = bufinfo.get_vbuf().unwrap();
if is_intra {
} else {
frm.set_frame_type(FrameType::P);
}
- Ok(Rc::new(RefCell::new(frm)))
+ Ok(frm.into_ref())
}
}
#[cfg(test)]
mod test {
- use crate::test::dec_video::test_file_decoding;
+ use nihav_core::codecs::RegisteredDecoders;
+ use nihav_core::demuxers::RegisteredDemuxers;
+ use nihav_core::test::dec_video::test_file_decoding;
+ use crate::codecs::generic_register_all_codecs;
+ use crate::demuxers::generic_register_all_demuxers;
#[test]
fn test_clv() {
- test_file_decoding("avi", "assets/TalkingHead_352x288.avi", Some(10), true, false, None/*Some("clv")*/);
-// test_file_decoding("avi", "assets/basketball.avi", None/*Some(10)*/, true, false, Some("clv1"));
+ let mut dmx_reg = RegisteredDemuxers::new();
+ generic_register_all_demuxers(&mut dmx_reg);
+ let mut dec_reg = RegisteredDecoders::new();
+ generic_register_all_codecs(&mut dec_reg);
+ test_file_decoding("avi", "assets/Misc/TalkingHead_352x288.avi", Some(10), true, false, None/*Some("clv")*/, &dmx_reg, &dec_reg);
+// test_file_decoding("avi", "assets/Misc/basketball.avi", None/*Some(10)*/, true, false, Some("clv1"));
//panic!("debug");
}
}