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 {
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)?;
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);
bufinfo = alloc_video_buffer(self.info.get_properties().get_video_info().unwrap(), 2)?;
let mut buf = bufinfo.get_vbuf().unwrap();
}
}
-pub fn get_decoder_video() -> Box<dyn NADecoder> {
+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<NAValue> { None }
+}
+
+pub fn get_decoder_video() -> Box<dyn NADecoder + Send> {
Box::new(SmackerVideoDecoder::new())
}
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)
}
}
+ #[allow(clippy::manual_memcpy)]
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);
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;
}
}
-pub fn get_decoder_audio() -> Box<dyn NADecoder> {
+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<NAValue> { None }
+}
+
+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_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);
+
+ // sample from Heroes of Might and Magic 2
+ 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);
+ // sample: https://samples.mplayerhq.hu/game-formats/smacker/wetlands/wetlogo.smk
+ 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, None/*Some("smk")*/, &dmx_reg, &dec_reg);
+ // sample: https://samples.mplayerhq.hu/game-formats/smacker/20130507_audio-distortion.smk
+ test_decoding("smacker", "smacker-audio", "assets/RAD/20130507_audio-distortion.smk", None, &dmx_reg, &dec_reg,
+ ExpectedTestResult::MD5([0x942a0922, 0x182bb5fd, 0x94ab7a59, 0x2028d810]));
}
}