X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=src%2Fdemuxers%2Favi.rs;h=0b8ade0d5dc4b60114ca706105ffaddfdc6e019d;hb=b58d7656167205d9e8f48739f58637689d369314;hp=4a09545e9978996d4a2a0cf1bc5a94fb95b90c87;hpb=ca41f125f3589e28991a1ba5ee044154d2283075;p=nihav.git

diff --git a/src/demuxers/avi.rs b/src/demuxers/avi.rs
index 4a09545..0b8ade0 100644
--- a/src/demuxers/avi.rs
+++ b/src/demuxers/avi.rs
@@ -1,4 +1,5 @@
 use super::*;
+use register;
 use super::DemuxerError::*;
 use io::byteio::*;
 use frame::*;
@@ -48,7 +49,7 @@ pub struct AVIDemuxer<'a> {
     sstate:         StreamState,
 }
 
-#[derive(Debug,Clone,Copy)]
+#[derive(Debug,Clone,Copy,PartialEq)]
 enum RIFFTag {
     Chunk(u32),
     List(u32,u32),
@@ -122,38 +123,32 @@ impl<'a> AVIDemuxer<'a> {
         let tag  = self.src.read_u32be()?;
         let size = self.src.read_u32le()? as usize;
         if size > csize { return Err(InvalidData); }
-        if let RIFFTag::Chunk(etag) = end_tag {
-            if etag == tag { return Ok((size, true)); }
+        if RIFFTag::Chunk(tag) == end_tag {
+            return Ok((size, true));
         }
         let ltag = if is_list_tag(tag) { self.src.read_u32be()? } else { 0 };
-        if let RIFFTag::List(etag1, etag2) = end_tag {
-            if etag1 == tag && etag2 == ltag {
-                return Ok((size, true));
-            }
+        if RIFFTag::List(tag, ltag) == end_tag {
+            return Ok((size, true));
         }
-        
+
         for i in 0..CHUNKS.len() {
-            if let RIFFTag::Chunk(ctag) = CHUNKS[i].tag {
-                if ctag == tag {
-                    let psize = (CHUNKS[i].parse)(self, size)?;
-                    if psize != size { return Err(InvalidData); }
-                    return Ok((size + 8, false));
-                }
+            if RIFFTag::Chunk(tag) == CHUNKS[i].tag {
+                let psize = (CHUNKS[i].parse)(self, size)?;
+                if psize != size { return Err(InvalidData); }
+                return Ok((size + 8, false));
             }
-            if let RIFFTag::List(ctag, clst) = CHUNKS[i].tag {
-                if ctag == tag && clst == ltag {
-                    let mut rest_size = size - 4;
-                    let psize = (CHUNKS[i].parse)(self, rest_size)?;
+            if RIFFTag::List(tag, ltag) == CHUNKS[i].tag {
+                let mut rest_size = size - 4;
+                let psize = (CHUNKS[i].parse)(self, rest_size)?;
+                if psize > rest_size { return Err(InvalidData); }
+                rest_size -= psize;
+                while rest_size > 0 {
+                    let (psize, _) = self.parse_chunk(end_tag, rest_size, depth+1)?;
                     if psize > rest_size { return Err(InvalidData); }
                     rest_size -= psize;
-                    while rest_size > 0 {
-                        let (psize, _) = self.parse_chunk(end_tag, rest_size, depth+1)?;
-                        if psize > rest_size { return Err(InvalidData); }
-                        rest_size -= psize;                        
-                    }
-
-                    return Ok((size + 8, false));
                 }
+
+                return Ok((size + 8, false));
             }
         }
         self.src.read_skip(size)?;
@@ -275,7 +270,8 @@ fn parse_strf_vids(dmx: &mut AVIDemuxer, size: usize) -> DemuxerResult<usize> {
     let height          = dmx.src.read_u32le()? as i32;
     let planes          = dmx.src.read_u16le()?;
     let bitcount        = dmx.src.read_u16le()?;
-    let compression     = dmx.src.read_u32be()?;
+    let mut compression: [u8; 4] = [0; 4];
+                          dmx.src.read_buf(&mut compression)?;
     let img_size        = dmx.src.read_u32le()?;
     let xdpi            = dmx.src.read_u32le()?;
     let ydpi            = dmx.src.read_u32le()?;
@@ -287,7 +283,11 @@ fn parse_strf_vids(dmx: &mut AVIDemuxer, size: usize) -> DemuxerResult<usize> {
     let vhdr = NAVideoInfo::new(width, if flip { -height as u32 } else { height as u32}, flip, PAL8_FORMAT);
     let vci = NACodecTypeInfo::Video(vhdr);
     let edata = dmx.read_extradata(size - 40)?;
-    let vinfo = NACodecInfo::new(vci, edata);
+    let cname = match register::find_codec_from_avi_fourcc(&compression) {
+                    None => "unknown",
+                    Some(name) => name,
+                };
+    let vinfo = NACodecInfo::new(cname, vci, edata);
     let res = dmx.dmx.add_stream(NAStream::new(StreamType::Video, dmx.sstate.strm_no as u32, vinfo));
     if let None = res { return Err(MemoryError); }
     dmx.sstate.reset();
@@ -307,7 +307,11 @@ fn parse_strf_auds(dmx: &mut AVIDemuxer, size: usize) -> DemuxerResult<usize> {
     let soniton = NASoniton::new(bits_per_sample as u8, SONITON_FLAG_SIGNED);
     let ahdr = NAAudioInfo::new(samplespersec, channels as u8, soniton, block_align as usize);
     let edata = dmx.read_extradata(size - 16)?;
-    let ainfo = NACodecInfo::new(NACodecTypeInfo::Audio(ahdr), edata);
+    let cname = match register::find_codec_from_wav_twocc(w_format_tag) {
+                    None => "unknown",
+                    Some(name) => name,
+                };
+    let ainfo = NACodecInfo::new(cname, NACodecTypeInfo::Audio(ahdr), edata);
     let res = dmx.dmx.add_stream(NAStream::new(StreamType::Audio, dmx.sstate.strm_no as u32, ainfo));
     if let None = res { return Err(MemoryError); }
     dmx.sstate.reset();
@@ -316,7 +320,7 @@ fn parse_strf_auds(dmx: &mut AVIDemuxer, size: usize) -> DemuxerResult<usize> {
 
 fn parse_strf_xxxx(dmx: &mut AVIDemuxer, size: usize) -> DemuxerResult<usize> {
     let edata = dmx.read_extradata(size)?;
-    let info = NACodecInfo::new(NACodecTypeInfo::None, edata);
+    let info = NACodecInfo::new("unknown", NACodecTypeInfo::None, edata);
     let res = dmx.dmx.add_stream(NAStream::new(StreamType::Data, dmx.sstate.strm_no as u32, info));
     if let None = res { return Err(MemoryError); }
     dmx.sstate.reset();