X-Git-Url: https://git.nihav.org/?p=nihav.git;a=blobdiff_plain;f=nihav-rad%2Fsrc%2Fcodecs%2Fsmacker.rs;h=0d681dc19809b1c792b69e26386f435bd37cf692;hp=f3628bedc6f6e92a1e1a0041dd63056639b596eb;hb=78fb6560c73965d834b215fb0b49505ae5443288;hpb=01613464323864a655c994820d3c43df1954e3b2 diff --git a/nihav-rad/src/codecs/smacker.rs b/nihav-rad/src/codecs/smacker.rs index f3628be..0d681dc 100644 --- a/nihav-rad/src/codecs/smacker.rs +++ b/nihav-rad/src/codecs/smacker.rs @@ -367,7 +367,7 @@ impl SmackerVideoDecoder { let mut didx = 0; let mut sidx = 0; for _ in 0..self.h { - for x in 0..self.w { dst[didx + x] = self.frame[sidx + x]; } + dst[didx..][..self.w].copy_from_slice(&self.frame[sidx..][..self.w]); sidx += self.stride; didx += stride; if is_scaled { @@ -413,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)?; @@ -442,11 +442,9 @@ 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); @@ -467,9 +465,17 @@ impl NADecoder for SmackerVideoDecoder { frm.set_frame_type(ftype); Ok(frm.into_ref()) } + fn flush(&mut self) { + } +} + +impl NAOptionHandler for SmackerVideoDecoder { + fn get_supported_options(&self) -> &[NAOptionDefinition] { &[] } + fn set_options(&mut self, _options: &[NAOption]) { } + fn query_option_value(&self, _name: &str) -> Option { None } } -pub fn get_decoder_video() -> Box { +pub fn get_decoder_video() -> Box { Box::new(SmackerVideoDecoder::new()) } @@ -495,7 +501,7 @@ impl NADecoder for SmackerAudioDecoder { 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(); @@ -504,12 +510,13 @@ impl NADecoder for SmackerAudioDecoder { Err(DecoderError::InvalidData) } } + #[allow(clippy::manual_memcpy)] 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); @@ -540,10 +547,9 @@ 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 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; @@ -551,7 +557,7 @@ impl NADecoder for SmackerAudioDecoder { 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; @@ -591,9 +597,17 @@ impl NADecoder for SmackerAudioDecoder { Err(DecoderError::InvalidData) } } + fn flush(&mut self) { + } +} + +impl NAOptionHandler for SmackerAudioDecoder { + fn get_supported_options(&self) -> &[NAOptionDefinition] { &[] } + fn set_options(&mut self, _options: &[NAOption]) { } + fn query_option_value(&self, _name: &str) -> Option { None } } -pub fn get_decoder_audio() -> Box { +pub fn get_decoder_audio() -> Box { Box::new(SmackerAudioDecoder::new()) } @@ -601,31 +615,47 @@ 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_decoders; + use crate::rad_register_all_demuxers; #[test] fn test_smkvid() { let mut dmx_reg = RegisteredDemuxers::new(); rad_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - rad_register_all_codecs(&mut dec_reg); + rad_register_all_decoders(&mut dec_reg); + + test_decoding("smacker", "smacker-video", "assets/RAD/credits.smk", None, &dmx_reg, &dec_reg, + ExpectedTestResult::MD5Frames(vec![ + [0x0983944a, 0xa23503f8, 0x2602b589, 0x13b53480], + [0xb6c2bf1e, 0x2ee5fa60, 0x9896a6dc, 0x760b5737], + [0xc7c6d112, 0x2c3c5bac, 0x63684974, 0xa6573b1e], + [0x100e2871, 0xbc670db7, 0x54a802e5, 0xb5ba0b07], + [0xcd9d22ce, 0x7f195dc9, 0x93c47105, 0x6acf8aa7], + [0x84e82fdb, 0x304f24a8, 0x17466d73, 0x20182c33], + [0xfcae613f, 0xddab2bd4, 0x9d351ee5, 0x2d0aea24], + [0xea32a37c, 0x94d76dda, 0xbb34ca1d, 0xfc9d8a25], + [0x37855f28, 0xb508a386, 0x1f0bd981, 0x0f967e25], + [0x9b9f453a, 0xf6e34fe7, 0x9279fd71, 0x850a4f36]])); + } + #[test] + fn test_smkaud_u8() { + let mut dmx_reg = RegisteredDemuxers::new(); + rad_register_all_demuxers(&mut dmx_reg); + let mut dec_reg = RegisteredDecoders::new(); + rad_register_all_decoders(&mut dec_reg); - //let file = "assets/RAD/20130507_audio-distortion.smk"; - //let file = "assets/RAD/ajfstr1.smk"; - //let file = "assets/RAD/credits.smk"; - let file = "assets/RAD/wetlogo.smk"; - test_file_decoding("smacker", file, Some(1000), true, false, None, &dmx_reg, &dec_reg); + test_decoding("smacker", "smacker-audio", "assets/RAD/wetlogo.smk", None, &dmx_reg, &dec_reg, + ExpectedTestResult::MD5([0xc686b833, 0x0a203038, 0x012f6d9b, 0xa4186d44])); } #[test] - fn test_smkaud() { + fn test_smkaud_s16() { let mut dmx_reg = RegisteredDemuxers::new(); rad_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - rad_register_all_codecs(&mut dec_reg); + rad_register_all_decoders(&mut dec_reg); - //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_decoding("smacker", "smacker-audio", "assets/RAD/20130507_audio-distortion.smk", None, &dmx_reg, &dec_reg, + ExpectedTestResult::MD5([0x942a0922, 0x182bb5fd, 0x94ab7a59, 0x2028d810])); } }