X-Git-Url: https://git.nihav.org/?p=nihav-tool.git;a=blobdiff_plain;f=src%2Fmain.rs;h=6d29d4618052906ebf0fcd6ccb94bb3fec5a41b5;hp=784fccb8382db37051eb71d7b069b19ca6f40169;hb=04b90f8a5e344a5eb40a03b9262ec52657054e90;hpb=fde9f7c350f401dec51e6a08c4aa8134744b4b68

diff --git a/src/main.rs b/src/main.rs
index 784fccb..6d29d46 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,20 +1,20 @@
 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, 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_core::detect;
+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;
 
@@ -26,7 +26,7 @@ enum NumberMode {
 }
 
 struct FrameOutput {
-    prefix:     &'static str,
+    prefix:     String,
     streamno:   usize,
     frameno:    u64,
     nmode:      NumberMode,
@@ -40,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 write_pnm(&self.prefix, self.streamno, pts, frm).is_err() {
+                println!("error writing output picture");
             }
         }
         self.frameno += 1;
@@ -81,16 +74,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;
     }
-    let mut lastpts: Option<u64> = 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<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() {
@@ -101,19 +115,39 @@ 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::<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;
@@ -121,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::<NATimePoint>();
+        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);
@@ -140,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());
@@ -156,6 +196,14 @@ 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())}];
+    let duration = dmx.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..dmx.get_num_streams() {
         let s = dmx.get_stream(i).unwrap();
         let info = s.get_info();
@@ -173,9 +221,10 @@ 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: "", 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 {
@@ -192,7 +241,11 @@ println!("stream {} - {} {}", i, s, info.get_name());
                 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;
                 }
@@ -201,13 +254,13 @@ 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();
         if let Err(e) = pktres {
@@ -217,17 +270,35 @@ 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] {
-            let frm = dec.decode(dsupp, &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); },
-                    _ => {},
-                };
-            }
+            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 != NATimePoint::None => {
+                    println!("ignoring missing ref");
+                },
+                Err(reason) => {
+                    println!("error decoding frame {:?}", reason);
+                    if !ignore_errors {
+                        break;
+                    }
+                },
+            };
+            if pkt.get_pts() != None && lastpts != NATimePoint::None && !pkt.ts.less_than(lastpts) { break; }
         }
-        if pkt.get_pts() != None && lastpts.is_some() && pkt.get_pts() >= lastpts { break; }
     }
 //panic!("end");
 }