more utility code for decoders, move dumping functions to the core

[nihav.git] / src / codecs / indeo2.rs

diff --git a/src/codecs/indeo2.rs b/src/codecs/indeo2.rs
index 2c1333671105820921aebc3a4bc59e7dc5969589..707a59d244fc1318491a510939231c363acc5bf3 100644 (file)
--- a/src/codecs/indeo2.rs
+++ b/src/codecs/indeo2.rs
@@ -307,7 +307,6 @@ impl Indeo2Decoder {
 const IR2_START: usize = 48;
 
 impl NADecoder for Indeo2Decoder {
-    #[allow(unused_variables)]
     fn init(&mut self, info: Rc<NACodecInfo>) -> DecoderResult<()> {
         if let NACodecTypeInfo::Video(vinfo) = info.get_properties() {
             let w = vinfo.get_width();
@@ -368,12 +367,10 @@ pub fn get_decoder() -> Box<NADecoder> {
 
 #[cfg(test)]
 mod test {
-    use codecs;
+    use codecs::*;
     use demuxers::*;
     use frame::NAFrameRef;
     use io::byteio::*;
-    use std::fs::File;
-    use std::io::prelude::*;
 
     #[test]
     fn test_indeo2() {
@@ -383,16 +380,18 @@ mod test {
         let mut br = ByteReader::new(&mut fr);
         let mut dmx = avi_dmx.new_demuxer(&mut br);
         dmx.open().unwrap();
-        let mut dec = (codecs::find_decoder("indeo2").unwrap())();//Indeo2Decoder::new();
 
-        let mut str: u32 = 42;
+        let mut decs: Vec<Option<Box<NADecoder>>> = Vec::new();
         for i in 0..dmx.get_num_streams() {
             let s = dmx.get_stream(i).unwrap();
             let info = s.get_info();
-            if info.is_video() && info.get_name() == "indeo2" {
-                str = s.get_id();
-                dec.init(s.get_info()).unwrap();
-                break;
+            let decfunc = find_decoder(info.get_name());
+            if let Some(df) = decfunc {
+                let mut dec = (df)();
+                dec.init(info).unwrap();
+                decs.push(Some(dec));
+            } else {
+                decs.push(None);
             }
         }
 
@@ -403,52 +402,16 @@ mod test {
                 panic!("error");
             }
             let pkt = pktres.unwrap();
-            if pkt.get_stream().get_id() == str {
+            if pkt.get_pts().unwrap() > 10 { break; }
+            let streamno = pkt.get_stream().get_id() as usize;
+            if let Some(ref mut dec) = decs[streamno] {
                 let frm = dec.decode(&pkt).unwrap();
-                write_pgmyuv(pkt.get_pts().unwrap(), frm);
+                if pkt.get_stream().get_info().is_video() {
+                    write_pgmyuv("iv2", streamno, pkt.get_pts().unwrap(), frm);
+                } else {
+                    write_sound("iv2", streamno, frm, pkt.get_pts().unwrap() == 0);
+                }
             }
         }
     }
-
-    fn write_pgmyuv(num: u64, frmref: NAFrameRef) {
-        let frm = frmref.borrow();
-        let name = format!("assets/out{:04}.pgm", num);
-        let mut ofile = File::create(name).unwrap();
-        let buf = frm.get_buffer().get_vbuf().unwrap();
-        let (w, h) = buf.get_dimensions(0);
-        let (w2, h2) = buf.get_dimensions(1);
-        let tot_h = h + h2;
-        let hdr = format!("P5\n{} {}\n255\n", w, tot_h);
-        ofile.write_all(hdr.as_bytes()).unwrap();
-        let dta = buf.get_data();
-        let ls = buf.get_stride(0);
-        let mut idx = 0;
-        let mut idx2 = ls;
-        let mut pad: Vec<u8> = Vec::with_capacity((w - w2 * 2) / 2);
-        pad.resize((w - w2 * 2) / 2, 0xFF);
-        for _ in 0..h {
-            let line = &dta[idx..idx2];
-            ofile.write_all(line).unwrap();
-            idx  += ls;
-            idx2 += ls;
-        }
-        let mut base1 = buf.get_offset(1);
-        let stride1 = buf.get_stride(1);
-        let mut base2 = buf.get_offset(2);
-        let stride2 = buf.get_stride(2);
-        for _ in 0..h2 {
-            let bend1 = base1 + w2;
-            let line = &dta[base1..bend1];
-            ofile.write_all(line).unwrap();
-            ofile.write_all(pad.as_slice()).unwrap();
-
-            let bend2 = base2 + w2;
-            let line = &dta[base2..bend2];
-            ofile.write_all(line).unwrap();
-            ofile.write_all(pad.as_slice()).unwrap();
-
-            base1 += stride1;
-            base2 += stride2;
-        }
-    }
 }