X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=src%2Ftest%2Fdec_video.rs;h=4094d3aa2d36d8911976c7dad0c34c1f64d8bb1e;hb=f365013822ceffbdab8c3d155494a69e1596ebbb;hp=792d53fa27e700d0d95ca3a6b6676294e93b1478;hpb=379fd78171e79d878c258d9a5fa4c279dcb9b87f;p=nihav.git

diff --git a/src/test/dec_video.rs b/src/test/dec_video.rs
index 792d53f..4094d3a 100644
--- a/src/test/dec_video.rs
+++ b/src/test/dec_video.rs
@@ -14,7 +14,13 @@ fn write_pgmyuv(pfx: &str, strno: usize, num: u64, frmref: NAFrameRef) {
     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 has_alpha = buf.get_info().get_format().has_alpha();
+    let tot_h;
+    if has_alpha {
+        tot_h = h * 2 + h2;
+    } else {
+        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();
@@ -47,6 +53,17 @@ fn write_pgmyuv(pfx: &str, strno: usize, num: u64, frmref: NAFrameRef) {
         base1 += stride1;
         base2 += stride2;
     }
+    if has_alpha {
+        let ls = buf.get_stride(3);
+        let mut idx = buf.get_offset(3);
+        let mut idx2 = idx + w;
+        for _ in 0..h {
+            let line = &dta[idx..idx2];
+            ofile.write_all(line).unwrap();
+            idx  += ls;
+            idx2 += ls;
+        }
+    }
 }
 
 fn write_palppm(pfx: &str, strno: usize, num: u64, frmref: NAFrameRef) {
@@ -91,8 +108,7 @@ pub fn test_file_decoding(demuxer: &str, name: &str, limit: Option<u64>,
     let mut file = File::open(name).unwrap();
     let mut fr = FileReader::new_read(&mut file);
     let mut br = ByteReader::new(&mut fr);
-    let mut dmx = dmx_f.new_demuxer(&mut br);
-    dmx.open().unwrap();
+    let mut dmx = create_demuxer(dmx_f, &mut br).unwrap();
 
     let mut decs: Vec<Option<Box<NADecoder>>> = Vec::new();
     for i in 0..dmx.get_num_streams() {
@@ -142,8 +158,7 @@ pub fn test_decode_audio(demuxer: &str, name: &str, limit: Option<u64>, audio_pf
     let mut file = File::open(name).unwrap();
     let mut fr = FileReader::new_read(&mut file);
     let mut br = ByteReader::new(&mut fr);
-    let mut dmx = dmx_f.new_demuxer(&mut br);
-    dmx.open().unwrap();
+    let mut dmx = create_demuxer(dmx_f, &mut br).unwrap();
 
     let mut decs: Vec<Option<Box<NADecoder>>> = Vec::new();
     for i in 0..dmx.get_num_streams() {