X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=src%2Fdemuxers%2Fmod.rs;h=9d24e045b519d3610ec071458f5f6056b9b383b5;hb=b7b96b4cabbde72f05d0464299bf7fdf74d6480c;hp=c122a03ea2019935d7dfa0798b3294e0e3acda87;hpb=9037cf6b83ce135243522ec154cd7ffb35f8c816;p=nihav.git diff --git a/src/demuxers/mod.rs b/src/demuxers/mod.rs index c122a03..9d24e04 100644 --- a/src/demuxers/mod.rs +++ b/src/demuxers/mod.rs @@ -11,6 +11,7 @@ pub enum DemuxerError { IOError, NotImplemented, MemoryError, + TryAgain, } type DemuxerResult = Result; @@ -200,7 +201,7 @@ pub trait DemuxerCreator { } macro_rules! validate { - ($a:expr) => { if !$a { return Err(DemuxerError::InvalidData); } }; + ($a:expr) => { if !$a { println!("check failed at {}:{}", file!(), line!()); return Err(DemuxerError::InvalidData); } }; } #[cfg(feature="demuxer_gdv")] @@ -236,6 +237,6 @@ pub fn find_demuxer(name: &str) -> Option<&DemuxerCreator> { pub fn create_demuxer<'a>(dmxcr: &DemuxerCreator, br: &'a mut ByteReader<'a>) -> DemuxerResult> { let mut dmx = dmxcr.new_demuxer(br); let mut str = StreamManager::new(); - dmx.open(&mut str)?; + dmx.open(&mut str)?; Ok(Demuxer::new(dmx, str)) }