X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-realmedia%2Fsrc%2Fcodecs%2Frv30.rs;h=655902dcd7aebc91c4f7cf87b2556e8c7330f02e;hb=38df3d11b3686cbd6982cc073a7c55c6c1043461;hp=81021d497a2965937b97a143d618056ee66c5110;hpb=708606385135bb08ddde1997f7f7090622bbc717;p=nihav.git

diff --git a/nihav-realmedia/src/codecs/rv30.rs b/nihav-realmedia/src/codecs/rv30.rs
index 81021d4..655902d 100644
--- a/nihav-realmedia/src/codecs/rv30.rs
+++ b/nihav-realmedia/src/codecs/rv30.rs
@@ -145,7 +145,6 @@ impl NADecoder for RealVideo30Decoder {
 
             Ok(())
         } else {
-println!("???");
             Err(DecoderError::InvalidData)
         }
     }
@@ -165,6 +164,12 @@ println!("???");
     }
 }
 
+impl NAOptionHandler for RealVideo30Decoder {
+    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(RealVideo30Decoder::new())
 }
@@ -174,15 +179,16 @@ 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;
     #[test]
     fn test_rv30() {
         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);
 
+        // sample from a private collection
         test_decoding("realmedia", "realvideo3", "assets/RV/rv30_weighted_mc.rm", Some(700),
                       &dmx_reg, &dec_reg, ExpectedTestResult::MD5Frames(vec![
                             [0x2a4d13bf, 0x2f21f3c9, 0xcbd601be, 0x61a6405c],
@@ -200,6 +206,7 @@ mod test {
                             [0x7b38660e, 0xa46f4080, 0xa493f422, 0x36eaaa3b],
                             [0x6375934a, 0xf2a23087, 0x367f9738, 0xf2251e09],
                             [0x54bcefe7, 0xbbc91dc7, 0x0acec7d7, 0x95cf6d02]]));
+        // sample: https://samples.mplayerhq.hu/real/VC-RV30/simpsons-clip.rm
         test_decoding("realmedia", "realvideo3", "assets/RV/simpsons-clip.rm", Some(1337),
                       &dmx_reg, &dec_reg,
                       ExpectedTestResult::MD5([0x36604117, 0x415f95cc, 0xec38e776, 0x9818d3be]));