];
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(),
}
impl NADecoder for SmackerVideoDecoder {
- fn init(&mut self, info: Rc<NACodecInfo>) -> 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();
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)?;
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<NAFrameRef> {
+ fn decode(&mut self, _supp: &mut NADecoderSupport, pkt: &NAPacket) -> DecoderResult<NAFrameRef> {
let src = pkt.get_buffer();
validate!(src.len() >= PAL_SIZE);
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 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<NADecoder> {
+pub fn get_decoder_video() -> Box<dyn NADecoder + Send> {
Box::new(SmackerVideoDecoder::new())
}
}
impl NADecoder for SmackerAudioDecoder {
- fn init(&mut self, info: Rc<NACodecInfo>) -> 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 };
+ let fmt = if self.bits == 8 { SND_U8_FORMAT } else { SND_S16_FORMAT };
self.chans = ainfo.get_channels() as usize;
self.ainfo = NAAudioInfo::new(ainfo.get_sample_rate(), ainfo.get_channels(), fmt, 0);
self.chmap = NAChannelMap::from_str(if ainfo.get_channels() == 2 {"L,R"} else {"C"}).unwrap();
Err(DecoderError::InvalidData)
}
}
- fn decode(&mut self, pkt: &NAPacket) -> DecoderResult<NAFrameRef> {
+ fn decode(&mut self, _supp: &mut NADecoderSupport, pkt: &NAPacket) -> DecoderResult<NAFrameRef> {
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()?;
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 dst = adata.get_data_mut().unwrap();
for ch in 0..nch {
- dst[offs[ch]] = pred[ch];
+ dst[ch] = pred[ch];
}
for i in nch..(unp_size >> 1) {
let idx = i & mask;
let hi = br.read_tree8(&trees[idx * 2 + 1])? as u16;
let diff = (lo | (hi << 8)) as i16;
pred[idx] = pred[idx].wrapping_add(diff);
- dst[offs[idx] + (i >> 1)] = pred[idx];
+ dst[i] = pred[idx];
}
} else {
samples = unp_size / nch;
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<NADecoder> {
+pub fn get_decoder_audio() -> Box<dyn NADecoder + Send> {
Box::new(SmackerAudioDecoder::new())
}
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();
//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);
}
}
projects / nihav.git / blobdiff