X-Git-Url: https://git.nihav.org/?p=nihav-tool.git;a=blobdiff_plain;f=src%2Fmain.rs;h=cbd17d327ebe0769f92621b3cb30860a460c5090;hp=0892c43d0ba5a305c8877c2f0dfe51c8f8411c8e;hb=f7e9662a6343256ffdf5d1fc6bc7da45f2fb20e6;hpb=b4a0ee1dd70e9b69fddef9cdb22083f96a29914a diff --git a/src/main.rs b/src/main.rs index 0892c43..cbd17d3 100644 --- a/src/main.rs +++ b/src/main.rs @@ -3,7 +3,7 @@ extern crate nihav_codec_support; extern crate nihav_registry; extern crate nihav_allstuff; -use std::io::{SeekFrom, Write}; +use std::io::{SeekFrom, Write, BufReader}; use std::fs::File; use std::path::Path; use nihav_core::io::byteio::{FileReader, ByteReader}; @@ -74,16 +74,33 @@ fn main() { let args: Vec<_> = env::args().collect(); if args.len() == 1 { - println!("usage: nihav-tool [-noout] [-vn] [-an] input [lastpts]"); + println!("usage: nihav-tool [-noout] [-vn] [-an] input [endtime]"); + println!(" or invoke nihav-tool --help for more detailed information"); return; } - let mut lastpts: Option = None; + if args.len() == 2 && args[1] == "--help" { + println!("usage: nihav-tool [options] input [endtime]"); + println!("available options:"); + println!(" -noout - decode but do not write output"); + println!(" -an - do not decode audio streams"); + println!(" -vn - do not decode video streams"); + println!(" -nm={{count,pktpts,frmpts}} - use counter/frame PTS/decoded PTS as output image number"); + println!(" -skip={{key,intra}} - decode only reference frames (I-/P-) or intra frames only"); + println!(" -seek time - try seeking to the given time before starting decoding"); + println!(" -apfx/-vpfx prefix - use given prefix when creating output audio/video files instead of default 'out'"); + println!(" -ignerr - keep decoding even if decoding error is encountered"); + println!(" -dumpfrm - dump raw frame data for all streams"); + println!(" endtime - decoding end time, can be given either as time (hh:mm:ss.ms) or as a timestamp (e.g. 42pts)"); + return; + } + 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 = None; let mut apfx: Option<&str> = None; let mut ignore_errors = false; @@ -98,13 +115,15 @@ fn main() { "-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::(); + let ret = args[cur_arg].parse::(); if ret.is_err() { println!("wrong seek time"); return; @@ -136,11 +155,17 @@ fn main() { 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::(); + if ret.is_err() { + println!("cannot parse end time"); + return; + } + lastpts = ret.unwrap(); } let path = Path::new(name); - let mut file = File::open(path).unwrap(); + let file = File::open(path).unwrap(); + let mut file = BufReader::new(file); let dmx_fact; let mut fr = FileReader::new_read(&mut file); let mut br = ByteReader::new(&mut fr); @@ -155,13 +180,13 @@ println!("trying demuxer {} on {}", dmx_name, name); let mut dmx_reg = RegisteredDemuxers::new(); nihav_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - nihav_register_all_codecs(&mut dec_reg); + nihav_register_all_decoders(&mut dec_reg); dmx_fact = dmx_reg.find_demuxer(dmx_name).unwrap(); 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()); @@ -171,6 +196,7 @@ println!(" seek error {:?}", ret.err().unwrap()); let mut decs: Vec, Box)>> = Vec::new(); let mut sids: Vec = Vec::new(); let mut writers: Vec = 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(); @@ -188,6 +214,7 @@ println!("stream {} - {} {}", i, s, info.get_name()); 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: if let Some(ref str) = vpfx { str.clone() } else { "out".to_string() }, streamno: i, frameno: 1, nmode})); @@ -220,7 +247,6 @@ println!("stream {} - {} {}", i, s, info.get_name()); } } else { decs.push(None); -panic!("decoder {} not found", info.get_name()); } if !has_out { writers.push(Outputter::None); @@ -254,7 +280,7 @@ panic!("decoder {} not found", info.get_name()); }; } }, - Err(DecoderError::MissingReference) if seek_time > 0 => { + Err(DecoderError::MissingReference) if seek_time != NATimePoint::None => { println!("ignoring missing ref"); }, Err(reason) => { @@ -264,7 +290,7 @@ panic!("decoder {} not found", info.get_name()); } }, }; - 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");