update for new nihav_registry crate

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

diff --git a/src/main.rs b/src/main.rs
index 9f9d4976bd4c61858142e0d8b3ecf877d9ce8842..1541b18e757e639841c0c64da3306c2f70f75084 100644 (file)
--- 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;
 
@@ -61,7 +62,7 @@ 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.get_info().as_ref().get_properties().get_audio_info().unwrap()).unwrap();
@@ -90,8 +91,9 @@ fn main() {
     let mut decode_video = true;
     let mut decode_audio = true;
     let mut nmode = NumberMode::FrmPTS;
+    let mut seek_time = 0u64;
 
-    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; },
@@ -100,6 +102,19 @@ 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::<u64>();
+                if ret.is_err() {
+                    println!("wrong seek time");
+                    return;
+                }
+                seek_time = ret.unwrap();
+            },
             _           => { println!("unknown option {}", args[cur_arg]); return; },
         }
         cur_arg += 1;
@@ -132,7 +147,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<Option<(Box<NADecoderSupport>, Box<NADecoder>)>> = 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<Option<(Box<NADecoderSupport>, Box<dyn NADecoder>)>> = Vec::new();
     let mut sids: Vec<u32> = Vec::new();
     let mut writers: Vec<Outputter> = Vec::new();
     for i in 0..dmx.get_num_streams() {
@@ -154,7 +176,7 @@ println!("stream {} - {} {}", i, s, info.get_name());
                 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: "", streamno: i, frameno: 1, nmode}));
                     has_out = true;
                 }
             } else {