fix some clippy warnings

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

diff --git a/src/main.rs b/src/main.rs
index 79212fdaa8e2d9051d3ae568db4579668b732a89..6d29d4618052906ebf0fcd6ccb94bb3fec5a41b5 100644 (file)
--- a/src/main.rs
+++ b/src/main.rs
@@ -3,7 +3,7 @@ extern crate nihav_codec_support;
 extern crate nihav_registry;
 extern crate nihav_allstuff;
 
-use std::io::{SeekFrom, Write};
+use std::io::{SeekFrom, Write, BufReader};
 use std::fs::File;
 use std::path::Path;
 use nihav_core::io::byteio::{FileReader, ByteReader};
@@ -40,7 +40,7 @@ impl FrameOutput {
                     NumberMode::PktPTS  => { pkt.get_pts().unwrap() },
                     NumberMode::FrmPTS  => { if let Some(pt) = frm.get_pts() { pt } else { pkt.get_pts().unwrap() } },
                 };
-            if let Err(_) = write_pnm(&self.prefix, self.streamno, pts, frm) {
+            if write_pnm(&self.prefix, self.streamno, pts, frm).is_err() {
                 println!("error writing output picture");
             }
         }
@@ -74,7 +74,23 @@ 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;
+    }
+    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;
@@ -148,7 +164,8 @@ fn main() {
     }
 
     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);
@@ -163,7 +180,7 @@ 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();
@@ -180,6 +197,13 @@ println!(" seek error {:?}", ret.err().unwrap());
     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();
@@ -230,7 +254,6 @@ 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);
@@ -250,7 +273,7 @@ panic!("decoder {} not found", info.get_name());
         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(pkt.get_buffer().as_slice()).unwrap();
+            ofile.write_all(pkt.get_buffer().as_slice()).unwrap();
             frmnum += 1;
         }
         if let Some((ref mut dsupp, ref mut dec)) = decs[idx] {