X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-realmedia%2Fsrc%2Fdemuxers%2Frealmedia.rs;h=f508c6a58387387a9a63de686feb0ab6de61bf2b;hb=3518aa855fa776fa96a0deca1660299611e41e96;hp=74581d934c93774385b144637e03009753d9e6b7;hpb=a480a0de101483d802a11e72d758dae00fa4860a;p=nihav.git

diff --git a/nihav-realmedia/src/demuxers/realmedia.rs b/nihav-realmedia/src/demuxers/realmedia.rs
index 74581d9..f508c6a 100644
--- a/nihav-realmedia/src/demuxers/realmedia.rs
+++ b/nihav-realmedia/src/demuxers/realmedia.rs
@@ -44,7 +44,7 @@ impl RMVideoStream {
         }
     }
     fn flush(&mut self) {
-        self.frame.truncate(0);
+        self.frame.clear();
         self.frame_size = 0;
         self.frame_pos  = 0;
     }
@@ -797,6 +797,7 @@ struct InterleaveInfo {
 }
 
 #[derive(Clone,Copy,Debug)]
+#[allow(dead_code)]
 struct RealAudioInfo {
     fcc:                u32,
     sample_rate:        u32,
@@ -1185,8 +1186,8 @@ fn read_string_size(src: &mut ByteReader, size: usize) -> DemuxerResult<String>
         vec.push(c);
     }
     let str = String::from_utf8(vec);
-    if str.is_ok() {
-        Ok(str.unwrap())
+    if let Ok(res) = str {
+        Ok(res)
     } else {
         Ok(String::new())
     }
@@ -1653,7 +1654,7 @@ impl<'a> RealIVRDemuxer<'a> {
     }
 }
 
-static RM_VIDEO_CODEC_REGISTER: &'static [(&[u8;4], &str)] = &[
+static RM_VIDEO_CODEC_REGISTER: &[(&[u8;4], &str)] = &[
     (b"RV10", "realvideo1"),
     (b"RV20", "realvideo2"),
     (b"RVTR", "realvideo2"),
@@ -1663,7 +1664,7 @@ static RM_VIDEO_CODEC_REGISTER: &'static [(&[u8;4], &str)] = &[
     (b"CLV1", "clearvideo_rm"),
 ];
 
-static RM_AUDIO_CODEC_REGISTER: &'static [(&[u8;4], &str)] = &[
+static RM_AUDIO_CODEC_REGISTER: &[(&[u8;4], &str)] = &[
     (b"lpcJ", "ra14.4"),
     (b"28_8", "ra28.8"),
     (b"cook", "cook"),
@@ -1709,6 +1710,7 @@ mod test {
 
     #[test]
     fn test_rm_demux() {
+        // sample from a private collection
         let mut file =
             File::open("assets/RV/rv10_dnet_640x352_realvideo_encoder_4.0.rm").unwrap();
 //            File::open("assets/RV/rv20_cook_640x352_realproducer_plus_8.51.rm").unwrap();
@@ -1741,6 +1743,7 @@ mod test {
     }
     #[test]
     fn test_ra_demux() {
+        // sample: https://samples.mplayerhq.hu/real//RA/ra_with_comment_field/diemusik.ra
         let mut file =
 //            File::open("assets/RV/welcome288.ra").unwrap();
             File::open("assets/RV/diemusik.ra").unwrap();
@@ -1763,6 +1766,7 @@ mod test {
     }
     #[test]
     fn test_ivr_demux() {
+        // sample: https://samples.mplayerhq.hu/real/ivr/Opener_rm_hi.ivr
         let mut file =
             File::open("assets/RV/Opener_rm_hi.ivr").unwrap();
 //            File::open("assets/RV/SherwinWilliamsCommercial.ivr").unwrap();