introduce option handling for decoders

[nihav.git] / nihav-duck / src / codecs / truemotion2.rs

diff --git a/nihav-duck/src/codecs/truemotion2.rs b/nihav-duck/src/codecs/truemotion2.rs
index 0d937e0ee83ef5c65b64377d749936405962b63d..d0ef79361d7326d04e37fdf12f109cec846628d5 100644 (file)
--- a/nihav-duck/src/codecs/truemotion2.rs
+++ b/nihav-duck/src/codecs/truemotion2.rs
@@ -145,7 +145,7 @@ impl TM2Stream {
         validate!(pos <= endpos);
         let toskip = endpos - pos;
                                                   br.read_skip(toskip as usize)?;
-        
+
         Ok(())
     }
     fn read_deltas(&mut self, src: &[u8]) -> DecoderResult<usize> {
@@ -164,7 +164,7 @@ impl TM2Stream {
                 self.deltas[i] = val as i32;
             }
         }
-        
+
         Ok(((br.tell() + 31) >> 5) << 2)
     }
     fn read_huff_tree(&mut self, src: &[u8], htree: &mut HuffTree) -> DecoderResult<usize> {
@@ -186,7 +186,7 @@ impl TM2Stream {
             let mut cr = FullCodebookDescReader::new(codes);
             htree.cb = Some(Codebook::new(&mut cr, CodebookMode::MSB)?);
         }
-        
+
         Ok(((br.tell() + 31) >> 5) << 2)
     }
     fn read_tokens(&mut self, src: &[u8], htree: &HuffTree, ntoks: usize) -> DecoderResult<usize> {
@@ -198,7 +198,7 @@ impl TM2Stream {
                 self.tokens.push(tok);
             }
         }
-        
+
         Ok(((br.tell() + 31) >> 5) << 2)
     }
 
@@ -581,6 +581,12 @@ impl NADecoder for TM2Decoder {
     }
 }
 
+impl NAOptionHandler for TM2Decoder {
+    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(TM2Decoder::new())
 }
@@ -589,9 +595,9 @@ pub fn get_decoder() -> Box<dyn NADecoder + Send> {
 mod test {
     use nihav_core::codecs::RegisteredDecoders;
     use nihav_core::demuxers::RegisteredDemuxers;
-    use nihav_core::test::dec_video::*;
-    use crate::codecs::duck_register_all_codecs;
-    use nihav_commonfmt::demuxers::generic_register_all_demuxers;
+    use nihav_codec_support::test::dec_video::*;
+    use crate::duck_register_all_codecs;
+    use nihav_commonfmt::generic_register_all_demuxers;
     #[test]
     fn test_tm2() {
         let mut dmx_reg = RegisteredDemuxers::new();