X-Git-Url: https://git.nihav.org/?p=nihav.git;a=blobdiff_plain;f=nihav-rad%2Fsrc%2Fcodecs%2Fsmacker.rs;h=0d681dc19809b1c792b69e26386f435bd37cf692;hp=3d32c21b65a316399dfedc93205155065308c5da;hb=78fb6560c73965d834b215fb0b49505ae5443288;hpb=70e792a8d49bc44d2137752bfc35aceb7023f7fa

diff --git a/nihav-rad/src/codecs/smacker.rs b/nihav-rad/src/codecs/smacker.rs
index 3d32c21..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 {
@@ -469,6 +469,12 @@ impl NADecoder for SmackerVideoDecoder {
     }
 }
 
+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())
 }
@@ -504,6 +510,7 @@ impl NADecoder for SmackerAudioDecoder {
             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() {
@@ -594,6 +601,12 @@ impl NADecoder for SmackerAudioDecoder {
     }
 }
 
+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())
 }
@@ -603,30 +616,46 @@ mod test {
     use nihav_core::codecs::RegisteredDecoders;
     use nihav_core::demuxers::RegisteredDemuxers;
     use nihav_codec_support::test::dec_video::*;
-    use crate::rad_register_all_codecs;
+    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, None/*Some("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]));
     }
 }