X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-commonfmt%2Fsrc%2Fcodecs%2Fts102366.rs;h=a2ee21cc5a42251257ad11be9e433bdd81923753;hb=6f2630992fe340ad1a122ec10c649f756e478185;hp=4f270cc56ad1323df0f31d45f92baabd8d7f56a3;hpb=ce742854b2912b880fb3d3e330042b049dac8504;p=nihav.git

diff --git a/nihav-commonfmt/src/codecs/ts102366.rs b/nihav-commonfmt/src/codecs/ts102366.rs
index 4f270cc..a2ee21c 100644
--- a/nihav-commonfmt/src/codecs/ts102366.rs
+++ b/nihav-commonfmt/src/codecs/ts102366.rs
@@ -170,6 +170,7 @@ const FRAME_SIZES: [[usize; 64]; 4] = [
 ];
 
 #[derive(Debug,Clone,Copy)]
+#[allow(dead_code)]
 struct Syncinfo {
     crc1:       u16,
     fscod:      u8,
@@ -260,21 +261,17 @@ impl ACMode {
         chmap
     }
     fn is_3_x(self) -> bool {
-        match self {
+        matches!(self,
             ACMode::Mode3_0 |
             ACMode::Mode3_1 |
-            ACMode::Mode3_2     => true,
-            _                   => false,
-        }
+            ACMode::Mode3_2)
     }
     fn is_surround(self) -> bool {
-        match self {
+        matches!(self,
             ACMode::Mode2_1 |
             ACMode::Mode3_1 |
             ACMode::Mode2_2 |
-            ACMode::Mode3_2     => true,
-            _                   => false,
-        }
+            ACMode::Mode3_2)
     }
 }
 
@@ -286,6 +283,7 @@ const AC_MODES: [ACMode; 8] = [
 ];
 
 #[derive(Debug,Clone,Copy)]
+#[allow(dead_code)]
 struct Mixinfo {
     dialnorm:   u8,
     compr:      Option<u8>,
@@ -312,6 +310,7 @@ impl Mixinfo {
 }
 
 #[derive(Debug,Clone,Copy)]
+#[allow(dead_code)]
 struct BSI {
     bsid:       u8,
     shift:      u8,
@@ -831,6 +830,7 @@ impl AudioBlock {
             bap_buf_fill:   [0; 3],
         }
     }
+    #[allow(clippy::cognitive_complexity)]
     fn read(&mut self, br: &mut BitReader, bsi: &BSI, fscod: usize, blk_no: usize) -> DecoderResult<bool> {
         let channels = bsi.acmod.get_num_channels();
         let is_stereo = bsi.acmod == ACMode::Stereo;
@@ -1240,6 +1240,12 @@ impl NADecoder for AudioDecoder {
     }
 }
 
+impl NAOptionHandler for AudioDecoder {
+    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() -> Box<dyn NADecoder + Send> {
     Box::new(AudioDecoder::new())
 }
@@ -1249,15 +1255,16 @@ mod test {
     use nihav_core::codecs::RegisteredDecoders;
     use nihav_core::demuxers::RegisteredDemuxers;
     use nihav_codec_support::test::dec_video::test_decode_audio;
-    use crate::generic_register_all_codecs;
+    use crate::generic_register_all_decoders;
     use nihav_realmedia::realmedia_register_all_demuxers;
     #[test]
     fn test_ts102366() {
         let mut dmx_reg = RegisteredDemuxers::new();
         realmedia_register_all_demuxers(&mut dmx_reg);
         let mut dec_reg = RegisteredDecoders::new();
-        generic_register_all_codecs(&mut dec_reg);
+        generic_register_all_decoders(&mut dec_reg);
 
+        // sample: https://samples.mplayerhq.hu/real/VC-RV10/sp_sample1.rm
         let file = "assets/RV/sp_sample1.rm";
         test_decode_audio("realmedia", file, Some(12000), None/*Some("ac3")*/, &dmx_reg, &dec_reg);
     }