X-Git-Url: https://git.nihav.org/?p=nihav-tool.git;a=blobdiff_plain;f=src%2Fmain.rs;h=8280799a790bbc7b31af4a532eeee4369d6a1441;hp=ff6baac91cea84ed7bf3dc46c6ae0465fc5eaf70;hb=55d3e99fc4841c63564e337e5b7ec40559f1d19a;hpb=7437145d254f1852f5b594e56e20124761bb5b02 diff --git a/src/main.rs b/src/main.rs index ff6baac..8280799 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,21 +1,19 @@ extern crate nihav_core; +extern crate nihav_codec_support; extern crate nihav_registry; extern crate nihav_allstuff; -use std::io::SeekFrom; +use std::io::{Write, BufReader}; 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_registry::detect; -use nihav_allstuff::*; +use nihav_codec_support::imgwrite::*; use std::env; -mod frmwriter; -use crate::frmwriter::*; - +mod demux; +use demux::*; mod wavwriter; use crate::wavwriter::WavWriter; @@ -41,15 +39,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 write_pnm(&self.prefix, self.streamno, pts, frm).is_err() { + println!("error writing output picture"); } } self.frameno += 1; @@ -82,18 +73,37 @@ 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; + } + 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: Option = 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 = 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() { @@ -104,13 +114,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; @@ -133,6 +145,8 @@ fn main() { } vpfx = Some(args[cur_arg].clone()); }, + "-ignerr" => { ignore_errors = true; }, + "-dumpfrm" => { dump_frames = true; }, _ => { println!("unknown option {}", args[cur_arg]); return; }, } cur_arg += 1; @@ -140,33 +154,38 @@ 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 dmx_fact; - let mut fr = FileReader::new_read(&mut file); + let file = File::open(path).unwrap(); + let file = BufReader::new(file); + let mut fr = FileReader::new_read(file); let mut br = ByteReader::new(&mut fr); - let res = detect::detect_format(name, &mut br); - if res.is_none() { - println!("cannot detect format for {}", name); + let (is_raw, start, end) = detect_tags(&mut br); + + let mut nfr: Box; + if start != 0 || end.is_some() { + println!(" limiting range to {:X}-{:X}", start, end.unwrap_or(0)); + let file = fr.finish(); + nfr = Box::new(BoundedFileReader::new_read(file, start, end).unwrap()); + } else { + nfr = Box::new(fr); + } + let mut br = ByteReader::new(nfr.as_mut()); + let full_reg = FullRegister::new(); + let mut demuxer = DemuxerObject::create(&mut br, &full_reg, name, is_raw); + if demuxer.is_none() { + println!("No demuxer found!"); return; } - let (dmx_name, _) = res.unwrap(); -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); - - 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 { - let ret = dmx.seek(seek_time); + if seek_time != NATimePoint::None { + let ret = demuxer.seek(seek_time); if ret.is_err() { println!(" seek error {:?}", ret.err().unwrap()); } @@ -175,10 +194,18 @@ 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(); - for i in 0..dmx.get_num_streams() { - let s = dmx.get_stream(i).unwrap(); + let dec_opts = [NAOption{name: FRAME_SKIP_OPTION, value: NAValue::String(smode.to_string())}]; + let duration = demuxer.get_duration(); + if duration != 0 { + let s = duration / 1000; + let m = s / 60; + let h = m / 60; + println!(" total duration {}:{:02}:{:02}.{}", h, m % 60, s % 60, (duration / 100) % 10); + } + for i in 0..demuxer.get_num_streams() { + let s = demuxer.get_stream(i).unwrap(); let info = s.get_info(); - let decfunc = dec_reg.find_decoder(info.get_name()); + let decfunc = full_reg.dec_reg.find_decoder(info.get_name()); println!("stream {} - {} {}", i, s, info.get_name()); let str_id = s.get_id(); let mut has_out = false; @@ -192,6 +219,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})); @@ -224,15 +252,15 @@ 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); } } + let mut frmnum = 0; loop { - let pktres = dmx.get_frame(); + let pktres = demuxer.get_frame(); if let Err(e) = pktres { if e == DemuxerError::EOF { break; } } @@ -240,6 +268,12 @@ panic!("decoder {} not found", info.get_name()); 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_all(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) => { @@ -251,15 +285,17 @@ 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) => { 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");