X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=src%2Fdemuxers%2Fmod.rs;h=159002495d1c93b0e2e7dbc548dd34872ba4b31d;hb=ccae5343c71a92519937b9eafd9af0fe0ce3d799;hp=5c397acffd138f4fdf8c8041d08610fd869d812b;hpb=5869fd634c6a174ef2c541ddad4b1a4e9ec26d29;p=nihav.git diff --git a/src/demuxers/mod.rs b/src/demuxers/mod.rs index 5c397ac..1590024 100644 --- a/src/demuxers/mod.rs +++ b/src/demuxers/mod.rs @@ -1,4 +1,5 @@ pub mod gdv; +pub mod avi; use std::fmt; use std::rc::Rc; @@ -6,13 +7,14 @@ use frame::*; //use std::collections::HashMap; use io::byteio::*; -#[derive(Debug)] +#[derive(Debug,Clone,Copy)] #[allow(dead_code)] pub enum StreamType { Video, Audio, Subtitles, Data, + None, } impl fmt::Display for StreamType { @@ -22,35 +24,40 @@ impl fmt::Display for StreamType { StreamType::Audio => write!(f, "Audio"), StreamType::Subtitles => write!(f, "Subtitles"), StreamType::Data => write!(f, "Data"), + StreamType::None => write!(f, "-"), } } } #[allow(dead_code)] -pub struct NAStream<'a> { +#[derive(Clone)] +pub struct NAStream { media_type: StreamType, id: u32, - info: Rc>, + num: usize, + info: Rc, } -impl<'a> NAStream<'a> { - pub fn new(mt: StreamType, id: u32, info: NACodecInfo<'a>) -> Self { - NAStream { media_type: mt, id: id, info: Rc::new(info) } +impl NAStream { + pub fn new(mt: StreamType, id: u32, info: NACodecInfo) -> Self { + NAStream { media_type: mt, id: id, num: 0, info: Rc::new(info) } } pub fn get_id(&self) -> u32 { self.id } - pub fn get_info(&self) -> Rc> { self.info.clone() } + pub fn get_num(&self) -> usize { self.num } + pub fn set_num(&mut self, num: usize) { self.num = num; } + pub fn get_info(&self) -> Rc { self.info.clone() } } -impl<'a> fmt::Display for NAStream<'a> { +impl fmt::Display for NAStream { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - write!(f, "({}#{})", self.media_type, self.id) + write!(f, "({}#{} - {})", self.media_type, self.id, self.info.get_properties()) } } #[allow(dead_code)] -pub struct NAPacket<'a> { - stream: Rc>, +pub struct NAPacket { + stream: Rc, pts: Option, dts: Option, duration: Option, @@ -59,18 +66,18 @@ pub struct NAPacket<'a> { // options: HashMap>, } -impl<'a> NAPacket<'a> { - pub fn new(str: Rc>, pts: Option, dts: Option, dur: Option, kf: bool, vec: Vec) -> Self { +impl NAPacket { + pub fn new(str: Rc, pts: Option, dts: Option, dur: Option, kf: bool, vec: Vec) -> Self { // let mut vec: Vec = Vec::new(); // vec.resize(size, 0); NAPacket { stream: str, pts: pts, dts: dts, duration: dur, keyframe: kf, buffer: Rc::new(vec) } } - pub fn get_stream(&self) -> Rc> { self.stream.clone() } + pub fn get_stream(&self) -> Rc { self.stream.clone() } pub fn get_pts(&self) -> Option { self.pts } pub fn get_buffer(&self) -> Rc> { self.buffer.clone() } } -impl<'a> fmt::Display for NAPacket<'a> { +impl fmt::Display for NAPacket { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { let mut foo = format!("[pkt for {} size {}", self.stream, self.buffer.len()); if let Some(pts) = self.pts { foo = format!("{} pts {}", foo, pts); } @@ -95,25 +102,24 @@ pub enum DemuxerError { type DemuxerResult = Result; -pub trait NADemuxer<'a> { +pub trait Demux<'a> { fn open(&mut self) -> DemuxerResult<()>; fn get_frame(&mut self) -> DemuxerResult; fn seek(&mut self, time: u64) -> DemuxerResult<()>; } -pub trait NAPacketReader<'a> { - fn read_packet(&mut self, str: Rc>, pts: Option, dts: Option, dur: Option, keyframe: bool, size: usize) -> DemuxerResult; +pub trait NAPacketReader { + fn read_packet(&mut self, str: Rc, pts: Option, dts: Option, dur: Option, keyframe: bool, size: usize) -> DemuxerResult; fn fill_packet(&mut self, pkt: &mut NAPacket) -> DemuxerResult<()>; } -impl<'a> NAPacketReader<'a> for ByteReader<'a> { - fn read_packet(&mut self, str: Rc>, pts: Option, dts: Option, dur: Option, kf: bool, size: usize) -> DemuxerResult { +impl<'a> NAPacketReader for ByteReader<'a> { + fn read_packet(&mut self, str: Rc, pts: Option, dts: Option, dur: Option, kf: bool, size: usize) -> DemuxerResult { let mut buf: Vec = Vec::with_capacity(size); if buf.capacity() < size { return Err(DemuxerError::MemoryError); } buf.resize(size, 0); let res = self.read_buf(buf.as_mut_slice()); if let Err(_) = res { return Err(DemuxerError::IOError); } - if res.unwrap() < buf.len() { return Err(DemuxerError::IOError); } let pkt = NAPacket::new(str, pts, dts, dur, kf, buf); Ok(pkt) } @@ -122,21 +128,47 @@ impl<'a> NAPacketReader<'a> for ByteReader<'a> { let mut buf = Rc::make_mut(&mut refbuf); let res = self.read_buf(buf.as_mut_slice()); if let Err(_) = res { return Err(DemuxerError::IOError); } - if res.unwrap() < buf.len() { return Err(DemuxerError::IOError); } Ok(()) } } -pub struct NADemuxerBuilder { +pub struct Demuxer { + streams: Vec>, +} + +impl Demuxer { + pub fn new() -> Self { Demuxer { streams: Vec::new() } } + pub fn add_stream(&mut self, stream: NAStream) -> Option { + let stream_num = self.streams.len(); + let mut str = stream.clone(); + str.set_num(stream_num); + self.streams.push(Rc::new(str)); + Some(stream_num) + } + pub fn get_stream(&self, idx: usize) -> Option> { + if idx < self.streams.len() { + Some(self.streams[idx].clone()) + } else { + None + } + } + pub fn get_stream_by_id(&self, id: u32) -> Option> { + for i in 0..self.streams.len() { + if self.streams[i].get_id() == id { + return Some(self.streams[i].clone()); + } + } + None + } } impl From for DemuxerError { fn from(_: ByteIOError) -> Self { DemuxerError::IOError } } -impl NADemuxerBuilder { - #[allow(unused_variables)] - pub fn create_demuxer(name: &str, url: &str) -> DemuxerResult>> { - unimplemented!() - } -} +//impl NADemuxerBuilder { +// #[allow(unused_variables)] +// pub fn create_demuxer(name: &str, url: &str) -> DemuxerResult>> { +// unimplemented!() +// } +//}