From b4a0ee1dd70e9b69fddef9cdb22083f96a29914a Mon Sep 17 00:00:00 2001 From: Kostya Shishkov Date: Tue, 26 May 2020 16:22:42 +0200 Subject: [PATCH] use PNM writer from nihav-codec-support --- Cargo.toml | 1 + src/frmwriter.rs | 225 ----------------------------------------------- src/main.rs | 16 +--- 3 files changed, 5 insertions(+), 237 deletions(-) delete mode 100644 src/frmwriter.rs diff --git a/Cargo.toml b/Cargo.toml index 2cbd17e..76cc06e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,5 +6,6 @@ edition = "2018" [dependencies] nihav_core = { path="../nihav-core" } +nihav_codec_support = { path="../nihav-codec-support" } nihav_registry = { path="../nihav-registry" } nihav_allstuff = { path="../nihav-allstuff" } diff --git a/src/frmwriter.rs b/src/frmwriter.rs deleted file mode 100644 index f882a7f..0000000 --- a/src/frmwriter.rs +++ /dev/null @@ -1,225 +0,0 @@ -extern crate nihav_core; - -use nihav_core::frame::*; -use std::io::prelude::*; -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!("{}{: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 mut tot_h = h + h2; - if has_alpha { - 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 = 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 { - 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 base1 = buf.get_offset(1); - let stride1 = buf.get_stride(1); - let base2 = buf.get_offset(2); - let stride2 = buf.get_stride(2); - let u = &dta[base1..][..h2*stride1]; - let v = &dta[base2..][..h2*stride2]; - let has_chroma = stride1 > 0 && stride2 > 0; - if !full_w && has_chroma { - 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(); - } - } 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 if has_chroma { - 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 { - 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: NAFrameRef) { - 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); - let paloff = buf.get_offset(1); - let hdr = format!("P6\n{} {}\n255\n", w, h); - ofile.write_all(hdr.as_bytes()).unwrap(); - let dta = buf.get_data(); - let ls = 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 - ]; - let flipped = buf.get_info().is_flipped(); - let mut idx = if !flipped { 0 } else { ls * h }; - let mut line: Vec = vec![0; w * 3]; - for _ in 0..h { - if flipped { - idx -= ls; - } - let src = &dta[idx..(idx+w)]; - for x in 0..w { - let pix = src[x] as usize; - line[x * 3 + 0] = dta[paloff + pix * 3 + offs[0]]; - line[x * 3 + 1] = dta[paloff + pix * 3 + offs[1]]; - line[x * 3 + 2] = dta[paloff + pix * 3 + offs[2]]; - } - ofile.write_all(line.as_slice()).unwrap(); - if !flipped { - idx += ls; - } - } -} - -pub fn write_ppm(pfx: &str, strno: usize, num: u64, frm: NAFrameRef) { - let name = format!("{}{:02}_{:08}.ppm", pfx, strno, num); - let mut ofile = File::create(name).unwrap(); - 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] = [ - 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 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) { - 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(); - } - } - } 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] = [ - 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, - (1 << depths[1]) - 1, - (1 << depths[2]) - 1 - ]; - let shifts: [u8; 3] = [ - 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]; - 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(); - } - } - } else { -panic!(" unhandled buf format"); - } -} diff --git a/src/main.rs b/src/main.rs index 59c1878..0892c43 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,4 +1,5 @@ extern crate nihav_core; +extern crate nihav_codec_support; extern crate nihav_registry; extern crate nihav_allstuff; @@ -9,13 +10,11 @@ use nihav_core::io::byteio::{FileReader, ByteReader}; use nihav_core::frame::*; use nihav_core::codecs::*; use nihav_core::demuxers::*; +use nihav_codec_support::imgwrite::*; use nihav_registry::detect; use nihav_allstuff::*; use std::env; -mod frmwriter; -use crate::frmwriter::*; - mod wavwriter; use crate::wavwriter::WavWriter; @@ -41,15 +40,8 @@ impl FrameOutput { NumberMode::PktPTS => { pkt.get_pts().unwrap() }, NumberMode::FrmPTS => { if let Some(pt) = frm.get_pts() { pt } else { pkt.get_pts().unwrap() } }, }; - let vinfo = frm.get_buffer().get_video_info().unwrap(); - if vinfo.get_format().is_paletted() { - write_palppm(&self.prefix, self.streamno, pts, frm); - } else if vinfo.get_format().get_model().is_yuv() { - write_pgmyuv(&self.prefix, self.streamno, pts, frm); - } else if vinfo.get_format().get_model().is_rgb() { - write_ppm(&self.prefix, self.streamno, pts, frm); - } else { -panic!(" unknown format"); + if let Err(_) = write_pnm(&self.prefix, self.streamno, pts, frm) { + println!("error writing output picture"); } } self.frameno += 1; -- 2.39.5