silently ignore decoders that are neither audio nor video

[nihav-tool.git] / src / main.rs

diff --git a/src/main.rs b/src/main.rs
index 0892c43d0ba5a305c8877c2f0dfe51c8f8411c8e..76e720ef3e46ed304522f592c918f07ef88e6c92 100644 (file)
--- a/src/main.rs
+++ b/src/main.rs
@@ -77,13 +77,14 @@ fn main() {
         println!("usage: nihav-tool [-noout] [-vn] [-an] input [lastpts]");
         return;
     }
         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 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 vpfx: Option<String> = None;
     let mut apfx: Option<&str> = None;
     let mut ignore_errors = false;


@@ -98,13 +99,15 @@ fn main() {
             "-nm=count"  => { nmode = NumberMode::Counter; },
             "-nm=pktpts" => { nmode = NumberMode::PktPTS; },
             "-nm=frmpts" => { nmode = NumberMode::FrmPTS; },
             "-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;
                 }
             "-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;
                 if ret.is_err() {
                     println!("wrong seek time");
                     return;


@@ -136,7 +139,12 @@ fn main() {
     let name = args[cur_arg].as_str();
     cur_arg += 1;
     if cur_arg < args.len() {
     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 path = Path::new(name);


@@ -161,7 +169,7 @@ println!("trying demuxer {} on {}", dmx_name, name);
     br.seek(SeekFrom::Start(0)).unwrap();
     let mut dmx = create_demuxer(dmx_fact, &mut br).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());
         let ret = dmx.seek(seek_time);
         if ret.is_err() {
 println!(" seek error {:?}", ret.err().unwrap());


@@ -171,6 +179,7 @@ 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 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();
     for i in 0..dmx.get_num_streams() {
         let s = dmx.get_stream(i).unwrap();
         let info = s.get_info();


@@ -188,6 +197,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();
                 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}));
                 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 +230,6 @@ println!("stream {} - {} {}", i, s, info.get_name());
             }
         } else {
             decs.push(None);
             }
         } else {
             decs.push(None);

-panic!("decoder {} not found", info.get_name());

         }
         if !has_out {
             writers.push(Outputter::None);
         }
         if !has_out {
             writers.push(Outputter::None);


@@ -254,7 +263,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) => {
                     println!("ignoring missing ref");
                 },
                 Err(reason) => {


@@ -264,7 +273,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");
         }
     }
 //panic!("end");