buf = Vec::with_capacity(bsize);
buf.resize(bsize, 0u8);
},
- Deinterleaver::VBR => { unimplemented!("deint"); },
+ Deinterleaver::VBR => {
+ buf = Vec::new();
+ },
};
} else {
deint = Deinterleaver::None;
let mut dst = &mut self.buf[fsize * ppos..][..fsize];
src.read_buf(&mut dst)?;
},
- _ => { return src.read_packet(stream, ts, keyframe, payload_size); },
+ Deinterleaver::VBR => {
+ validate!(payload_size >= 5);
+ let hdrsizesize = src.read_u16be()?;
+ let num_entries = (hdrsizesize / 16) as usize;
+ validate!(payload_size >= num_entries * 3 + 2);
+ let mut sizes: Vec<usize> = Vec::with_capacity(num_entries);
+ let mut tot_size = 0;
+ for _ in 0..num_entries {
+ let sz = src.read_u16be()? as usize;
+ tot_size += sz;
+ sizes.push(sz);
+ }
+ validate!(tot_size + num_entries * 2 + 2 == payload_size);
+ let pkt_ts = NATimeInfo::new(None, None, None, tb_num, tb_den);
+ let mut first = true;
+ for size in sizes.iter() {
+ let cur_ts = if first { ts } else { pkt_ts };
+ first = false;
+ let pkt = src.read_packet(stream.clone(), cur_ts, true, *size)?;
+ queued_packets.push(pkt);
+ }
+ queued_packets.reverse();
+ let pkt0 = queued_packets.pop().unwrap();
+ return Ok(pkt0);
+ },
};
let iinfo = self.iinfo.unwrap();
let factor = iinfo.factor as usize;
- let fsize = iinfo.frame_size as usize;
+ let fsize = if iinfo.block_size != 0 { iinfo.block_size } else { iinfo.frame_size } as usize;
self.sub_packet += 1;
if self.sub_packet < factor {
struct RealMediaDemuxer<'a> {
src: &'a mut ByteReader<'a>,
data_pos: u64,
+ data_ver: u16,
num_packets: u32,
cur_packet: u32,
if self.cur_packet >= self.num_packets { return Err(DemuxerError::EOF); }
let pkt_start = self.src.tell();
- let ver = self.src.read_u16le()?;
+ let ver = self.src.read_u16be()?;
validate!(ver <= 1);
let len = self.src.read_u16be()? as usize;
let str_no = self.src.read_u16be()?;
if ver == 0 {
_pkt_grp = self.src.read_byte()?;
} else {
- //asm_rule = self.src.read_u16le()?;
+ //asm_rule = self.src.read_u16be()?;
self.src.read_skip(2)?;
_pkt_grp = 0;
}
if packet_num == 1 {
vstr.start_slice(num_pkts, frame_size as usize, self.slice_buf.as_slice());
} else {
- vstr.add_slice(packet_num as usize, self.slice_buf.as_slice());
+ vstr.add_slice(packet_num as usize, self.slice_buf.as_slice());
}
if (packet_num as usize) < num_pkts {
continue;
if packet_num == 1 && frame_size == tail_size {
vstr.start_slice(num_pkts, frame_size as usize, self.slice_buf.as_slice());
} else {
- vstr.add_slice(packet_num as usize, self.slice_buf.as_slice());
+ vstr.add_slice(packet_num as usize, self.slice_buf.as_slice());
}
while self.src.tell() < pos + (payload_size as u64) {
let size = src.read_u32be()?;
if size == 0 {
let ver = src.read_u16be()?;
- validate!(ver <= 1);
+ validate!(ver <= 2);
return Ok((id, 0x0FFFFFFF, ver));
}
validate!(size >= 10);
let ver = src.read_u16be()?;
- validate!(ver <= 1);
+ validate!(ver <= 2);
Ok((id, size, ver))
}
let start = src.tell();
src.read_skip(2)?; // zeroes
let id = src.read_u32be()?;
- validate!(id == mktag!(b".ra5"));
+ validate!((id == mktag!(b".ra5")) || (id == mktag!(b".ra4")));
let data_size = src.read_u32be()?;
let _ver5 = src.read_u16be()?; // should be 5
let header_size = src.read_u32be()?;
if has_ileave_pattern != 0 {
unimplemented!("ra5 interleave pattern");
}
- let edata_size = src.read_u32be()?;
-
+ let mut edata_size = src.read_u32be()?;
let end = src.tell();
- validate!(end - start <= (header_size as u64) + 10);
+ if id == mktag!(b".ra5") {
+ validate!(end - start <= (header_size as u64) + 10);
// src.read_skip(((end - start) as usize) - (header_size as usize) - 10)?;
+ } else {
+ validate!(end - start <= (header_size as u64) + 15);
+ }
let ileave_info = if is_interleaved != 0 {
Some(InterleaveInfo {
} else {
None
};
+ if (fcc == mktag!(b"raac")) || (fcc == mktag!(b"racp")) {
+ validate!(edata_size > 1);
+ edata_size -= 1;
+ src.read_skip(1)?;
+ }
Ok(RealAudioInfo {
fcc: fcc, flavor: flavor,
RealMediaDemuxer {
src: io,
data_pos: 0,
+ data_ver: 0,
num_packets: 0,
cur_packet: 0,
streams: Vec::new(),
#[allow(unused_variables)]
fn read_header(&mut self, strmgr: &mut StreamManager) -> DemuxerResult<()> {
let (id, size, ver) = read_chunk(self.src)?;
- validate!(id == mktag!(b".RMF"));
+ validate!((id == mktag!(b".RMF")) || (id == mktag!(b".RMP")));
validate!(size >= RMVB_HDR_SIZE);
let fver = self.src.read_u32be()?;
validate!(fver <= 1);
}
let (id, size, ver) = read_chunk(self.src)?;
- validate!(size >= RMVB_PROP_SIZE);
- validate!(ver == 0);
+ let prop_size = if ver == 0 { RMVB_PROP_SIZE } else { RMVB_PROP_SIZE + 4 };
+ validate!(size >= prop_size);
+ validate!((ver == 0) || (ver == 2));
let maxbr = self.src.read_u32be()?;
let avgbr = self.src.read_u32be()?;
let maxps = self.src.read_u32be()?;
let num_pkt = self.src.read_u32be()? as usize;
let duration = self.src.read_u32be()?;
let preroll = self.src.read_u32be()?;
+ if ver == 2 {
+ self.src.read_skip(4)?;
+ }
let idx_off = self.src.read_u32be()?;
let data_off = self.src.read_u32be()?;
let num_streams = self.src.read_u16be()? as usize;
let flags = self.src.read_u16be()?;
- if size > RMVB_PROP_SIZE {
- self.src.read_skip((size - RMVB_PROP_SIZE) as usize)?;
+ if size > prop_size {
+ self.src.read_skip((size - prop_size) as usize)?;
}
for _ in 0..num_hdr {
match res {
Ok(last) => { if last { break; } },
Err(DemuxerError::IOError) => { break; },
- Err(etype) => { return Err(etype); },
+ Err(etype) => {
+ if self.data_pos == 0 { // data is not found, report error
+ return Err(etype);
+ }
+ },
};
}
//println!("now @ {:X} / {}", self.src.tell(), self.data_pos);
validate!(self.data_pos > 0);
self.src.seek(SeekFrom::Start(self.data_pos))?;
let num_packets = self.src.read_u32be()?;
+ if self.data_ver == 2 {
+ self.src.read_skip(12)?; // zeroes?
+ }
let next_data_hdr = self.src.read_u32be()?;
self.num_packets = if num_packets > 0 { num_packets } else { 0xFFFFFF };
self.cur_packet = 0;
let (id, size, ver) = read_chunk(self.src)?;
let end_pos = self.src.tell() - 10 + (size as u64);
- validate!(ver == 0);
+ validate!((ver == 0) || (ver == 2));
if id == mktag!(b"CONT") { self.parse_content_desc()?; }
else if id == mktag!(b"MDPR") { self.parse_mdpr(strmgr)?; }
- else if id == mktag!(b"DATA") { if self.data_pos == 0 { self.data_pos = self.src.tell(); } }
+ else if id == mktag!(b"DATA") { if self.data_pos == 0 { self.data_ver = ver; self.data_pos = self.src.tell(); } }
else if id == mktag!(b"INDX") { /* do nothing for now */ }
else if id == 0 { return Ok(true); }
else { println!("unknown chunk type {:08X}", id); }
fn parse_rm_stream(io: &mut ByteReader) -> DemuxerResult<NAStream> {
let mimetype = read_string(io)?;
let strname = read_string(io)?;
- let strnum = io.read_u32le()?;
- let maxbr = io.read_u32le()?;
- let avgbr = io.read_u32le()?;
- let maxsize = io.read_u32le()?;
- let avgsize = io.read_u32le()?;
- let duration = io.read_u32le()?;
- let preroll = io.read_u32le()?;
- let start = io.read_u32le()?;
- let edatalen = io.read_u32le()? as usize;
+ let strnum = io.read_u32be()?;
+ let maxbr = io.read_u32be()?;
+ let avgbr = io.read_u32be()?;
+ let maxsize = io.read_u32be()?;
+ let avgsize = io.read_u32be()?;
+ let duration = io.read_u32be()?;
+ let preroll = io.read_u32be()?;
+ let start = io.read_u32be()?;
+ let edatalen = io.read_u32be()? as usize;
let mut edata: Vec<u8> = Vec::with_capacity(edatalen);
edata.resize(edatalen, 0);
io.read_buf(&mut edata)?;
- let numprops = io.read_u32le()? as usize;
+ let numprops = io.read_u32be()? as usize;
//read properties
unimplemented!();
}
-#[allow(dead_code)]
-#[allow(unused_variables)]
-fn read_ra_vbr_stream(io: &mut ByteReader) -> DemuxerResult<NAPacket> {
- let hdrsizesize = io.read_u16le()?;
- let num_entries = (hdrsizesize / 16) as usize;
- let mut sizes: Vec<usize> = Vec::with_capacity(num_entries);
- for _ in 0..num_entries {
- let sz = io.read_u16le()? as usize;
- sizes.push(sz);
- }
- for i in 0..num_entries {
-//read packet of sizes[i]
- }
- unimplemented!();
+struct RealAudioDemuxer<'a> {
+ src: &'a mut ByteReader<'a>,
+ stream: Option<RMAudioStream>,
+ data_start: u64,
+ data_end: u64,
+ blk_size: usize,
+ queued_pkts: Vec<NAPacket>,
}
-//todo interleavers
+impl<'a> DemuxCore<'a> for RealAudioDemuxer<'a> {
+ #[allow(unused_variables)]
+ fn open(&mut self, strmgr: &mut StreamManager) -> DemuxerResult<()> {
+ let magic = self.src.read_u32be()?;
+ validate!(magic == mktag!(b".ra\xFD"));
+ let ver = self.src.read_u16be()?;
+ let ainfo = match ver {
+ 3 => {
+ parse_aformat3(&mut self.src)?
+ },
+ 4 => {
+ parse_aformat4(&mut self.src)?
+ },
+ 5 => {
+ parse_aformat5(&mut self.src)?
+ },
+ _ => {
+ println!("unknown version {}", ver);
+ return Err(DemuxerError::InvalidData);
+ },
+ };
+println!(" got ainfo {:?}", ainfo);
+ let cname = find_codec_name(RM_AUDIO_CODEC_REGISTER, ainfo.fcc);
+ let blk_size = if ainfo.fcc != mktag!(b"sipr") {
+ ainfo.granularity as usize
+ } else {
+ validate!(ainfo.flavor <= 3);
+ RM_SIPRO_BLOCK_SIZES[ainfo.flavor as usize]
+ };
+ let srate = ainfo.sample_rate;
+ let soniton = NASoniton::new(ainfo.sample_size as u8, SONITON_FLAG_SIGNED);
+ let ahdr = NAAudioInfo::new(srate, ainfo.channels as u8, soniton, blk_size);
+ let extradata = if ainfo.edata_size == 0 {
+ None
+ } else {
+ let mut dta: Vec<u8> = Vec::with_capacity(ainfo.edata_size as usize);
+ dta.resize(ainfo.edata_size as usize, 0);
+ self.src.read_buf(dta.as_mut_slice())?;
+ Some(dta)
+ };
+ let nainfo = NACodecInfo::new(cname, NACodecTypeInfo::Audio(ahdr), extradata);
+ let res = strmgr.add_stream(NAStream::new(StreamType::Audio, 0, nainfo, 1, srate));
+ if res.is_none() { return Err(MemoryError); }
+
+ let astr = RMAudioStream::new(ainfo.ileave_info);
+ self.data_start = self.src.tell();
+ self.data_end = if ainfo.total_bytes > 0 { self.src.tell() + (ainfo.total_bytes as u64) } else { 0 };
+ self.blk_size = blk_size;
+ self.stream = Some(astr);
+
+ Ok(())
+ }
+
+ fn get_frame(&mut self, strmgr: &mut StreamManager) -> DemuxerResult<NAPacket> {
+ if !self.queued_pkts.is_empty() {
+ let pkt = self.queued_pkts.pop().unwrap();
+ return Ok(pkt);
+ }
+ if (self.data_end != 0) && (self.src.tell() >= self.data_end) {
+ return Err(DemuxerError::EOF);
+ }
+ let streamres = strmgr.get_stream_by_id(0);
+ let stream = streamres.unwrap();
+ if let Some(ref mut astr) = self.stream {
+ loop {
+ let ret = astr.read_apackets(&mut self.queued_pkts, &mut self.src, stream.clone(), 0, false, self.blk_size);
+ if let Err(DemuxerError::TryAgain) = ret {
+ continue;
+ }
+ return ret;
+ }
+ }
+ Err(DemuxerError::NoSuchInput)
+ }
-//todo opaque data
+ #[allow(unused_variables)]
+ fn seek(&mut self, time: u64) -> DemuxerResult<()> {
+ Err(NotImplemented)
+ }
+}
+impl<'a> RealAudioDemuxer<'a> {
+ fn new(io: &'a mut ByteReader<'a>) -> Self {
+ RealAudioDemuxer {
+ src: io,
+ data_start: 0,
+ data_end: 0,
+ blk_size: 0,
+ stream: None,
+ queued_pkts: Vec::new(),
+ }
+ }
+}
static RM_VIDEO_CODEC_REGISTER: &'static [(&[u8;4], &str)] = &[
(b"RV10", "realvideo1"),
(b"RVTR", "realvideo2"),
(b"RV30", "realvideo3"),
(b"RV40", "realvideo4"),
+ (b"RV60", "realvideo6"),
(b"CLV1", "clearvideo_rm"),
];
fn get_name(&self) -> &'static str { "realmedia" }
}
+pub struct RealAudioDemuxerCreator { }
+
+impl DemuxerCreator for RealAudioDemuxerCreator {
+ fn new_demuxer<'a>(&self, br: &'a mut ByteReader<'a>) -> Box<DemuxCore<'a> + 'a> {
+ Box::new(RealAudioDemuxer::new(br))
+ }
+ fn get_name(&self) -> &'static str { "realaudio" }
+}
+
+/*pub struct RealIVRDemuxerCreator { }
+
+impl DemuxerCreator for RealIVRDemuxerCreator {
+ fn new_demuxer<'a>(&self, br: &'a mut ByteReader<'a>) -> Box<DemuxCore<'a> + 'a> {
+ Box::new(RealIVRDemuxer::new(br))
+ }
+ fn get_name(&self) -> &'static str { "real_ivr" }
+}*/
+
#[cfg(test)]
mod test {
use super::*;
}
//panic!("the end");
}
+ #[test]
+ fn test_ra_demux() {
+ let mut file =
+// File::open("assets/RV/welcome288.ra").unwrap();
+ File::open("assets/RV/diemusik.ra").unwrap();
+ let mut fr = FileReader::new_read(&mut file);
+ let mut br = ByteReader::new(&mut fr);
+ let mut dmx = RealAudioDemuxer::new(&mut br);
+ let mut sm = StreamManager::new();
+ dmx.open(&mut sm).unwrap();
+
+ loop {
+ let pktres = dmx.get_frame(&mut sm);
+ if let Err(e) = pktres {
+ if e == DemuxerError::EOF { break; }
+ panic!("error");
+ }
+ let pkt = pktres.unwrap();
+ println!("Got {}", pkt);
+ }
+ }
}
projects / nihav.git / blobdiff