X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=src%2Fmain.rs;h=787a6b29295a933ae9a630578e09a5e3be6a67aa;hb=951916e82104ed20d3fab23df23ceef29b8d0d58;hp=e37092badf81b46d1720f2b976d494b56335fa77;hpb=e6cb09af4353d230189592e288497ea06471f0bd;p=nihav-encoder.git

diff --git a/src/main.rs b/src/main.rs
index e37092b..787a6b2 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -18,7 +18,7 @@ use nihav_allstuff::*;
 use std::env;
 
 mod null;
-use null::*;
+use crate::null::*;
 
 fn print_options(name: &str, options: &[NAOptionDefinition]) {
     if options.is_empty() {
@@ -75,6 +75,8 @@ struct Transcoder {
     encoders:       Vec<OutputMode>,
     no_video:       bool,
     no_audio:       bool,
+    start:          NATimePoint,
+    end:            NATimePoint,
 }
 
 macro_rules! parse_and_apply_options {
@@ -570,6 +572,7 @@ fn main() {
     let mut transcoder = Transcoder::new();
 
     let mut arg_idx = 1;
+    let mut printed_info = false;
     while arg_idx < args.len() {
         match args[arg_idx].as_str() {
             "--list-decoders" => {
@@ -583,6 +586,7 @@ fn main() {
                 } else {
                     println!("No registered decoders.");
                 }
+                printed_info = true;
             },
             "--list-encoders" => {
                 if enc_reg.iter().len() > 0 {
@@ -595,6 +599,7 @@ fn main() {
                 } else {
                     println!("No registered encoders.");
                 }
+                printed_info = true;
             },
             "--list-demuxers" => {
                 print!("Registered demuxers:");
@@ -602,6 +607,7 @@ fn main() {
                     print!(" {}", dmx.get_name());
                 }
                 println!();
+                printed_info = true;
             },
             "--list-muxers" => {
                 print!("Registered muxers:");
@@ -609,6 +615,7 @@ fn main() {
                     print!(" {}", mux.get_name());
                 }
                 println!();
+                printed_info = true;
             },
             "--query-decoder-options" => {
                 next_arg!(args, arg_idx);
@@ -620,6 +627,7 @@ fn main() {
                 } else {
                     println!("codec {} is not found", cname);
                 }
+                printed_info = true;
             },
             "--query-demuxer-options" => {
                 next_arg!(args, arg_idx);
@@ -633,6 +641,7 @@ fn main() {
                 } else {
                     println!("demuxer {} is not found", dname);
                 }
+                printed_info = true;
             },
             "--query-encoder-options" => {
                 next_arg!(args, arg_idx);
@@ -644,6 +653,7 @@ fn main() {
                 } else {
                     println!("codec {} is not found", cname);
                 }
+                printed_info = true;
             },
             "--query-muxer-options" => {
                 next_arg!(args, arg_idx);
@@ -658,6 +668,7 @@ fn main() {
                 } else {
                     println!("muxer {} is not found", name);
                 }
+                printed_info = true;
             },
             "--input" => {
                 next_arg!(args, arg_idx);
@@ -688,6 +699,26 @@ fn main() {
             "--no-audio" => {
                 transcoder.no_audio = true;
             },
+            "--start" => {
+                next_arg!(args, arg_idx);
+                let ret = args[arg_idx].parse::<NATimePoint>();
+                if let Ok(val) = ret {
+                    transcoder.start = val;
+                } else {
+                    println!("invalid start time");
+                    return;
+                }
+            },
+            "--end" => {
+                next_arg!(args, arg_idx);
+                let ret = args[arg_idx].parse::<NATimePoint>();
+                if let Ok(val) = ret {
+                    transcoder.end = val;
+                } else {
+                    println!("invalid start time");
+                    return;
+                }
+            },
             "--muxer-options" => {
                 next_arg!(args, arg_idx);
                 if !transcoder.parse_muxer_options(&args[arg_idx], &mux_reg) {
@@ -720,6 +751,10 @@ fn main() {
         arg_idx += 1;
     }
 
+    if printed_info {
+        return;
+    }
+
     if transcoder.input_name.len() == 0 {
         println!("no input name provided");
         return;
@@ -779,6 +814,12 @@ println!("stream {} - {} {}", i, s, info.get_name());
             transcoder.decoders.push(None);
         }
     }
+    if transcoder.start != NATimePoint::None {
+        let ret = dmx.seek(transcoder.start);
+        if ret.is_err() {
+            println!(" failed to seek to {} error {:?}", transcoder.start, ret.err().unwrap());
+        }
+    }
 
     let output_fmt = if let Some(ref str) = transcoder.output_fmt {
             str
@@ -825,7 +866,7 @@ println!("stream {} - {} {}", i, s, info.get_name());
         println!(" #{}: {} {}", ostr.get_num(), ostr, ostr.get_info().get_name());
     }
 
-    loop {
+    'main_loop: loop {
         let pktres = dmx.get_frame();
         if let Err(DemuxerError::EOF) = pktres { break; }
         if pktres.is_err() {
@@ -839,6 +880,7 @@ println!("stream {} - {} {}", i, s, info.get_name());
             OutputMode::Copy(dst_id) => {
                 let dstr = mux.get_stream(dst_id as usize).unwrap();
                 pkt.reassign(dstr, pkt.get_time_information());
+                if transcoder.end != NATimePoint::None && !pkt.ts.less_than(transcoder.end) { break 'main_loop; }
                 if mux.mux_frame(pkt).is_err() {
                     println!("error muxing packet");
                     break;
@@ -886,6 +928,7 @@ println!("stream {} - {} {}", i, s, info.get_name());
                     let cfrm = NAFrame::new(frm.get_time_information(), frm.frame_type, frm.key, frm.get_info(), cbuf);
                     encoder.encode(&cfrm).unwrap();
                     while let Ok(Some(pkt)) = encoder.get_packet() {
+                        if transcoder.end != NATimePoint::None && !pkt.ts.less_than(transcoder.end) { break 'main_loop; }
                         mux.mux_frame(pkt).unwrap();
                     }
                 } else {