});
}
+const RM_SIPRO_BLOCK_SIZES: [usize; 4] = [ 29, 19, 37, 20 ];
+const RM_SIPRO_SWAPS: [[u8; 2]; 38] = [
+ [ 0, 63 ], [ 1, 22 ], [ 2, 44 ], [ 3, 90 ],
+ [ 5, 81 ], [ 7, 31 ], [ 8, 86 ], [ 9, 58 ],
+ [ 10, 36 ], [ 12, 68 ], [ 13, 39 ], [ 14, 73 ],
+ [ 15, 53 ], [ 16, 69 ], [ 17, 57 ], [ 19, 88 ],
+ [ 20, 34 ], [ 21, 71 ], [ 24, 46 ], [ 25, 94 ],
+ [ 26, 54 ], [ 28, 75 ], [ 29, 50 ], [ 32, 70 ],
+ [ 33, 92 ], [ 35, 74 ], [ 38, 85 ], [ 40, 56 ],
+ [ 42, 87 ], [ 43, 65 ], [ 45, 59 ], [ 48, 79 ],
+ [ 49, 93 ], [ 51, 89 ], [ 55, 95 ], [ 61, 76 ],
+ [ 67, 83 ], [ 77, 80 ]
+];
+
struct RMVideoStream {
frame: Vec<u8>,
hdr_size: usize,
#[derive(Clone,Copy,PartialEq)]
enum Deinterleaver {
None,
+ RA28_8,
Generic,
Sipro,
VBR,
#[allow(dead_code)]
struct RMAudioStream {
deint: Deinterleaver,
+ iinfo: Option<InterleaveInfo>,
+ buf: Vec<u8>,
+ sub_packet: usize,
}
+const RM_ILEAVE_INT0: u32 = mktag!(b"Int0");
+const RM_ILEAVE_INT4: u32 = mktag!(b"Int4");
+const RM_ILEAVE_GENR: u32 = mktag!(b"genr");
+const RM_ILEAVE_SIPR: u32 = mktag!(b"sipr");
+const RM_ILEAVE_VBRF: u32 = mktag!(b"vbrf");
+const RM_ILEAVE_VBRS: u32 = mktag!(b"vbrs");
+
impl RMAudioStream {
- fn new(deint: Deinterleaver) -> Self {
- RMAudioStream { deint: deint }
+ fn new(iinfo: Option<InterleaveInfo>) -> Self {
+ let deint;
+ let mut buf: Vec<u8>;
+ if let Some(info) = iinfo {
+ deint = match info.id {
+ RM_ILEAVE_INT0 => Deinterleaver::None,
+ RM_ILEAVE_INT4 => Deinterleaver::RA28_8,
+ RM_ILEAVE_GENR => Deinterleaver::Generic,
+ RM_ILEAVE_SIPR => Deinterleaver::Sipro,
+ RM_ILEAVE_VBRF => Deinterleaver::VBR,
+ RM_ILEAVE_VBRS => Deinterleaver::VBR,
+ _ => {println!("unknown deint {:X}", info.id); Deinterleaver::None },
+ };
+ match deint {
+ Deinterleaver::None => { buf = Vec::new(); },
+ Deinterleaver::RA28_8 |
+ Deinterleaver::Generic |
+ Deinterleaver::Sipro => {
+ let bsize = (info.frame_size as usize) * (info.factor as usize);
+ buf = Vec::with_capacity(bsize);
+ buf.resize(bsize, 0u8);
+ },
+ Deinterleaver::VBR => { unimplemented!("deint"); },
+ };
+ } else {
+ deint = Deinterleaver::None;
+ buf = Vec::new();
+ }
+ RMAudioStream { deint: deint, iinfo: iinfo, buf: buf, sub_packet: 0 }
+ }
+ fn read_apackets(&mut self, queued_packets: &mut Vec<NAPacket>, src: &mut ByteReader, stream: Rc<NAStream>, ts: u32, keyframe: bool, payload_size: usize) -> DemuxerResult<NAPacket> {
+ let (tb_num, tb_den) = stream.get_timebase();
+ let ts = NATimeInfo::new(Some(ts as u64), None, None, tb_num, tb_den);
+
+ if keyframe {
+ self.sub_packet = 0;
+ }
+ match self.deint {
+ Deinterleaver::None => { return src.read_packet(stream, ts, keyframe, payload_size); },
+ Deinterleaver::RA28_8 => {
+ let iinfo = self.iinfo.unwrap();
+ let factor = iinfo.factor as usize;
+ let halffact = factor >> 1;
+ let fsize = iinfo.frame_size as usize;
+ let bsize = iinfo.block_size as usize;
+ let ppos = self.sub_packet;
+ for sb in 0..halffact {
+ let mut dst = &mut self.buf[sb * 2 * fsize + ppos * bsize..][..bsize];
+ src.read_buf(&mut dst)?;
+ }
+ self.sub_packet += 1;
+ if self.sub_packet == factor {
+ self.sub_packet = 0;
+ return Ok(NAPacket::new(stream, ts, true, self.buf.clone()));
+ } else {
+ return Err(DemuxerError::TryAgain);
+ }
+ },
+ Deinterleaver::Generic => {
+ let iinfo = self.iinfo.unwrap();
+ let factor = iinfo.factor as usize;
+ let fsize = iinfo.frame_size as usize;
+ let bsize = iinfo.block_size as usize;
+ let factor2 = fsize / bsize;
+ let ppos = self.sub_packet;
+
+ for sb in 0..factor2 {
+ let sb_pos = factor * sb + ((factor + 1) >> 1) * (ppos & 1) + (ppos >> 1);
+ let mut dst = &mut self.buf[bsize * sb_pos..][..bsize];
+ src.read_buf(&mut dst)?;
+ }
+ },
+ Deinterleaver::Sipro => {
+ let iinfo = self.iinfo.unwrap();
+ let fsize = iinfo.frame_size as usize;
+ let ppos = self.sub_packet;
+
+ let mut dst = &mut self.buf[fsize * ppos..][..fsize];
+ src.read_buf(&mut dst)?;
+ },
+ _ => { return src.read_packet(stream, ts, keyframe, payload_size); },
+ };
+
+ let iinfo = self.iinfo.unwrap();
+ let factor = iinfo.factor 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 {
+ return Err(DemuxerError::TryAgain);
+ }
+
+ self.sub_packet = 0;
+
+ if self.deint == Deinterleaver::Sipro {
+ sipro_restore(&mut self.buf, factor, fsize);
+ }
+
+ let mut frames_iter = self.buf.chunks(fsize);
+ let pkt0 = frames_iter.next().unwrap();
+
+ let pkt_ts = NATimeInfo::new(None, None, None, tb_num, tb_den);
+ for pkts in frames_iter {
+ let pkt = NAPacket::new(stream.clone(), pkt_ts, true, pkts.to_vec());
+ queued_packets.push(pkt);
+ }
+ queued_packets.reverse();
+ Ok(NAPacket::new(stream, ts, true, pkt0.to_vec()))
+ }
+}
+
+fn sipro_restore(buf: &mut [u8], factor: usize, fsize: usize) {
+ let stride = factor * fsize * 2 / 96;
+ for i in 0..38 {
+ let mut sidx = (RM_SIPRO_SWAPS[i][0] as usize) * stride;
+ let mut didx = (RM_SIPRO_SWAPS[i][1] as usize) * stride;
+ for _ in 0..stride {
+ let in0 = buf[sidx >> 1];
+ let in1 = buf[didx >> 1];
+ let nib0 = (in0 >> ((sidx & 1) * 4)) & 0xF;
+ let nib1 = (in1 >> ((didx & 1) * 4)) & 0xF;
+
+ buf[didx >> 1] = (nib0 << (4 * (didx & 1))) | (in1 & (0xF << (4 * (!didx & 1))));
+ buf[sidx >> 1] = (nib1 << (4 * (sidx & 1))) | (in0 & (0xF << (4 * (!sidx & 1))));
+
+ sidx += 1;
+ didx += 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);
+ 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 len = self.src.read_u16be()? as usize;
let str_no = self.src.read_u16be()?;
let ts = self.src.read_u32be()?;
- let pkt_grp;
+ let _pkt_grp;
if ver == 0 {
- pkt_grp = self.src.read_byte()?;
+ _pkt_grp = self.src.read_byte()?;
} else {
//asm_rule = self.src.read_u16le()?;
self.src.read_skip(2)?;
- pkt_grp = 0;
+ _pkt_grp = 0;
}
let flags = self.src.read_byte()?;
let hdr_size = self.src.tell() - pkt_start;
-println!("packet @{:X} size {} for {} ts {} grp {} flags {:X}", pkt_start, len, str_no, ts, pkt_grp, flags);
+//println!("packet @{:X} size {} for {} ts {} grp {} flags {:X}", pkt_start, len, str_no, ts, _pkt_grp, flags);
self.cur_packet += 1;
let payload_size = len - (hdr_size as usize);
let sr = self.str_ids.iter().position(|x| *x == str_no);
if sr.is_none() {
-println!("stream {} not found", str_no);
+//println!("stream {} not found", str_no);
self.src.read_skip(payload_size)?;
return Err(DemuxerError::InvalidData);
}
let str_id = sr.unwrap();
- let stream = strmgr.get_stream_by_id(str_no as u32).unwrap();
-println!(" stream {}", str_id);
+ let streamres = strmgr.get_stream_by_id(str_no as u32);
+ if streamres.is_none() {
+ self.src.read_skip(payload_size)?;
+ continue;
+ }
+ let stream = streamres.unwrap();
+//println!(" stream {}", str_id);
if strmgr.is_ignored_id(str_no as u32) {
self.src.read_skip(payload_size)?;
continue;
let (_, frame_size) = read_14or30(self.src)?;
let (_, off) = read_14or30(self.src)?;
let seq_no = self.src.read_byte()?;
-println!(" mode 0 pkt {}/{} off {}/{} seq {}", packet_num, num_pkts, off, frame_size, seq_no);
+//println!(" mode 0 pkt {}/{} off {}/{} seq {}", packet_num, num_pkts, off, frame_size, seq_no);
let hdr_skip = (self.src.tell() - pos) as usize;
let slice_size = (payload_size - hdr_skip) as usize;
} else {
vstr.add_slice(packet_num as usize, self.slice_buf.as_slice());
}
- continue;
+ if (packet_num as usize) < num_pkts {
+ continue;
+ }
+ //todo: check if full frame is received
+ let (tb_num, tb_den) = stream.get_timebase();
+ let ts = NATimeInfo::new(Some(ts as u64), None, None, tb_num, tb_den);
+ let pkt = NAPacket::new(stream, ts, keyframe, vstr.get_frame_data());
+ Ok(pkt)
},
1 => { // whole frame
let seq_no = self.src.read_byte()?;
-println!(" mode 1 seq {}", seq_no);
- read_video_buf(self.src, stream, ts, keyframe, payload_size - 1)
+//println!(" mode 1 seq {}", seq_no);
+ read_video_buf(self.src, stream, ts, keyframe, payload_size - 2)
},
2 => { // last partial frame
let b1 = self.src.read_byte()?;
let (_, frame_size) = read_14or30(self.src)?;
let (_, tail_size) = read_14or30(self.src)?;
let seq_no = self.src.read_byte()?;
-println!(" mode 2 pkt {}/{} tail {}/{} seq {}", packet_num, num_pkts, tail_size, frame_size, seq_no);
+//println!(" mode 2 pkt {}/{} tail {}/{} seq {}", packet_num, num_pkts, tail_size, frame_size, seq_no);
self.slice_buf.resize(tail_size as usize, 0);
self.src.read_buf(self.slice_buf.as_mut_slice())?;
- vstr.add_slice(packet_num as usize, self.slice_buf.as_slice());
+ 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());
+ }
while self.src.tell() < pos + (payload_size as u64) {
let res = read_multiple_frame(self.src, stream.clone(), false, false);
Ok(pkt)
},
_ => { // multiple frames
-println!(" mode 3");
+//println!(" mode 3");
let res = read_multiple_frame(self.src, stream.clone(), keyframe, true);
if res.is_err() { return res; }
while self.src.tell() < pos + (payload_size as u64) {
}
},
RMStreamType::Audio(ref mut astr) => {
- let (tb_num, tb_den) = stream.get_timebase();
- let ts = NATimeInfo::new(Some(ts as u64), None, None, tb_num, tb_den);
- self.src.read_packet(stream, ts, keyframe, payload_size)
+ let ret = astr.read_apackets(&mut self.queued_pkts, &mut self.src, stream, ts, keyframe, payload_size);
+ if let Err(DemuxerError::TryAgain) = ret {
+ continue;
+ }
+ ret
},
_ => {
// self.src.read_skip(payload_size)?;
fn read_chunk(src: &mut ByteReader) -> DemuxerResult<(u32, u32, u16)> {
let id = src.read_u32be()?;
+if id == 0 { return Ok((0, 0, 0)); }
let size = src.read_u32be()?;
+if size == 0 {
+ let ver = src.read_u16be()?;
+ validate!(ver <= 1);
+ return Ok((id, 0x0FFFFFFF, ver));
+}
validate!(size >= 10);
let ver = src.read_u16be()?;
validate!(ver <= 1);
Ok((id, size, ver))
}
+#[derive(Clone,Copy,Debug)]
+struct InterleaveInfo {
+ id: u32,
+ factor: u16,
+ block_size: u16,
+ frame_size: u16,
+}
+
+#[derive(Clone,Copy,Debug)]
+struct RealAudioInfo {
+ fcc: u32,
+ sample_rate: u32,
+ sample_size: u16,
+ flavor: u16,
+ channels: u16,
+ channel_mask: u32,
+ granularity: u32,
+ bytes_per_minute: u32,
+ total_bytes: u32,
+ edata_size: u32,
+ ileave_info: Option<InterleaveInfo>
+}
+
+fn skip_ra_metadata(src: &mut ByteReader) -> DemuxerResult<()> {
+ let title_len = src.read_byte()? as usize;
+ src.read_skip(title_len)?;
+ let author_len = src.read_byte()? as usize;
+ src.read_skip(author_len)?;
+ let copywrong_len = src.read_byte()? as usize;
+ src.read_skip(copywrong_len)?;
+ let comment_len = src.read_byte()? as usize;
+ src.read_skip(comment_len)?;
+ Ok(())
+}
+
+#[allow(unused_variables)]
+fn parse_aformat3(src: &mut ByteReader) -> DemuxerResult<RealAudioInfo> {
+ let start = src.tell();
+ let header_len = src.read_u16be()?;
+ validate!(header_len >= 24);
+ let flavor = src.read_u16be()?;
+ let granularity = src.read_u32be()?;
+ let bytes_per_minute = src.read_u32be()?;
+ let total_bytes = src.read_u32be()?;
+
+ 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()?;
+
+ let end = src.tell();
+ validate!(end - start <= (header_len as u64) + 2);
+
+ Ok(RealAudioInfo {
+ fcc: fcc, flavor: flavor,
+ sample_rate: 8000, sample_size: 16, channels: 1, channel_mask: 0,
+ granularity: granularity, bytes_per_minute: bytes_per_minute,
+ total_bytes: total_bytes, edata_size: 0,
+ ileave_info: None,
+ })
+}
+
+#[allow(unused_variables)]
+fn parse_aformat4(src: &mut ByteReader) -> DemuxerResult<RealAudioInfo> {
+ let start = src.tell();
+ src.read_skip(2)?; // zeroes
+ let id = src.read_u32be()?;
+ validate!(id == mktag!(b".ra4"));
+ let data_size = src.read_u32be()?;
+ let _ver4 = src.read_u16be()?; // should be 4
+ let header_size = src.read_u32be()?;
+ let flavor = src.read_u16be()?;
+ let granularity = src.read_u32be()?;
+ let total_bytes = src.read_u32be()?;
+ let bytes_per_minute = src.read_u32be()?;
+ let _bytes_per_minute2 = src.read_u32be()?;
+ let ileave_factor = src.read_u16be()?;
+ let ileave_block_size = src.read_u16be()?;
+ let _user_data = src.read_u16be()?;
+ let sample_rate = src.read_u32be()?;
+ let sample_size = src.read_u32be()?;
+ let channels = src.read_u16be()?;
+ let interleaver_id_len = src.read_byte()?;
+ validate!(interleaver_id_len == 4);
+ let interleaver_id = src.read_u32be()?;
+ let fcc_len = src.read_byte()?;
+ validate!(fcc_len == 4);
+ let fcc = src.read_u32be()?;
+ let is_interleaved = src.read_byte()?;
+ let _can_copy = src.read_byte()?;
+ let _stream_type = src.read_byte()?;
+
+ skip_ra_metadata(src)?;
+
+ let end = src.tell();
+ validate!(end - start <= (header_size as u64) + 10);
+
+ let ileave_info = if is_interleaved != 0 {
+ Some(InterleaveInfo {
+ id: interleaver_id, factor: ileave_factor, block_size: granularity as u16,
+ frame_size: ileave_block_size,
+ })
+ } else {
+ None
+ };
+
+ Ok(RealAudioInfo {
+ fcc: fcc, flavor: flavor,
+ sample_rate: sample_rate, sample_size: sample_size as u16, channels: channels, channel_mask: 0,
+ granularity: granularity, bytes_per_minute: bytes_per_minute,
+ total_bytes: total_bytes & 0xFFFFFF, edata_size: 0,
+ ileave_info: ileave_info,
+ })
+}
+
+#[allow(unused_variables)]
+fn parse_aformat5(src: &mut ByteReader) -> DemuxerResult<RealAudioInfo> {
+ let start = src.tell();
+ src.read_skip(2)?; // zeroes
+ let id = src.read_u32be()?;
+ validate!(id == mktag!(b".ra5"));
+ let data_size = src.read_u32be()?;
+ let _ver5 = src.read_u16be()?; // should be 5
+ let header_size = src.read_u32be()?;
+ let flavor = src.read_u16be()?;
+ let granularity = src.read_u32be()?;
+ let total_bytes = src.read_u32be()?;
+ let bytes_per_minute = src.read_u32be()?;
+ let _bytes_per_minute2 = src.read_u32be()?;
+ let ileave_factor = src.read_u16be()?;
+ let frame_size = src.read_u16be()?;
+ let ileave_block_size = src.read_u16be()?;
+ let user_data = src.read_u32be()?;
+ let _sample_rate1 = src.read_u16be()?;
+ let sample_rate = src.read_u32be()?;
+ let sample_size = src.read_u32be()?;
+ let channels = src.read_u16be()?;
+ let interleaver_id = src.read_u32be()?;
+ let fcc = src.read_u32be()?;
+ let is_interleaved = src.read_byte()?;
+ let _can_copy = src.read_byte()?;
+ let _stream_type = src.read_byte()?;
+ let has_ileave_pattern = src.read_byte()?;
+ if has_ileave_pattern != 0 {
+unimplemented!("ra5 interleave pattern");
+ }
+ let edata_size = src.read_u32be()?;
+
+ let end = src.tell();
+ validate!(end - start <= (header_size as u64) + 10);
+// src.read_skip(((end - start) as usize) - (header_size as usize) - 10)?;
+
+ let ileave_info = if is_interleaved != 0 {
+ Some(InterleaveInfo {
+ id: interleaver_id, factor: ileave_factor, block_size: ileave_block_size, frame_size: frame_size,
+ })
+ } else {
+ None
+ };
+
+ Ok(RealAudioInfo {
+ fcc: fcc, flavor: flavor,
+ sample_rate: sample_rate, sample_size: sample_size as u16, channels: channels, channel_mask: 0,
+ granularity: granularity, bytes_per_minute: bytes_per_minute,
+ total_bytes: total_bytes & 0xFFFFFF, edata_size: edata_size,
+ ileave_info: ileave_info,
+ })
+}
+
const RMVB_HDR_SIZE: u32 = 18;
const RMVB_PROP_SIZE: u32 = 50;
const KEYFRAME_FLAG: u8 = 0x02;
}
for _ in 0..num_hdr {
- self.parse_chunk(strmgr)?;
+ if self.src.is_eof() {
+ //warn maybe?
+ break;
+ }
+ let res = self.parse_chunk(strmgr);
+ match res {
+ Ok(last) => { if last { break; } },
+ Err(DemuxerError::IOError) => { break; },
+ Err(etype) => { return Err(etype); },
+ };
}
-println!("now @ {:X} / {}", self.src.tell(), self.data_pos);
+//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()?;
let next_data_hdr = self.src.read_u32be()?;
- self.num_packets = num_packets;
+ self.num_packets = if num_packets > 0 { num_packets } else { 0xFFFFFF };
self.cur_packet = 0;
Ok(())
}
- fn parse_chunk(&mut self, strmgr: &mut StreamManager) -> DemuxerResult<()> {
+ fn parse_chunk(&mut self, strmgr: &mut StreamManager) -> DemuxerResult<bool> {
let (id, size, ver) = read_chunk(self.src)?;
let end_pos = self.src.tell() - 10 + (size as u64);
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"INDX") { /* do nothing for now */ }
+ else if id == 0 { return Ok(true); }
else { println!("unknown chunk type {:08X}", id); }
let cpos = self.src.tell();
if cpos < end_pos {
self.src.read_skip((end_pos - cpos) as usize)?;
}
- Ok(())
+ Ok(false)
}
#[allow(unused_variables)]
fn parse_content_desc(&mut self) -> DemuxerResult<()> {
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);
+//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);
+//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::with_capacity(edata_size);
let tag = src.read_u32be()?;
let tag2 = src.peek_u32be()?;
-println!("tag1 {:X} tag2 {:X}", tag, tag2);
+//println!("tag1 {:X} tag2 {:X}", tag, tag2);
if tag == mktag!('.', 'r', 'a', 0xFD) {
- //todo audio
- let cname = "unknown";//find_codec_name(RM_AUDIO_CODEC_REGISTER, fcc);
- let soniton = NASoniton::new(16, SONITON_FLAG_SIGNED);
- let ahdr = NAAudioInfo::new(44100, 2, soniton, 1/*block_align as usize*/);
- let extradata = None;
- let ainfo = NACodecInfo::new(cname, NACodecTypeInfo::Audio(ahdr), extradata);
- let res = strmgr.add_stream(NAStream::new(StreamType::Audio, stream_no as u32, ainfo, 1, 44100));
+ let ver = src.read_u16be()?;
+ let ainfo = match ver {
+ 3 => {
+ parse_aformat3(&mut src)?
+ },
+ 4 => {
+ parse_aformat4(&mut src)?
+ },
+ 5 => {
+ parse_aformat5(&mut 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 eslice = &edata_[(src.tell() as usize)..];
+ 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));
if res.is_none() { return Err(MemoryError); }
- let astr = RMAudioStream::new(Deinterleaver::None);
+ let astr = RMAudioStream::new(ainfo.ileave_info);
self.streams.push(RMStreamType::Audio(astr));
} else if ((tag2 == mktag!('V', 'I', 'D', 'O')) || (tag2 == mktag!('I', 'M', 'A', 'G'))) && ((tag as usize) <= edata_size) {
src.read_skip(4)?;
let vstr = RMVideoStream::new();
self.streams.push(RMStreamType::Video(vstr));
+ } else if tag == mktag!(b"LSD:") {
+ let extradata = Some(edata_.to_vec());
+
+ src.read_skip(4)?; //version
+ let channels = src.read_u16be()?;
+ 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, sample_rate));
+ if res.is_none() { return Err(MemoryError); }
+ let astr = RMAudioStream::new(None);
+ self.streams.push(RMStreamType::Audio(astr));
} else {
self.streams.push(RMStreamType::Logical);
}
(b"RVTR", "realvideo2"),
(b"RV30", "realvideo3"),
(b"RV40", "realvideo4"),
- (b"CLV1", "clearvideo"),
+ (b"CLV1", "clearvideo_rm"),
];
#[allow(dead_code)]
projects / nihav.git / blobdiff