X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-realmedia%2Fsrc%2Fdemuxers%2Frealmedia.rs;h=8f7b101615feb781b2a849f2c7b865fec9fcc2d1;hb=8877a319a37c6ace5ebd015d1a661ad691556b6e;hp=2222b384fbf50e2c4df8f5ba09e3381b26e9fda9;hpb=caf0f37ecea1e6e25f21fc6e824ac250fe976541;p=nihav.git

diff --git a/nihav-realmedia/src/demuxers/realmedia.rs b/nihav-realmedia/src/demuxers/realmedia.rs
index 2222b38..8f7b101 100644
--- a/nihav-realmedia/src/demuxers/realmedia.rs
+++ b/nihav-realmedia/src/demuxers/realmedia.rs
@@ -224,7 +224,7 @@ impl RMAudioStream {
         self.sub_packet = 0;
 
         if self.deint == Deinterleaver::Sipro {
-            sipro_restore(&mut self.buf, factor, fsize);
+            sipro_restore(&mut self.buf, factor, iinfo.frame_size as usize);
         }
 
         let mut frames_iter = self.buf.chunks(fsize);
@@ -433,7 +433,7 @@ impl RMDemuxCommon {
             let soniton = NASoniton::new(samp_size as u8, SONITON_FLAG_SIGNED);
             let ahdr = NAAudioInfo::new(sample_rate, channels as u8, soniton, 1);
             let nainfo = NACodecInfo::new("ralf", NACodecTypeInfo::Audio(ahdr), extradata);
-            let res = strmgr.add_stream(NAStream::new(StreamType::Audio, stream_no as u32, nainfo, 1, sample_rate));
+            let res = strmgr.add_stream(NAStream::new(StreamType::Audio, stream_no as u32, nainfo, 1, 1000));
             if res.is_none() { return Err(MemoryError); }
             let astr = RMAudioStream::new(None);
             str_data.streams.push(RMStreamType::Audio(astr));
@@ -515,7 +515,7 @@ println!(" got ainfo {:?}", ainfo);
                 Some(eslice.to_vec())
             };
         let nainfo = NACodecInfo::new(cname, NACodecTypeInfo::Audio(ahdr), extradata);
-        let res = strmgr.add_stream(NAStream::new(StreamType::Audio, stream_no as u32, nainfo, 1, srate));
+        let res = strmgr.add_stream(NAStream::new(StreamType::Audio, stream_no as u32, nainfo, 1, 1000));
         if res.is_none() { return Err(MemoryError); }
 
         let astr = RMAudioStream::new(ainfo.ileave_info);
@@ -531,11 +531,11 @@ println!(" got ainfo {:?}", ainfo);
         let bpp         = src.read_u16be()?;
         let pad_w       = src.read_u16be()?;
         let pad_h       = src.read_u16be()?;
-        let fps;
+        let _fps;
         if tag2 == mktag!('V', 'I', 'D', 'O') {
-            fps         = src.read_u32be()?;
+            _fps        = src.read_u32be()?;
         } else {
-            fps = 0x10000;
+            _fps = 0x10000;
         }
         let extradata: Option<Vec<u8>>;
         if src.left() > 0 {
@@ -548,7 +548,7 @@ println!(" got ainfo {:?}", ainfo);
 
         let vhdr = NAVideoInfo::new(width, height, false, RGB24_FORMAT);
         let vinfo = NACodecInfo::new(cname, NACodecTypeInfo::Video(vhdr), extradata);
-        let res = strmgr.add_stream(NAStream::new(StreamType::Video, stream_no as u32, vinfo, 0x10000, fps));
+        let res = strmgr.add_stream(NAStream::new(StreamType::Video, stream_no as u32, vinfo, 1, 1000));
         if res.is_none() { return Err(DemuxerError::MemoryError); }
 
         let vstr = RMVideoStream::new();
@@ -1130,7 +1130,7 @@ impl<'a> RealMediaDemuxer<'a> {
         let _next_idx       = self.src.read_u32be()?;
         validate!(chunk_size == num_entries * 14 + 10);
         if num_entries == 0 { return Ok(()); }
-        
+
         seek_idx.add_stream(str_id);
         let idx = seek_idx.get_stream_index(str_id).unwrap();
         for _ in 0..num_entries {