fix some clippy warnings

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

diff --git a/src/main.rs b/src/main.rs
index 3f5023a1ddbf9097059e96de5407ce444a92f838..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");
             }
         }
@@ -164,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);
@@ -196,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();
@@ -265,7 +273,7 @@ println!("stream {} - {} {}", i, s, 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] {