X-Git-Url: https://git.nihav.org/?p=nihav-tool.git;a=blobdiff_plain;f=src%2Fmain.rs;h=bb94c1218432969bcebead768e75deb3fbaa6b68;hp=d30dd871d8aceadbe6dd08a3eb03d3756b8251d5;hb=e9c93f5f087a52d9f5c14c5f3bb821038f1b211d;hpb=ffe695773d38f16f1a6f04086f47c19c1c7b4a92 diff --git a/src/main.rs b/src/main.rs index d30dd87..bb94c12 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,4 +1,5 @@ extern crate nihav_core; +extern crate nihav_registry; extern crate nihav_allstuff; use std::io::SeekFrom; @@ -8,7 +9,7 @@ use nihav_core::io::byteio::{FileReader, ByteReader}; use nihav_core::frame::*; use nihav_core::codecs::*; use nihav_core::demuxers::*; -use nihav_core::detect; +use nihav_registry::detect; use nihav_allstuff::*; use std::env; @@ -26,15 +27,14 @@ enum NumberMode { } struct FrameOutput { - prefix: &'static str, + prefix: String, streamno: usize, frameno: u64, nmode: NumberMode, } impl FrameOutput { - fn output_frame(&mut self, pkt: &NAPacket, frmref: NAFrameRef) { - let frm = frmref.borrow(); + fn output_frame(&mut self, pkt: &NAPacket, frm: NAFrameRef) { if frm.get_frame_type() != FrameType::Skip { let pts = match self.nmode { NumberMode::Counter => { self.frameno }, @@ -43,11 +43,11 @@ impl FrameOutput { }; let vinfo = frm.get_buffer().get_video_info().unwrap(); if vinfo.get_format().is_paletted() { - write_palppm(self.prefix, self.streamno, pts, frm); + 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); + 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); + write_ppm(&self.prefix, self.streamno, pts, frm); } else { panic!(" unknown format"); } @@ -62,13 +62,13 @@ struct AudioOutput { } impl AudioOutput { - fn new(name: &String) -> Self { Self { wwr: WavWriter::new(name), wrote_header: false } } + fn new(name: &str) -> Self { Self { wwr: WavWriter::new(name), wrote_header: false } } fn output_frame(&mut self, _pkt: &NAPacket, frm: NAFrameRef) { if !self.wrote_header { - self.wwr.write_header(frm.borrow().get_info().as_ref().get_properties().get_audio_info().unwrap()).unwrap(); + self.wwr.write_header(frm.get_info().as_ref().get_properties().get_audio_info().unwrap()).unwrap(); self.wrote_header = true; } - self.wwr.write_frame(frm.borrow().get_buffer()).unwrap(); + self.wwr.write_frame(frm.get_buffer()).unwrap(); } } @@ -91,8 +91,12 @@ fn main() { let mut decode_video = true; let mut decode_audio = true; let mut nmode = NumberMode::FrmPTS; + let mut seek_time = 0u64; + let mut vpfx: Option = None; + let mut apfx: Option<&str> = None; + let mut ignore_errors = false; - while (cur_arg < args.len()) && (args[cur_arg].chars().next().unwrap() == '-') { + while (cur_arg < args.len()) && args[cur_arg].starts_with('-') { match args[cur_arg].as_str() { "--" => { break; }, "-noout" => { noout = true; }, @@ -101,6 +105,36 @@ fn main() { "-nm=count" => { nmode = NumberMode::Counter; }, "-nm=pktpts" => { nmode = NumberMode::PktPTS; }, "-nm=frmpts" => { nmode = NumberMode::FrmPTS; }, + "-seek" => { + cur_arg += 1; + if cur_arg == args.len() { + println!("seek time missing"); + return; + } + let ret = args[cur_arg].parse::(); + 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; }, _ => { println!("unknown option {}", args[cur_arg]); return; }, } cur_arg += 1; @@ -133,7 +167,14 @@ println!("trying demuxer {} on {}", dmx_name, name); br.seek(SeekFrom::Start(0)).unwrap(); let mut dmx = create_demuxer(dmx_fact, &mut br).unwrap(); - let mut decs: Vec>> = Vec::new(); + if seek_time > 0 { + let ret = dmx.seek(seek_time); + if ret.is_err() { +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() { @@ -151,10 +192,11 @@ println!("stream {} - {} {}", i, s, info.get_name()); return; } let mut dec = (decfunc.unwrap())(); - dec.init(info).unwrap(); - decs.push(Some(dec)); + let mut dsupp = Box::new(NADecoderSupport::new()); + dec.init(&mut dsupp, info).unwrap(); + decs.push(Some((dsupp, dec))); if !noout { - writers.push(Outputter::Video(FrameOutput{prefix: "", streamno: i, frameno: 1, nmode: 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 { @@ -167,10 +209,15 @@ println!("stream {} - {} {}", i, s, info.get_name()); return; } let mut dec = (decfunc.unwrap())(); - dec.init(info).unwrap(); - decs.push(Some(dec)); + let mut dsupp = Box::new(NADecoderSupport::new()); + 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; } @@ -195,17 +242,29 @@ 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 let Some(ref mut dec) = decs[idx] { - let frm = dec.decode(&pkt).unwrap(); - if !noout { - match writers[idx] { - Outputter::Video(ref mut wr) => { wr.output_frame(&pkt, frm); }, - Outputter::Audio(ref mut wr) => { wr.output_frame(&pkt, frm); }, - _ => {}, - }; - } + if let Some((ref mut dsupp, ref mut dec)) = decs[idx] { + match dec.decode(dsupp, &pkt) { + Ok(frm) => { + if !noout { + match writers[idx] { + Outputter::Video(ref mut wr) => { wr.output_frame(&pkt, frm); }, + Outputter::Audio(ref mut wr) => { wr.output_frame(&pkt, frm); }, + _ => {}, + }; + } + }, + Err(DecoderError::MissingReference) if seek_time > 0 => { + println!("ignoring missing ref"); + }, + Err(reason) => { + println!("error decoding frame {:?}", reason); + if !ignore_errors { + break; + } + }, + }; + if pkt.get_pts() != None && lastpts.is_some() && pkt.get_pts() >= lastpts { break; } } - if pkt.get_pts() != None && lastpts.is_some() && pkt.get_pts() >= lastpts { break; } } //panic!("end"); }