X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-realmedia%2Fsrc%2Fdemuxers%2Frealmedia.rs;h=8f7b101615feb781b2a849f2c7b865fec9fcc2d1;hb=d24468d9dbd54f5cbe414649ff061699337fa7fe;hp=e3d7447f580335e50127a831d1835ce092a83b8c;hpb=cdcbaa6c94345c189742afb831bde3850843310a;p=nihav.git

diff --git a/nihav-realmedia/src/demuxers/realmedia.rs b/nihav-realmedia/src/demuxers/realmedia.rs
index e3d7447..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();
@@ -1060,7 +1060,11 @@ impl<'a> RealMediaDemuxer<'a> {
         else if id == mktag!(b"DATA") {
             self.data_chunks.push((self.src.tell() - 10, size, ver));
         }
-        else if id == mktag!(b"INDX") { self.parse_index(seek_idx, (size as usize) - 10, ver)?; }
+        else if id == mktag!(b"INDX") {
+            if !seek_idx.skip_index {
+                self.parse_index(seek_idx, (size as usize) - 10, ver)?;
+            }
+        }
         else if id == 0               { return Ok(true); }
         else                          { println!("unknown chunk type {:08X}", id); }
 
@@ -1126,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 {
@@ -1670,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);
@@ -1692,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);
@@ -1713,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);