From 7c6134ccc50772924bd4f6b917fe3dead9fc8e5e Mon Sep 17 00:00:00 2001 From: Kostya Shishkov Date: Thu, 16 Apr 2020 12:54:11 +0200 Subject: [PATCH] make frame writer handle both variants of 8-bit video buffer --- src/frmwriter.rs | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/src/frmwriter.rs b/src/frmwriter.rs index 6ae92bc..f3221d0 100644 --- a/src/frmwriter.rs +++ b/src/frmwriter.rs @@ -133,19 +133,21 @@ 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 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 = 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 = vec![0; w * 3]; - let flipped = buf.get_info().is_flipped(); if !flipped { for src in dta.chunks(stride) { for x in 0..w { -- 2.39.5