enhance printed runtime stats

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

diff --git a/src/main.rs b/src/main.rs
index 191a8a6133c2d24175464ebc88995a6ba75ab317..41a4a927b9c540a28c20f006fac5bae0ae3547d0 100644 (file)
--- a/src/main.rs
+++ b/src/main.rs
@@ -99,7 +99,7 @@ struct Transcoder {
     no_audio:       bool,
     start:          NATimePoint,
     end:            NATimePoint,
-    verbose:        bool,
+    verbose:        u8,
 }
 
 macro_rules! parse_and_apply_options {
@@ -706,7 +706,10 @@ println!("can't generate default channel map for {} channels", dainfo.channels);
 
 fn encode_frame(dst_id: u32, encoder: &mut Box<dyn NAEncoder>, cvt: &mut OutputConvert, frm: NAFrameRef, scale_opts: &[(String, String)]) -> bool {
     let buf = frm.get_buffer();
-    let cbuf = match cvt {
+    let cbuf = if let NABufferType::None = buf {
+        buf
+    } else {
+        match cvt {
             OutputConvert::None => buf,
             OutputConvert::Video(ref mut scaler, ref mut dbuf) => {
                 let cur_ifmt = get_scale_fmt_from_pic(&buf);
@@ -735,7 +738,8 @@ fn encode_frame(dst_id: u32, encoder: &mut Box<dyn NAEncoder>, cvt: &mut OutputC
                 }
                 ret.unwrap()
             },
-        };
+        }
+    };
     let cfrm = NAFrame::new(frm.get_time_information(), frm.frame_type, frm.key, frm.get_info(), cbuf);
     encoder.encode(&cfrm).unwrap();
     true
@@ -950,7 +954,9 @@ fn main() {
                     return;
                 }
             },
-            "--verbose" | "-v" => transcoder.verbose = true,
+            "--verbose" | "-v" => transcoder.verbose = 1,
+            "-vv" => transcoder.verbose = 2,
+            "-v-" => transcoder.verbose = 0,
             _ => {
                 if args[arg_idx].starts_with("--istream") {
                     let opt0 = &args[arg_idx];
@@ -1103,6 +1109,8 @@ println!("stream {} - {} {}", i, s, info.get_name());
 
     let mut time = Instant::now();
     let show_interval = Duration::from_millis(100);
+    let mut adata_size = 0;
+    let mut vdata_size = 0;
     'main_loop: loop {
         let pktres = dmx.get_frame();
         if let Err(DemuxerError::EOF) = pktres { break; }
@@ -1113,7 +1121,7 @@ println!("stream {} - {} {}", i, s, info.get_name());
         let mut pkt = pktres.unwrap();
         if transcoder.start != NATimePoint::None && pkt.ts.less_than(transcoder.start) { continue; }
         let src_id = pkt.get_stream().get_num();
-        if transcoder.verbose && time.elapsed() >= show_interval {
+        if transcoder.verbose > 0 && time.elapsed() >= show_interval {
             if let Some(pts) = pkt.get_pts() {
                  let cur_time = format_time(NATimeInfo::ts_to_time(pts, 1000, pkt.ts.tb_num, pkt.ts.tb_den));
                 print!(" {}", cur_time);
@@ -1123,6 +1131,9 @@ println!("stream {} - {} {}", i, s, info.get_name());
             if !duration_string.is_empty() {
                 print!(" / {}", duration_string);
             }
+            if transcoder.verbose > 1 {
+                print!(" data sizes V: {} A: {}", vdata_size, adata_size);
+            }
             print!("\r");
             std::io::stdout().flush().unwrap();
             time = Instant::now();
@@ -1133,6 +1144,12 @@ println!("stream {} - {} {}", i, s, info.get_name());
                 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; }
+                let pkt_size = pkt.get_buffer().len();
+                match pkt.get_stream().get_media_type() {
+                    StreamType::Video => { vdata_size += pkt_size; },
+                    StreamType::Audio => { adata_size += pkt_size; },
+                    _ => {},
+                };
                 if mux.mux_frame(pkt).is_err() {
                     println!("error muxing packet");
                     break;
@@ -1156,6 +1173,12 @@ println!("stream {} - {} {}", i, s, info.get_name());
                         }
                         while let Ok(Some(pkt)) = encoder.get_packet() {
                             if transcoder.end != NATimePoint::None && !pkt.ts.less_than(transcoder.end) { break 'main_loop; }
+                            let pkt_size = pkt.get_buffer().len();
+                            match pkt.get_stream().get_media_type() {
+                                StreamType::Video => { vdata_size += pkt_size; },
+                                StreamType::Audio => { adata_size += pkt_size; },
+                                _ => {},
+                            };
                             mux.mux_frame(pkt).unwrap();
                         }
                     }
@@ -1201,7 +1224,7 @@ println!("stream {} - {} {}", i, s, info.get_name());
             _ => {},
         };
     }
-    if transcoder.verbose {
+    if transcoder.verbose > 0 {
         println!();
     }