];
struct SmackerVideoDecoder {
- info: Rc<NACodecInfo>,
+ info: NACodecInfoRef,
mmap_tree: SmackerTree16,
mclr_tree: SmackerTree16,
full_tree: SmackerTree16,
impl SmackerVideoDecoder {
fn new() -> Self {
- let dummy_info = Rc::new(DUMMY_CODEC_INFO);
Self {
- info: dummy_info,
+ info: NACodecInfoRef::default(),
mmap_tree: SmackerTree16::new(),
mclr_tree: SmackerTree16::new(),
full_tree: SmackerTree16::new(),
}
fn output_frame(&self, buf: &mut NAVideoBuffer<u8>) {
let stride = buf.get_stride(0);
- let mut data = buf.get_data_mut();
+ let data = buf.get_data_mut().unwrap();
let dst = data.as_mut_slice();
let is_scaled = (self.flags & SMK_FLAG_SCALED) != 0;
let is_interlaced = (self.flags & SMK_FLAG_INTERLACED) != 0;
}
impl NADecoder for SmackerVideoDecoder {
- 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();
out_h <<= 1;
}
let myinfo = NACodecTypeInfo::Video(NAVideoInfo::new(w, out_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();
Ok(())
} else {
is_intra = self.decode_frame(&mut br)?;
self.output_frame(&mut buf);
let paloff = buf.get_offset(1);
- let mut data = buf.get_data_mut();
+ let data = buf.get_data_mut().unwrap();
let dst = data.as_mut_slice();
let palout = &mut dst[paloff..][..PAL_SIZE];
palout.copy_from_slice(&src[0..PAL_SIZE]);
}
impl NADecoder for SmackerAudioDecoder {
- fn init(&mut self, info: Rc<NACodecInfo>) -> DecoderResult<()> {
+ fn init(&mut self, info: NACodecInfoRef) -> DecoderResult<()> {
if let NACodecTypeInfo::Audio(ainfo) = info.get_properties() {
self.bits = ainfo.get_format().get_bits();
let fmt = if self.bits == 8 { SND_U8_FORMAT } else { SND_S16P_FORMAT };
abuf = alloc_audio_buffer(self.ainfo, samples, self.chmap.clone())?;
let mut adata = abuf.get_abuf_i16().unwrap();
let offs: [usize; 2] = [0, adata.get_offset(1)];
- let mut dst = adata.get_data_mut();
+ let dst = adata.get_data_mut().unwrap();
for ch in 0..nch {
dst[offs[ch]] = pred[ch];
}
samples = unp_size / nch;
abuf = alloc_audio_buffer(self.ainfo, samples, self.chmap.clone())?;
let mut adata = abuf.get_abuf_u8().unwrap();
- let mut dst = adata.get_data_mut();
+ let dst = adata.get_data_mut().unwrap();
if stereo {
let mut trees: [SmackerTree8; 2] = [SmackerTree8::new(), SmackerTree8::new()];
trees[0].decode(&mut br)?;