From 0a90d212b18560a8983170a9282451225fa5503c Mon Sep 17 00:00:00 2001 From: Kostya Shishkov Date: Fri, 17 May 2019 14:37:16 +0200 Subject: [PATCH] handle flipped image output correctly --- src/frmwriter.rs | 118 ++++++++++++++++++++++++++++++++--------------- 1 file changed, 80 insertions(+), 38 deletions(-) diff --git a/src/frmwriter.rs b/src/frmwriter.rs index 57141cd..53acdb9 100644 --- a/src/frmwriter.rs +++ b/src/frmwriter.rs @@ -9,6 +9,7 @@ pub fn write_pgmyuv(pfx: &str, strno: usize, num: u64, frm: NAFrameRef) { 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 is_flipped = buf.get_info().is_flipped(); let (w, h) = buf.get_dimensions(0); let (w2, h2) = buf.get_dimensions(1); let has_alpha = buf.get_info().get_format().has_alpha(); @@ -22,32 +23,40 @@ pub fn write_pgmyuv(pfx: &str, strno: usize, num: u64, frm: NAFrameRef) { 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 = w; let pad: Vec = vec![0xFF; (w - w2 * 2) / 2]; - for _ in 0..h { - let line = &dta[idx..idx2]; - ofile.write_all(line).unwrap(); - idx += ls; - idx2 += ls; + if !is_flipped { + let ylines = dta.chunks(ls).take(h); + for line in ylines { + ofile.write_all(&line[..w]).unwrap(); + } + } else { + let ylines = dta[..h * ls].chunks(ls).rev(); + for line in ylines { + ofile.write_all(&line[..w]).unwrap(); + } } - let mut base1 = buf.get_offset(1); + let base1 = buf.get_offset(1); let stride1 = buf.get_stride(1); - let mut base2 = buf.get_offset(2); + let 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 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(); - let bend2 = base2 + w2; - let line = &dta[base2..bend2]; - ofile.write_all(line).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(); - base1 += stride1; - base2 += stride2; + ofile.write_all(&vline[..w2]).unwrap(); + ofile.write_all(pad.as_slice()).unwrap(); + } } if has_alpha { let ls = buf.get_stride(3); @@ -77,7 +86,8 @@ pub fn write_palppm(pfx: &str, strno: usize, num: u64, frm: NAFrameRef) { 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 ]; - let mut idx = 0; + let flipped = buf.get_info().is_flipped(); + let mut idx = if !flipped { 0 } else { ls * (h - 1) }; let mut line: Vec = vec![0; w * 3]; for _ in 0..h { let src = &dta[idx..(idx+w)]; @@ -88,7 +98,11 @@ pub fn write_palppm(pfx: &str, strno: usize, num: u64, frm: NAFrameRef) { line[x * 3 + 2] = dta[paloff + pix * 3 + offs[2]]; } ofile.write_all(line.as_slice()).unwrap(); - idx += ls; + if !flipped { + idx += ls; + } else { + idx -= ls; + } } } @@ -106,15 +120,27 @@ pub fn write_ppm(pfx: &str, strno: usize, num: u64, frm: NAFrameRef) { 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 ]; + let flipped = buf.get_info().is_flipped(); let step = buf.get_info().get_format().get_elem_size() as usize; let mut line: Vec = vec![0; w * 3]; - for src in dta.chunks(stride) { - for x in 0..w { - line[x * 3 + 0] = src[x * step + offs[0]]; - line[x * 3 + 1] = src[x * step + offs[1]]; - line[x * 3 + 2] = src[x * step + offs[2]]; + if !flipped { + for src in dta.chunks(stride) { + for x in 0..w { + line[x * 3 + 0] = src[x * step + offs[0]]; + line[x * 3 + 1] = src[x * step + offs[1]]; + line[x * 3 + 2] = src[x * step + offs[2]]; + } + ofile.write_all(line.as_slice()).unwrap(); + } + } else { + for src in dta[..stride * h].chunks(stride).rev() { + for x in 0..w { + line[x * 3 + 0] = src[x * step + offs[0]]; + line[x * 3 + 1] = src[x * step + offs[1]]; + line[x * 3 + 2] = src[x * step + offs[2]]; + } + ofile.write_all(line.as_slice()).unwrap(); } - ofile.write_all(line.as_slice()).unwrap(); } } else if let NABufferType::Video16(ref buf) = frm.get_buffer() { let (w, h) = buf.get_dimensions(0); @@ -138,17 +164,33 @@ pub fn write_ppm(pfx: &str, strno: usize, num: u64, frm: NAFrameRef) { buf.get_info().get_format().get_chromaton(2).unwrap().get_shift() ]; let mut line: Vec = vec![0; w * 3]; - for src in dta.chunks(stride) { - for x in 0..w { - let elem = src[x]; - let r = ((elem >> shifts[0]) & masks[0]) << (8 - depths[0]); - let g = ((elem >> shifts[1]) & masks[1]) << (8 - depths[1]); - let b = ((elem >> shifts[2]) & masks[2]) << (8 - depths[2]); - line[x * 3 + 0] = r as u8; - line[x * 3 + 1] = g as u8; - line[x * 3 + 2] = b as u8; + let flipped = buf.get_info().is_flipped(); + if !flipped { + for src in dta.chunks(stride) { + for x in 0..w { + let elem = src[x]; + let r = ((elem >> shifts[0]) & masks[0]) << (8 - depths[0]); + let g = ((elem >> shifts[1]) & masks[1]) << (8 - depths[1]); + let b = ((elem >> shifts[2]) & masks[2]) << (8 - depths[2]); + line[x * 3 + 0] = r as u8; + line[x * 3 + 1] = g as u8; + line[x * 3 + 2] = b as u8; + } + ofile.write_all(line.as_slice()).unwrap(); + } + } else { + for src in dta[..h * stride].chunks(stride).rev() { + for x in 0..w { + let elem = src[x]; + let r = ((elem >> shifts[0]) & masks[0]) << (8 - depths[0]); + let g = ((elem >> shifts[1]) & masks[1]) << (8 - depths[1]); + let b = ((elem >> shifts[2]) & masks[2]) << (8 - depths[2]); + line[x * 3 + 0] = r as u8; + line[x * 3 + 1] = g as u8; + line[x * 3 + 2] = b as u8; + } + ofile.write_all(line.as_slice()).unwrap(); } - ofile.write_all(line.as_slice()).unwrap(); } } else { panic!(" unhandled buf format"); -- 2.39.5