allow setting custom output prefixes

[nihav-tool.git] / src / frmwriter.rs

diff --git a/src/frmwriter.rs b/src/frmwriter.rs
index 53acdb92d0226c88207318ba95470bfc6676cdc8..5b50b816b20a340bca3f478c9e7f28e24f72c700 100644 (file)
--- a/src/frmwriter.rs
+++ b/src/frmwriter.rs
@@ -6,24 +6,26 @@ use std::fs::File;
 
 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 name = format!("{}{:02}_{:08}.pgm", pfx, strno, num);
     let mut ofile = File::create(name).unwrap();
     let buf = frm.get_buffer().get_vbuf().unwrap();
     let is_flipped = buf.get_info().is_flipped();
     let (w, h) = buf.get_dimensions(0);
     let (w2, h2) = buf.get_dimensions(1);
+    let full_w = w2 * 2 > w;
     let has_alpha = buf.get_info().get_format().has_alpha();
-    let tot_h;
+    let mut tot_h = h + h2;
     if has_alpha {
-        tot_h = h * 2 + h2;
-    } else {
-        tot_h = h + h2;
+        tot_h += h;
+    }
+    if full_w {
+        tot_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 pad: Vec<u8> = vec![0xFF; (w - w2 * 2) / 2];
+    let pad: Vec<u8> = vec![0xFF; if !full_w { (w - w2 * 2) / 2 } else { w - w2 } ];
     if !is_flipped {
         let ylines = dta.chunks(ls).take(h);
         for line in ylines {
@@ -41,21 +43,43 @@ pub fn write_pgmyuv(pfx: &str, strno: usize, num: u64, frm: NAFrameRef) {
     let stride2 = buf.get_stride(2);
     let u = &dta[base1..][..h2*stride1];
     let v = &dta[base2..][..h2*stride2];
-    if !is_flipped {
-        for (uline, vline) in u.chunks(stride1).zip(v.chunks(stride2)) {
-            ofile.write_all(&uline[..w2]).unwrap();
-            ofile.write_all(pad.as_slice()).unwrap();
+    if !full_w {
+        if !is_flipped {
+            for (uline, vline) in u.chunks(stride1).zip(v.chunks(stride2)) {
+                ofile.write_all(&uline[..w2]).unwrap();
+                ofile.write_all(pad.as_slice()).unwrap();
 
-            ofile.write_all(&vline[..w2]).unwrap();
-            ofile.write_all(pad.as_slice()).unwrap();
+                ofile.write_all(&vline[..w2]).unwrap();
+                ofile.write_all(pad.as_slice()).unwrap();
+            }
+        } else {
+            for (uline, vline) in u.chunks(stride1).rev().zip(v.chunks(stride2).rev()) {
+                ofile.write_all(&uline[..w2]).unwrap();
+                ofile.write_all(pad.as_slice()).unwrap();
+
+                ofile.write_all(&vline[..w2]).unwrap();
+                ofile.write_all(pad.as_slice()).unwrap();
+            }
         }
     } else {
-        for (uline, vline) in u.chunks(stride1).rev().zip(v.chunks(stride2).rev()) {
-            ofile.write_all(&uline[..w2]).unwrap();
-            ofile.write_all(pad.as_slice()).unwrap();
-
-            ofile.write_all(&vline[..w2]).unwrap();
-            ofile.write_all(pad.as_slice()).unwrap();
+        if !is_flipped {
+            for uline in u.chunks(stride1) {
+                ofile.write_all(&uline[..w2]).unwrap();
+                ofile.write_all(pad.as_slice()).unwrap();
+            }
+            for vline in v.chunks(stride2) {
+                ofile.write_all(&vline[..w2]).unwrap();
+                ofile.write_all(pad.as_slice()).unwrap();
+            }
+        } else {
+            for uline in u.chunks(stride1).rev() {
+                ofile.write_all(&uline[..w2]).unwrap();
+                ofile.write_all(pad.as_slice()).unwrap();
+            }
+            for vline in v.chunks(stride2).rev() {
+                ofile.write_all(&vline[..w2]).unwrap();
+                ofile.write_all(pad.as_slice()).unwrap();
+            }
         }
     }
     if has_alpha {
@@ -72,7 +96,7 @@ pub fn write_pgmyuv(pfx: &str, strno: usize, num: u64, frm: NAFrameRef) {
 }
 
 pub fn write_palppm(pfx: &str, strno: usize, num: u64, frm: NAFrameRef) {
-    let name = format!("{}out{:02}_{:08}.ppm", pfx, strno, num);
+    let name = format!("{}{:02}_{:08}.ppm", 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);
@@ -107,21 +131,23 @@ pub fn write_palppm(pfx: &str, strno: usize, num: u64, frm: NAFrameRef) {
 }
 
 pub fn write_ppm(pfx: &str, strno: usize, num: u64, frm: NAFrameRef) {
-    let name = format!("{}out{:02}_{:08}.ppm", pfx, strno, num);
+    let name = format!("{}{:02}_{:08}.ppm", pfx, strno, num);
     let mut ofile = File::create(name).unwrap();
-    if let NABufferType::VideoPacked(ref buf) = frm.get_buffer() {
+    let info = frm.get_buffer().get_video_info().unwrap();
+    let flipped = info.is_flipped();
+    let buffer = frm.get_buffer();
+    if let Some(ref buf) = buffer.get_vbuf() {
         let (w, h) = buf.get_dimensions(0);
         let hdr = format!("P6\n{} {}\n255\n", w, h);
         ofile.write_all(hdr.as_bytes()).unwrap();
         let dta = buf.get_data();
         let stride = buf.get_stride(0);
         let offs: [usize; 3] = [
-                buf.get_info().get_format().get_chromaton(0).unwrap().get_offset() as usize,
-                buf.get_info().get_format().get_chromaton(1).unwrap().get_offset() as usize,
-                buf.get_info().get_format().get_chromaton(2).unwrap().get_offset() as usize
+                info.get_format().get_chromaton(0).unwrap().get_offset() as usize,
+                info.get_format().get_chromaton(1).unwrap().get_offset() as usize,
+                info.get_format().get_chromaton(2).unwrap().get_offset() as usize
             ];
-        let flipped = buf.get_info().is_flipped();
-        let step = buf.get_info().get_format().get_elem_size() as usize;
+        let step = info.get_format().get_elem_size() as usize;
         let mut line: Vec<u8> = vec![0; w * 3];
         if !flipped {
             for src in dta.chunks(stride) {
@@ -142,16 +168,16 @@ pub fn write_ppm(pfx: &str, strno: usize, num: u64, frm: NAFrameRef) {
                 ofile.write_all(line.as_slice()).unwrap();
             }
         }
-    } else if let NABufferType::Video16(ref buf) = frm.get_buffer() {
+    } else if let NABufferType::Video16(ref buf) = buffer {
         let (w, h) = buf.get_dimensions(0);
         let hdr = format!("P6\n{} {}\n255\n", w, h);
         ofile.write_all(hdr.as_bytes()).unwrap();
         let dta = buf.get_data();
         let stride = buf.get_stride(0);
         let depths: [u8; 3] = [
-                buf.get_info().get_format().get_chromaton(0).unwrap().get_depth(),
-                buf.get_info().get_format().get_chromaton(1).unwrap().get_depth(),
-                buf.get_info().get_format().get_chromaton(2).unwrap().get_depth()
+                info.get_format().get_chromaton(0).unwrap().get_depth(),
+                info.get_format().get_chromaton(1).unwrap().get_depth(),
+                info.get_format().get_chromaton(2).unwrap().get_depth()
             ];
         let masks: [u16; 3] = [
                 (1 << depths[0]) - 1,
@@ -159,12 +185,11 @@ pub fn write_ppm(pfx: &str, strno: usize, num: u64, frm: NAFrameRef) {
                 (1 << depths[2]) - 1
             ];
         let shifts: [u8; 3] = [
-                buf.get_info().get_format().get_chromaton(0).unwrap().get_shift(),
-                buf.get_info().get_format().get_chromaton(1).unwrap().get_shift(),
-                buf.get_info().get_format().get_chromaton(2).unwrap().get_shift()
+                info.get_format().get_chromaton(0).unwrap().get_shift(),
+                info.get_format().get_chromaton(1).unwrap().get_shift(),
+                info.get_format().get_chromaton(2).unwrap().get_shift()
             ];
         let mut line: Vec<u8> = vec![0; w * 3];
-        let flipped = buf.get_info().is_flipped();
         if !flipped {
             for src in dta.chunks(stride) {
                 for x in 0..w {