X-Git-Url: https://git.nihav.org/?p=nihav-tool.git;a=blobdiff_plain;f=src%2Ffrmwriter.rs;h=5b50b816b20a340bca3f478c9e7f28e24f72c700;hp=6ae92bc86df3fbb72261fe90b460371161793901;hb=7437145d254f1852f5b594e56e20124761bb5b02;hpb=f15f3836e13cc132ea67202a74cf85847ccccabb

diff --git a/src/frmwriter.rs b/src/frmwriter.rs
index 6ae92bc..5b50b81 100644
--- a/src/frmwriter.rs
+++ b/src/frmwriter.rs
@@ -6,7 +6,7 @@ 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();
@@ -96,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);
@@ -131,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) {
@@ -166,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,
@@ -183,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 {