X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-rad%2Fsrc%2Fcodecs%2Fsmacker.rs;h=650fddde8d2b44944cb9b373d49658429faba8ba;hb=ce742854b2912b880fb3d3e330042b049dac8504;hp=c77b14ffcf8d83a13466d70c49d6af7d8f5594ff;hpb=af37e28afd991bca600b97a1cb97bc3ad358bc4f;p=nihav.git diff --git a/nihav-rad/src/codecs/smacker.rs b/nihav-rad/src/codecs/smacker.rs index c77b14f..650fddd 100644 --- a/nihav-rad/src/codecs/smacker.rs +++ b/nihav-rad/src/codecs/smacker.rs @@ -210,7 +210,7 @@ const SMK_BLOCK_RUNS: [usize; 64] = [ ]; struct SmackerVideoDecoder { - info: Rc, + info: NACodecInfoRef, mmap_tree: SmackerTree16, mclr_tree: SmackerTree16, full_tree: SmackerTree16, @@ -227,9 +227,8 @@ struct SmackerVideoDecoder { 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(), @@ -361,7 +360,7 @@ impl SmackerVideoDecoder { } fn output_frame(&self, buf: &mut NAVideoBuffer) { 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; @@ -388,7 +387,7 @@ impl SmackerVideoDecoder { } impl NADecoder for SmackerVideoDecoder { - fn init(&mut self, info: Rc) -> DecoderResult<()> { + fn init(&mut self, _supp: &mut NADecoderSupport, info: NACodecInfoRef) -> DecoderResult<()> { if let NACodecTypeInfo::Video(vinfo) = info.get_properties() { let w = vinfo.get_width(); let h = vinfo.get_height(); @@ -414,7 +413,7 @@ impl NADecoder for SmackerVideoDecoder { let type_size = br.read_u32le()?; self.is_ver4 = (magic & 0xFF) == 0x34; - let mut br = BitReader::new(&edata[24..], edata.len() - 24, BitReaderMode::LE); + let mut br = BitReader::new(&edata[24..], BitReaderMode::LE); self.mmap_tree.decode(&mut br, mmap_size)?; self.mclr_tree.decode(&mut br, mclr_size)?; self.full_tree.decode(&mut br, full_size)?; @@ -428,15 +427,14 @@ impl NADecoder for SmackerVideoDecoder { 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 { Err(DecoderError::InvalidData) } } - fn decode(&mut self, pkt: &NAPacket) -> DecoderResult { + fn decode(&mut self, _supp: &mut NADecoderSupport, pkt: &NAPacket) -> DecoderResult { let src = pkt.get_buffer(); validate!(src.len() >= PAL_SIZE); @@ -444,16 +442,14 @@ impl NADecoder for SmackerVideoDecoder { let ftype; let bufinfo; if src.len() > PAL_SIZE { - let mut br = BitReader::new(&src[PAL_SIZE..], src.len() - PAL_SIZE, BitReaderMode::LE); + let mut br = BitReader::new(&src[PAL_SIZE..], BitReaderMode::LE); - let bufret = alloc_video_buffer(self.info.get_properties().get_video_info().unwrap(), 2); - if let Err(_) = bufret { return Err(DecoderError::InvalidData); } - bufinfo = bufret.unwrap(); + bufinfo = alloc_video_buffer(self.info.get_properties().get_video_info().unwrap(), 2)?; let mut buf = bufinfo.get_vbuf().unwrap(); 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]); @@ -467,11 +463,13 @@ impl NADecoder for SmackerVideoDecoder { let mut frm = NAFrame::new_from_pkt(pkt, self.info.clone(), bufinfo); frm.set_keyframe(is_intra); frm.set_frame_type(ftype); - Ok(Rc::new(RefCell::new(frm))) + Ok(frm.into_ref()) + } + fn flush(&mut self) { } } -pub fn get_decoder_video() -> Box { +pub fn get_decoder_video() -> Box { Box::new(SmackerVideoDecoder::new()) } @@ -494,7 +492,7 @@ impl SmackerAudioDecoder { } impl NADecoder for SmackerAudioDecoder { - fn init(&mut self, info: Rc) -> DecoderResult<()> { + fn init(&mut self, _supp: &mut NADecoderSupport, 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 }; @@ -506,17 +504,17 @@ impl NADecoder for SmackerAudioDecoder { Err(DecoderError::InvalidData) } } - fn decode(&mut self, pkt: &NAPacket) -> DecoderResult { + fn decode(&mut self, _supp: &mut NADecoderSupport, pkt: &NAPacket) -> DecoderResult { let info = pkt.get_stream().get_info(); if let NACodecTypeInfo::Audio(_) = info.get_properties() { let src = pkt.get_buffer(); validate!(src.len() > 4); - let mut br = BitReader::new(&src, src.len(), BitReaderMode::LE); + let mut br = BitReader::new(&src, BitReaderMode::LE); let unp_size = br.read(32)? as usize; if !br.read_bool()? { let mut frm = NAFrame::new_from_pkt(pkt, info.clone(), NABufferType::None); frm.set_frame_type(FrameType::Skip); - return Ok(Rc::new(RefCell::new(frm))); + return Ok(frm.into_ref()); } let stereo = br.read_bool()?; let bits16 = br.read_bool()?; @@ -543,7 +541,7 @@ impl NADecoder for SmackerAudioDecoder { 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]; } @@ -559,7 +557,7 @@ impl NADecoder for SmackerAudioDecoder { 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)?; @@ -588,14 +586,16 @@ impl NADecoder for SmackerAudioDecoder { let mut frm = NAFrame::new_from_pkt(pkt, info, abuf); frm.set_duration(Some(samples as u64)); frm.set_keyframe(false); - Ok(Rc::new(RefCell::new(frm))) + Ok(frm.into_ref()) } else { Err(DecoderError::InvalidData) } } + fn flush(&mut self) { + } } -pub fn get_decoder_audio() -> Box { +pub fn get_decoder_audio() -> Box { Box::new(SmackerAudioDecoder::new()) } @@ -603,9 +603,9 @@ pub fn get_decoder_audio() -> Box { mod test { use nihav_core::codecs::RegisteredDecoders; use nihav_core::demuxers::RegisteredDemuxers; - use nihav_core::test::dec_video::*; - use crate::codecs::rad_register_all_codecs; - use crate::demuxers::rad_register_all_demuxers; + use nihav_codec_support::test::dec_video::*; + use crate::rad_register_all_codecs; + use crate::rad_register_all_demuxers; #[test] fn test_smkvid() { let mut dmx_reg = RegisteredDemuxers::new(); @@ -628,6 +628,6 @@ mod test { //let file = "assets/RAD/20130507_audio-distortion.smk"; let file = "assets/RAD/wetlogo.smk"; - test_decode_audio("smacker", file, None, "smk", &dmx_reg, &dec_reg); + test_decode_audio("smacker", file, None, None/*Some("smk")*/, &dmx_reg, &dec_reg); } }