}
fn read_video_buf(src: &mut ByteReader, stream: NAStreamRef, ts: u32, keyframe: bool, frame_size: usize) -> DemuxerResult<NAPacket> {
- let size = (frame_size as usize) + 9;
+ let size = frame_size + 9;
let mut vec: Vec<u8> = vec![0; size];
//v[0] = 0; // 1 slice
vec[4] = 1;
let (_, frame_size) = read_14or30(src)?;
let (_, timestamp) = read_14or30(src)?;
let _seq_no = src.read_byte()?;
-//println!(" multiple frame size {} ts {} seq {}", frame_size, timestamp, seq_no);
read_video_buf(src, stream, timestamp, keyframe, frame_size as usize)
}
let mut src = ByteReader::new(&mut mr);
let tag = src.read_u32be()?;
let tag2 = src.peek_u32be()?;
-//println!("tag1 {:X} tag2 {:X}", tag, tag2);
if tag == mktag!('.', 'r', 'a', 0xFD) {
Self::parse_audio_stream(strmgr, &mut str_data.streams, stream_no, &mut src, edata, duration)?;
} else if ((tag2 == mktag!('V', 'I', 'D', 'O')) || (tag2 == mktag!('I', 'M', 'A', 'G'))) && ((tag as usize) <= edata.len()) {
let samp_size = src.read_u16be()?;
let sample_rate = src.read_u32be()?;
- println!("LSD sr {}, {} ch", sample_rate, channels);
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, 1000, u64::from(duration)));
+ let res = strmgr.add_stream(NAStream::new(StreamType::Audio, stream_no, nainfo, 1, 1000, u64::from(duration)));
if res.is_none() { return Err(MemoryError); }
let astr = RMAudioStream::new(None);
str_data.streams.push(RMStreamType::Audio(astr));
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
+ if let Some(ref iinfo) = ainfo.ileave_info {
+ iinfo.block_size as usize
+ } else {
+ ainfo.granularity as usize
+ }
} else {
validate!(ainfo.flavor <= 3);
RM_SIPRO_BLOCK_SIZES[ainfo.flavor as usize]
};
let duration = if duration == 0 { ainfo.get_duration(1000) } else { u64::from(duration) };
let nainfo = NACodecInfo::new(cname, NACodecTypeInfo::Audio(ahdr), extradata);
- let res = strmgr.add_stream(NAStream::new(StreamType::Audio, stream_no as u32, nainfo, 1, 1000, duration));
+ let res = strmgr.add_stream(NAStream::new(StreamType::Audio, stream_no, nainfo, 1, 1000, duration));
if res.is_none() { return Err(MemoryError); }
let astr = RMAudioStream::new(ainfo.ileave_info);
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, 1, 1000, u64::from(duration)));
+ let res = strmgr.add_stream(NAStream::new(StreamType::Video, stream_no, vinfo, 1, 1000, u64::from(duration)));
if res.is_none() { return Err(DemuxerError::MemoryError); }
let vstr = RMVideoStream::new();
Ok(())
}
#[allow(unused_variables)]
+ #[allow(clippy::question_mark)]
fn parse_packet_payload(src: &mut ByteReader, rmstream: &mut RMStreamType, stream: NAStreamRef, slice_buf: &mut Vec<u8>, queued_pkts: &mut Vec<NAPacket>, keyframe: bool, ts: u32, payload_size: usize) -> DemuxerResult<NAPacket> {
match rmstream {
RMStreamType::Video(ref mut vstr) => {
let (_, frame_size) = read_14or30(src)?;
let (_, off) = read_14or30(src)?;
let seq_no = src.read_byte()?;
-//println!(" mode 0 pkt {}/{} off {}/{} seq {}", packet_num, num_pkts, off, frame_size, seq_no);
let hdr_skip = (src.tell() - pos) as usize;
- let slice_size = (payload_size - hdr_skip) as usize;
+ let slice_size = payload_size - hdr_skip;
slice_buf.resize(slice_size, 0);
src.read_buf(slice_buf.as_mut_slice())?;
if packet_num == 1 {
},
1 => { // whole frame
let seq_no = src.read_byte()?;
-//println!(" mode 1 seq {}", seq_no);
read_video_buf(src, stream, ts, keyframe, payload_size - 2)
},
2 => { // last partial frame
let (_, frame_size) = read_14or30(src)?;
let (_, tail_size) = read_14or30(src)?;
let seq_no = src.read_byte()?;
-//println!(" mode 2 pkt {}/{} tail {}/{} seq {}", packet_num, num_pkts, tail_size, frame_size, seq_no);
slice_buf.resize(tail_size as usize, 0);
src.read_buf(slice_buf.as_mut_slice())?;
if packet_num == 1 && frame_size == tail_size {
Ok(pkt)
},
_ => { // multiple frames
-//println!(" mode 3");
let res = read_multiple_frame(src, stream.clone(), keyframe, true);
if res.is_err() { return res; }
while src.tell() < pos + (payload_size as u64) {
let payload_size = len - (hdr_size as usize);
- let stream_id = self.str_data.get_stream_id(str_no as u32, pkt_grp);
+ let stream_id = self.str_data.get_stream_id(str_no, pkt_grp);
let sr = self.str_data.find_stream(stream_id);
if sr.is_none() {
-//println!("stream {} not found", str_no);
self.src.read_skip(payload_size)?;
return Err(DemuxerError::InvalidData);
}
continue;
}
let stream = streamres.unwrap();
-//println!(" stream {}", str_id);
if strmgr.is_ignored_id(stream_id) {
self.src.read_skip(payload_size)?;
continue;
skip_ra_metadata(src)?;
- let _can_copy = src.read_byte()?;
- let fcc_len = src.read_byte()?;
- validate!(fcc_len == 4);
- let fcc = src.read_u32be()?;
+ // the original RealAudio has no such fields
+ let fcc = if src.tell() != start + u64::from(header_len) + 2 {
+ let _can_copy = src.read_byte()?;
+ let fcc_len = src.read_byte()?;
+ validate!(fcc_len == 0 || fcc_len == 4);
+ src.read_u32be()?
+ } else {
+ read_u32be(b"lpcJ")?
+ };
let end = src.tell();
validate!(end - start <= (header_len as u64) + 2);
},
};
}
-//println!("now @ {:X} / {}", self.src.tell(), self.data_pos);
validate!(!self.data_chunks.is_empty());
self.cur_data_chunk = 0;
let (pos, size, ver) = self.data_chunks[self.cur_data_chunk];
let duration = self.src.read_u32be()?;
let sname_size = self.src.read_byte()? as usize;
let sname = read_string_size(self.src, sname_size)?;
-//println!("str #{} sname = {} pkts {}/{} start {} preroll {}", stream_no, sname, maxps, avgps, start, preroll);
let mime_size = self.src.read_byte()? as usize;
let mime = read_string_size(self.src, mime_size)?;
-//println!("mime = {}", mime);
let edata_size = self.src.read_u32be()? as usize;
let edata: Option<Vec<u8>> = if edata_size == 0 { None } else {
let mut edvec: Vec<u8> = vec![0; edata_size];
let c = src.read_byte()?;
vec.push(c);
}
- let str = String::from_utf8(vec);
- if let Ok(res) = str {
+ if let Ok(res) = String::from_utf8(vec) {
Ok(res)
} else {
Ok(String::new())
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
fn get_frame(&mut self, strmgr: &mut StreamManager) -> DemuxerResult<NAPacket> {
if !self.queued_pkts.is_empty() {
- let pkt = self.queued_pkts.pop().unwrap();
+ let mut pkt = self.queued_pkts.pop().unwrap();
+ pkt.ts.pts = None;
return Ok(pkt);
}
if (self.data_end != 0) && (self.src.tell() >= self.data_end) {
let stream = streamres.unwrap();
if let Some(ref mut astr) = self.stream {
loop {
- let ret = astr.read_apackets(&mut self.queued_pkts, self.src, stream.clone(), 0, false, self.blk_size);
+ let mut ret = astr.read_apackets(&mut self.queued_pkts, self.src, stream.clone(), 0, false, self.blk_size);
if let Err(DemuxerError::TryAgain) = ret {
continue;
}
+ if let Ok(ref mut pkt) = ret {
+ pkt.ts.pts = None;
+ }
return ret;
}
}
enum IVRRecord {
Invalid(u8),
StreamProperties(usize),
- Packet { ts: u32, str: u32, flags: u32, len: usize, checksum: u32 },
+ Packet { ts: u32, strm: u32, flags: u32, len: usize, checksum: u32 },
IntValue(Vec<u8>, u32),
BinaryData(Vec<u8>, Vec<u8>),
StringData(Vec<u8>, Vec<u8>),
},
2 => {
let ts = src.read_u32be()?;
- let str = src.read_u16be()? as u32;
+ let strm = src.read_u16be()? as u32;
let flags = src.read_u32be()?;
let len = src.read_u32be()? as usize;
let chk = src.read_u32be()?;
validate!((len > 0) && (len < (1 << 24)));
- Ok(IVRRecord::Packet { ts, str, flags, len, checksum: chk })
+ Ok(IVRRecord::Packet { ts, strm, flags, len, checksum: chk })
},
3 => {
let name = Self::read_string(src)?;
IVRRecord::Invalid(typ) => write!(f, "Invalid({:02X})", typ),
IVRRecord::StreamProperties(num) =>
write!(f, "({} stream properties)", num),
- IVRRecord::Packet { ts, str, flags, len, checksum } =>
- write!(f, "paket({}, {}, {:X}, {}, {})", ts, str, flags, len, checksum),
+ IVRRecord::Packet { ts, strm, flags, len, checksum } =>
+ write!(f, "paket({}, {}, {:X}, {}, {})", ts, strm, flags, len, checksum),
IVRRecord::IntValue(ref name, val) =>
write!(f, "({} = {})", String::from_utf8_lossy(name), val),
IVRRecord::BinaryData(ref name, ref val) =>
let num_entries = src.read_u32be()? as usize;
for _ in 0..num_entries {
let _rec = IVRRecord::read(src)?;
-//println!(" header rec {}", _rec);
}
let mut has_seek_table = false;
let mut cur_str_no = 0;
let mut duration = 0;
for _ in 0..num {
let rec = IVRRecord::read(src)?;
-//println!(" strm property {}", rec);
match rec {
IVRRecord::IntValue(ref name, val) => {
if name == b"StreamNumber\0" {
_ => {println!(" unexpected {}", rec); return Err(DemuxerError::InvalidData); }
};
}
- println!(" now @ {:X}", src.tell());
let off0 = src.read_u32be()? as u64;
let _off1 = src.read_u32be()?;
let _off2 = src.read_u32be()?;
validate!(off0 + self.start_pos == src.tell());
- println!(" has seek tab: {}", has_seek_table);
if has_seek_table {
src.read_skip(4)?;
let data_off = src.read_u32be()? as u64;
- println!(" new off {:X}", data_off);
let pos = src.tell();
validate!(data_off + self.start_pos > pos);
src.read_skip((data_off + self.start_pos - pos) as usize)?;
loop {
let rec = IVRRecord::read(src)?;
match rec {
- IVRRecord::Packet { ts, str, flags, len, .. } => {
+ IVRRecord::Packet { ts, strm, flags, len, .. } => {
let payload_size = len;
- let sr = self.remap_ids.iter().position(|x| *x == str);
+ let sr = self.remap_ids.iter().position(|x| *x == strm);
validate!(sr.is_some());
let str_no = self.start_str + (sr.unwrap() as u32);
let pkt_grp = ((flags >> 8) & 0xFF) as u16;
- let stream_id = str_data.get_stream_id(str_no as u32, pkt_grp);
+ let stream_id = str_data.get_stream_id(str_no, pkt_grp);
let sr = str_data.find_stream(stream_id);
if sr.is_none() {
src.read_skip(payload_size)?;
rec.parse_header(self.src, strmgr, &mut self.str_data)?;
self.recs.push(rec);
} else if magic == mktag!(b".R1M") {
-println!("R1M kind");
self.src.read_skip(4)?; // magic
self.src.read_skip(3)?; // always 0, 1, 1 ?
let _name = IVRRecord::read_string(self.src)?;
self.src.read_skip((off1 - cpos) as usize)?;
loop {
let typ = self.src.read_byte()?;
- println!(" at {:X} type {:02X}", self.src.tell(), typ);
match typ {
1 => {
let len = self.src.read_u32be()?;
projects / nihav.git / blobdiff