X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=src%2Fdemuxers%2Fmod.rs;h=159002495d1c93b0e2e7dbc548dd34872ba4b31d;hb=ccae5343c71a92519937b9eafd9af0fe0ce3d799;hp=14aac9380761bff34c4ff1fdb6161fca95f3b373;hpb=20ef4353905883ca289782858ccfcd7d2146fa42;p=nihav.git

diff --git a/src/demuxers/mod.rs b/src/demuxers/mod.rs
index 14aac93..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;
@@ -13,6 +14,7 @@ pub enum StreamType {
     Audio,
     Subtitles,
     Data,
+    None,
 }
 
 impl fmt::Display for StreamType {
@@ -22,6 +24,7 @@ impl fmt::Display for StreamType {
             StreamType::Audio => write!(f, "Audio"),
             StreamType::Subtitles => write!(f, "Subtitles"),
             StreamType::Data => write!(f, "Data"),
+            StreamType::None => write!(f, "-"),
         }
     }
 }
@@ -48,7 +51,7 @@ impl NAStream {
 
 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())
     }
 }
 
@@ -117,7 +120,6 @@ impl<'a> NAPacketReader for ByteReader<'a> {
         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)
     }
@@ -126,7 +128,6 @@ impl<'a> NAPacketReader 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(())
     }
 }