X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-realmedia%2Fsrc%2Fcodecs%2Frv40.rs;h=d1d16c1bac5f3ba719dfd8af447841bae61f8d96;hb=951a626bb478d30a69e3b7ac7f76edfbb5db44aa;hp=91f6e78a97490fa61de1bf75613d00582b86f865;hpb=1702ecec603fe6d75e16b06f3408831ec3d6e75b;p=nihav.git

diff --git a/nihav-realmedia/src/codecs/rv40.rs b/nihav-realmedia/src/codecs/rv40.rs
index 91f6e78..d1d16c1 100644
--- a/nihav-realmedia/src/codecs/rv40.rs
+++ b/nihav-realmedia/src/codecs/rv40.rs
@@ -324,10 +324,6 @@ impl NADecoder for RealVideo40Decoder {
             let edata = info.get_extradata().unwrap();
             let src: &[u8] = &edata;
 
-{
-println!("edata:");
-for i in 0..src.len() { print!(" {:02X}", src[i]); } println!();
-}
             if src.len() < 2 { return Err(DecoderError::InvalidData); }
 
             self.bd.width  = vinfo.get_width();
@@ -338,7 +334,6 @@ for i in 0..src.len() { print!(" {:02X}", src[i]); } println!();
 
             Ok(())
         } else {
-println!("???");
             Err(DecoderError::InvalidData)
         }
     }
@@ -358,6 +353,12 @@ println!("???");
     }
 }
 
+impl NAOptionHandler for RealVideo40Decoder {
+    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(RealVideo40Decoder::new())
 }
@@ -367,14 +368,15 @@ mod test {
     use nihav_core::codecs::RegisteredDecoders;
     use nihav_core::demuxers::RegisteredDemuxers;
     use nihav_codec_support::test::dec_video::*;
-    use crate::realmedia_register_all_codecs;
+    use crate::realmedia_register_all_decoders;
     use crate::realmedia_register_all_demuxers;
+    // samples from a private collection
     #[test]
     fn test_rv40() {
         let mut dmx_reg = RegisteredDemuxers::new();
         realmedia_register_all_demuxers(&mut dmx_reg);
         let mut dec_reg = RegisteredDecoders::new();
-        realmedia_register_all_codecs(&mut dec_reg);
+        realmedia_register_all_decoders(&mut dec_reg);
 
         test_decoding("realmedia", "realvideo4", "assets/RV/rv40_weighted_mc.rmvb", Some(1500),
                       &dmx_reg, &dec_reg,ExpectedTestResult::MD5Frames(vec![