X-Git-Url: https://git.nihav.org/?p=nihav-tool.git;a=blobdiff_plain;f=src%2Ffrmwriter.rs;h=a9c0612d81e0c438f862817a175ebb42988537de;hp=1a94fab964299638dbe219fa4149563cc4a4b9f5;hb=125ba9b318a96ff30375425e937588b0bd247f35;hpb=ffe695773d38f16f1a6f04086f47c19c1c7b4a92

diff --git a/src/frmwriter.rs b/src/frmwriter.rs
index 1a94fab..a9c0612 100644
--- a/src/frmwriter.rs
+++ b/src/frmwriter.rs
@@ -3,16 +3,21 @@ extern crate nihav_core;
 use nihav_core::frame::*;
 use std::io::prelude::*;
 use std::fs::File;
-use std::cell::Ref;
 
-pub fn write_pgmyuv(pfx: &str, strno: usize, num: u64, frm: Ref<NAFrame>) {
+pub fn write_pgmyuv(pfx: &str, strno: usize, num: u64, frm: NAFrameRef) {
     if let NABufferType::None = frm.get_buffer() { return; }
     let name = format!("{}out{:02}_{:08}.pgm", pfx, strno, 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 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();
@@ -45,9 +50,20 @@ pub fn write_pgmyuv(pfx: &str, strno: usize, num: u64, frm: Ref<NAFrame>) {
         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;
+        }
+    }
 }
 
-pub fn write_palppm(pfx: &str, strno: usize, num: u64, frm: Ref<NAFrame>) {
+pub fn write_palppm(pfx: &str, strno: usize, num: u64, frm: NAFrameRef) {
     let name = format!("{}out{:02}_{:08}.ppm", pfx, strno, num);
     let mut ofile = File::create(name).unwrap();
     let buf = frm.get_buffer().get_vbuf().unwrap();
@@ -78,7 +94,7 @@ pub fn write_palppm(pfx: &str, strno: usize, num: u64, frm: Ref<NAFrame>) {
     }
 }
 
-pub fn write_ppm(pfx: &str, strno: usize, num: u64, frm: Ref<NAFrame>) {
+pub fn write_ppm(pfx: &str, strno: usize, num: u64, frm: NAFrameRef) {
     let name = format!("{}out{:02}_{:08}.ppm", pfx, strno, num);
     let mut ofile = File::create(name).unwrap();
     if let NABufferType::VideoPacked(ref buf) = frm.get_buffer() {