X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-realmedia%2Fsrc%2Fdemuxers%2Frealmedia.rs;h=feeb3904fe1ee455ae5659ff6d54a36b3ec3a850;hb=fa90ccfb8676a917a02fbb56381f86aa1962d313;hp=fa3920a0a3d0d042d7493bcf24755cf370ded324;hpb=9da33f04bbd89f18942bbafc6d135b5d3f102953;p=nihav.git

diff --git a/nihav-realmedia/src/demuxers/realmedia.rs b/nihav-realmedia/src/demuxers/realmedia.rs
index fa3920a..feeb390 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();
@@ -1674,7 +1674,8 @@ mod test {
         let mut br = ByteReader::new(&mut fr);
         let mut dmx = RealMediaDemuxer::new(&mut br);
         let mut sm = StreamManager::new();
-        dmx.open(&mut sm).unwrap();
+        let mut si = SeekIndex::new();
+        dmx.open(&mut sm, &mut si).unwrap();
 
         loop {
             let pktres = dmx.get_frame(&mut sm);
@@ -1696,7 +1697,8 @@ mod test {
         let mut br = ByteReader::new(&mut fr);
         let mut dmx = RealAudioDemuxer::new(&mut br);
         let mut sm = StreamManager::new();
-        dmx.open(&mut sm).unwrap();
+        let mut si = SeekIndex::new();
+        dmx.open(&mut sm, &mut si).unwrap();
 
         loop {
             let pktres = dmx.get_frame(&mut sm);
@@ -1717,7 +1719,8 @@ mod test {
         let mut br = ByteReader::new(&mut fr);
         let mut dmx = RealIVRDemuxer::new(&mut br);
         let mut sm = StreamManager::new();
-        dmx.open(&mut sm).unwrap();
+        let mut si = SeekIndex::new();
+        dmx.open(&mut sm, &mut si).unwrap();
 
         loop {
             let pktres = dmx.get_frame(&mut sm);