X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=src%2Fmain.rs;h=0d5082d78162452bf0b74b10c1b501eba76dc574;hb=7b6dcb1ec809818b7f76fd1d0db7e3df7d85ce48;hp=dd308d152cf795295deac2500f1f367410ee1e9e;hpb=5a8a7cdb622c8b607c2e7f52bc9f12917ee99622;p=nihav-encoder.git

diff --git a/src/main.rs b/src/main.rs
index dd308d1..0d5082d 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 {
@@ -558,7 +560,7 @@ fn main() {
     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);
 
     let mut mux_reg = RegisteredMuxers::new();
     nihav_register_all_muxers(&mut mux_reg);
@@ -697,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) {
@@ -792,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
@@ -838,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() {
@@ -852,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;
@@ -899,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 {