aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKostya Shishkov <kostya.shishkov@gmail.com>2019-11-23 16:42:55 +0100
committerKostya Shishkov <kostya.shishkov@gmail.com>2019-11-23 16:42:55 +0100
commit59dc9182c5eb3495cacf92b010c373b4eb37c2f9 (patch)
treea7d8202e820855348eea96f714109f07a0bf1ba4
parentd32c444b36000abaaf5c65866a2dbdfec1c1ac26 (diff)
downloadnihav-59dc9182c5eb3495cacf92b010c373b4eb37c2f9.tar.gz
rmdemux: streams timestamps are in milliseconds
-rw-r--r--nihav-realmedia/src/demuxers/realmedia.rs12
1 files changed, 6 insertions, 6 deletions
diff --git a/nihav-realmedia/src/demuxers/realmedia.rs b/nihav-realmedia/src/demuxers/realmedia.rs
index 2222b38..5b2dff5 100644
--- a/nihav-realmedia/src/demuxers/realmedia.rs
+++ b/nihav-realmedia/src/demuxers/realmedia.rs
@@ -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();