extern crate nihav_core;
+extern crate nihav_codec_support;
extern crate nihav_registry;
extern crate nihav_allstuff;
-use std::io::SeekFrom;
+use std::io::{SeekFrom, Write};
use std::fs::File;
use std::path::Path;
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;
}
struct FrameOutput {
- prefix: &'static str,
+ prefix: String,
streamno: usize,
frameno: u64,
nmode: NumberMode,
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;
println!("usage: nihav-tool [-noout] [-vn] [-an] input [lastpts]");
return;
}
- let mut lastpts: Option<u64> = None;
+ let mut lastpts = NATimePoint::None;
let mut cur_arg: usize = 1;
let mut noout = false;
let mut decode_video = true;
let mut decode_audio = true;
let mut nmode = NumberMode::FrmPTS;
- let mut seek_time = 0u64;
+ let mut smode = FrameSkipMode::None;
+ let mut seek_time = NATimePoint::None;
+ let mut vpfx: Option<String> = None;
+ let mut apfx: Option<&str> = None;
+ let mut ignore_errors = false;
+ let mut dump_frames = false;
while (cur_arg < args.len()) && args[cur_arg].starts_with('-') {
match args[cur_arg].as_str() {
"-nm=count" => { nmode = NumberMode::Counter; },
"-nm=pktpts" => { nmode = NumberMode::PktPTS; },
"-nm=frmpts" => { nmode = NumberMode::FrmPTS; },
+ "-skip=key" => { smode = FrameSkipMode::KeyframesOnly; },
+ "-skip=intra" => { smode = FrameSkipMode::IntraOnly; },
"-seek" => {
cur_arg += 1;
if cur_arg == args.len() {
println!("seek time missing");
return;
}
- let ret = args[cur_arg].parse::<u64>();
+ let ret = args[cur_arg].parse::<NATimePoint>();
if ret.is_err() {
println!("wrong seek time");
return;
}
seek_time = ret.unwrap();
},
+ "-apfx" => {
+ cur_arg += 1;
+ if cur_arg == args.len() {
+ println!("name missing");
+ return;
+ }
+ apfx = Some(&args[cur_arg]);
+ },
+ "-vpfx" => {
+ cur_arg += 1;
+ if cur_arg == args.len() {
+ println!("name missing");
+ return;
+ }
+ vpfx = Some(args[cur_arg].clone());
+ },
+ "-ignerr" => { ignore_errors = true; },
+ "-dumpfrm" => { dump_frames = true; },
_ => { println!("unknown option {}", args[cur_arg]); return; },
}
cur_arg += 1;
let name = args[cur_arg].as_str();
cur_arg += 1;
if cur_arg < args.len() {
- lastpts = Some(u64::from_str_radix(args[cur_arg].as_str(), 10).unwrap());
+ let ret = args[cur_arg].parse::<NATimePoint>();
+ if ret.is_err() {
+ println!("cannot parse end time");
+ return;
+ }
+ lastpts = ret.unwrap();
}
let path = Path::new(name);
br.seek(SeekFrom::Start(0)).unwrap();
let mut dmx = create_demuxer(dmx_fact, &mut br).unwrap();
- if seek_time > 0 {
+ if seek_time != NATimePoint::None {
let ret = dmx.seek(seek_time);
if ret.is_err() {
println!(" seek error {:?}", ret.err().unwrap());
let mut decs: Vec<Option<(Box<NADecoderSupport>, Box<dyn NADecoder>)>> = Vec::new();
let mut sids: Vec<u32> = Vec::new();
let mut writers: Vec<Outputter> = Vec::new();
+ let dec_opts = [NAOption{name: FRAME_SKIP_OPTION, value: NAValue::String(smode.to_string())}];
for i in 0..dmx.get_num_streams() {
let s = dmx.get_stream(i).unwrap();
let info = s.get_info();
let mut dec = (decfunc.unwrap())();
let mut dsupp = Box::new(NADecoderSupport::new());
dec.init(&mut dsupp, info).unwrap();
+ dec.set_options(&dec_opts);
decs.push(Some((dsupp, dec)));
if !noout {
- writers.push(Outputter::Video(FrameOutput{prefix: "", streamno: i, frameno: 1, nmode}));
+ writers.push(Outputter::Video(FrameOutput{prefix: if let Some(ref str) = vpfx { str.clone() } else { "out".to_string() }, streamno: i, frameno: 1, nmode}));
has_out = true;
}
} else {
dec.init(&mut dsupp, info).unwrap();
decs.push(Some((dsupp, dec)));
if !noout {
- let name = format!("out{:02}.wav", i);
+ let name = if let Some(apfx) = apfx {
+ format!("{}{:02}.wav", apfx, i)
+ } else {
+ format!("out{:02}.wav", i)
+ };
writers.push(Outputter::Audio(AudioOutput::new(&name)));
has_out = true;
}
}
} else {
decs.push(None);
-panic!("decoder {} not found", info.get_name());
}
if !has_out {
writers.push(Outputter::None);
}
}
+ let mut frmnum = 0;
loop {
let pktres = dmx.get_frame();
if let Err(e) = pktres {
let streamno = pkt.get_stream().get_id();
let sr = sids.iter().position(|x| *x == streamno);
let idx = sr.unwrap();
+ if dump_frames {
+ let name = format!("out{:02}_{:08}.frm", streamno, pkt.get_pts().unwrap_or(frmnum));
+ let mut ofile = File::create(name).unwrap();
+ ofile.write(pkt.get_buffer().as_slice()).unwrap();
+ frmnum += 1;
+ }
if let Some((ref mut dsupp, ref mut dec)) = decs[idx] {
match dec.decode(dsupp, &pkt) {
Ok(frm) => {
};
}
},
- Err(DecoderError::MissingReference) if seek_time > 0 => {
+ Err(DecoderError::MissingReference) if seek_time != NATimePoint::None => {
println!("ignoring missing ref");
},
Err(reason) => {
println!("error decoding frame {:?}", reason);
- break;
+ if !ignore_errors {
+ break;
+ }
},
};
- if pkt.get_pts() != None && lastpts.is_some() && pkt.get_pts() >= lastpts { break; }
+ if pkt.get_pts() != None && lastpts != NATimePoint::None && !pkt.ts.less_than(lastpts) { break; }
}
}
//panic!("end");
projects / nihav-tool.git / blobdiff