use super::*;
use io::byteio::*;
use frame::*;
+use formats::*;
//use std::collections::HashMap;
enum GDVState {
}
#[allow(dead_code)]
-pub struct GremlinVideoDemuxer<'a> {
- opened: bool,
- src: &'a mut ByteReader<'a>,
- streams: Vec<Rc<NAStream>>,
- frames: u16,
- cur_frame: u16,
- asize: usize,
- apacked: bool,
- state: GDVState,
- pktdta: Vec<u8>,
+struct GremlinVideoDemuxer<'a> {
+ opened: bool,
+ src: &'a mut ByteReader<'a>,
+ frames: u16,
+ cur_frame: u16,
+ asize: usize,
+ apacked: bool,
+ state: GDVState,
+ pktdta: Vec<u8>,
+ dmx: Demuxer,
+ a_id: Option<usize>,
+ v_id: Option<usize>,
}
-impl<'a> NADemuxer<'a> for GremlinVideoDemuxer<'a> {
+impl<'a> Demux<'a> for GremlinVideoDemuxer<'a> {
#[allow(unused_variables)]
fn open(&mut self) -> DemuxerResult<()> {
let src = &mut self.src;
src.read_skip(2)?;
let width = src.read_u16le()?;
let height = src.read_u16le()?;
-println!("id {} frames {} fps {} sound {} Hz {:X} img {} - {}x{}",id,frames,fps,rate,aflags,depth,width,height);
if max_fs > 0 {
- let vhdr = NAVideoInfo::new(width as u32, height as u32, false, PAL8_FORMAT);
+ let mut edata: Vec<u8> = Vec::with_capacity(768);
+ if depth == 1 {
+ edata.resize(768, 0);
+ src.read_buf(edata.as_mut_slice())?;
+ }
+ let vhdr = NAVideoInfo::new(width as usize, height as usize, false, PAL8_FORMAT);
let vci = NACodecTypeInfo::Video(vhdr);
- let vinfo = NACodecInfo::new(vci, None);
- let vstr = NAStream::new(StreamType::Video, 0, vinfo);
- self.streams.push(Rc::new(vstr));
+ let vinfo = NACodecInfo::new("gdv-video", vci, if edata.len() == 0 { None } else { Some(edata) });
+ self.v_id = self.dmx.add_stream(NAStream::new(StreamType::Video, 0, vinfo, 1, fps as u32));
}
if (aflags & 1) != 0 {
let channels = if (aflags & 2) != 0 { 2 } else { 1 };
- let ahdr = NAAudioInfo::new(rate as u32, channels as u8, if (aflags & 4) != 0 { SND_S16_FORMAT } else { SND_U8_FORMAT }, 2);
- let ainfo = NACodecInfo::new(NACodecTypeInfo::Audio(ahdr), None);
- let astr = NAStream::new(StreamType::Audio, 1, ainfo);
- self.streams.push(Rc::new(astr));
+ let packed = if (aflags & 8) != 0 { 1 } else { 0 };
+ let depth = if (aflags & 4) != 0 { 16 } else { 8 };
+
+ let ahdr = NAAudioInfo::new(rate as u32, channels as u8, if depth == 16 { SND_S16_FORMAT } else { SND_U8_FORMAT }, 2);
+ let ainfo = NACodecInfo::new(if packed != 0 { "gdv-audio" } else { "pcm" },
+ NACodecTypeInfo::Audio(ahdr), None);
+ self.a_id = self.dmx.add_stream(NAStream::new(StreamType::Audio, 1, ainfo, 1, rate as u32));
- let packed = if (aflags & 8) != 0 { 1 } else { 0 };
- self.asize = (((rate / fps) * channels * (if (aflags & 4) != 0 { 2 } else { 1 })) >> packed) as usize;
+ self.asize = (((rate / fps) * channels * (depth / 8)) >> packed) as usize;
self.apacked = (aflags & 8) != 0;
-println!("audio chunk size {}({:X})",self.asize,self.asize);
- }
- if max_fs > 0 && depth == 1 {
- src.read_skip(768)?;
}
self.frames = frames;
self.opened = true;
}
}
+ fn get_num_streams(&self) -> usize { self.dmx.get_num_streams() }
+ fn get_stream(&self, idx: usize) -> Option<Rc<NAStream>> { self.dmx.get_stream(idx) }
+
#[allow(unused_variables)]
fn seek(&mut self, time: u64) -> DemuxerResult<()> {
if !self.opened { return Err(DemuxerError::NoSuchInput); }
}
}*/
impl<'a> GremlinVideoDemuxer<'a> {
- pub fn new(io: &'a mut ByteReader<'a>) -> Self {
+ fn new(io: &'a mut ByteReader<'a>) -> Self {
GremlinVideoDemuxer {
cur_frame: 0,
frames: 0,
state: GDVState::NewFrame,
pktdta: Vec::new(),
src: io,
- streams: Vec::new()
+ a_id: None,
+ v_id: None,
+ dmx: Demuxer::new()
}
}
- fn find_stream(&mut self, id: u32) -> Rc<NAStream> {
- for i in 0..self.streams.len() {
- if self.streams[i].get_id() == id {
- return self.streams[i].clone();
- }
- }
- panic!("stream not found");
- }
fn read_achunk(&mut self) -> DemuxerResult<NAPacket> {
self.state = GDVState::AudioRead;
- let str = self.find_stream(1);
- self.src.read_packet(str, Some(self.cur_frame as u64), None, None, true, self.asize)
+ let str = self.dmx.get_stream(self.a_id.unwrap()).unwrap();
+ let (tb_num, tb_den) = str.get_timebase();
+ let ts = NATimeInfo::new(Some(self.cur_frame as u64), None, None, tb_num, tb_den);
+ self.src.read_packet(str, ts, true, self.asize)
}
fn read_vchunk(&mut self) -> DemuxerResult<NAPacket> {
- let str = self.find_stream(0);
+ let str = self.dmx.get_stream(self.v_id.unwrap()).unwrap();
let mut src = &mut self.src;
let magic = src.read_u16be()?;
if magic != 0x0513 { return Err(DemuxerError::InvalidData); }
let flags = (tmp & 0xFF) as usize;
self.state = GDVState::NewFrame;
self.cur_frame = self.cur_frame + 1;
- src.read_packet(str, Some((self.cur_frame - 1) as u64), None, None, if (flags & 64) != 0 { true } else { false }, size)
+ let (tb_num, tb_den) = str.get_timebase();
+ let ts = NATimeInfo::new(Some((self.cur_frame - 1) as u64), None, None, tb_num, tb_den);
+ src.read_packet(str, ts, if (flags & 64) != 0 { true } else { false }, size)
+ }
+}
+
+pub struct GDVDemuxerCreator { }
+
+impl DemuxerCreator for GDVDemuxerCreator {
+ fn new_demuxer<'a>(&self, br: &'a mut ByteReader<'a>) -> Box<Demux<'a> + 'a> {
+ Box::new(GremlinVideoDemuxer::new(br))
}
+ fn get_name(&self) -> &'static str { "gdv" }
}
#[cfg(test)]
projects / nihav.git / blobdiff