X-Git-Url: https://git.nihav.org/?p=nihav-tool.git;a=blobdiff_plain;f=src%2Fmain.rs;h=59c18788c78ff3a8b7485fd71478eae3c4584e75;hp=ff6baac91cea84ed7bf3dc46c6ae0465fc5eaf70;hb=2299da077b933c0930c2b0edf2b4288a2d77741b;hpb=7437145d254f1852f5b594e56e20124761bb5b02

diff --git a/src/main.rs b/src/main.rs
index ff6baac..59c1878 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -2,7 +2,7 @@ extern crate nihav_core;
 extern crate nihav_registry;
 extern crate nihav_allstuff;
 
-use std::io::SeekFrom;
+use std::io::{SeekFrom, Write};
 use std::fs::File;
 use std::path::Path;
 use nihav_core::io::byteio::{FileReader, ByteReader};
@@ -94,6 +94,8 @@ fn main() {
     let mut seek_time = 0u64;
     let mut vpfx: Option<String> = None;
     let mut apfx: Option<&str> = None;
+    let mut ignore_errors = false;
+    let mut dump_frames = false;
 
     while (cur_arg < args.len()) && args[cur_arg].starts_with('-') {
         match args[cur_arg].as_str() {
@@ -133,6 +135,8 @@ fn main() {
                 }
                 vpfx = Some(args[cur_arg].clone());
             },
+            "-ignerr"   => { ignore_errors = true; },
+            "-dumpfrm"  => { dump_frames = true; },
             _           => { println!("unknown option {}", args[cur_arg]); return; },
         }
         cur_arg += 1;
@@ -231,6 +235,7 @@ panic!("decoder {} not found", info.get_name());
         }
     }
 
+    let mut frmnum = 0;
     loop {
         let pktres = dmx.get_frame();
         if let Err(e) = pktres {
@@ -240,6 +245,12 @@ panic!("decoder {} not found", info.get_name());
         let streamno = pkt.get_stream().get_id();
         let sr = sids.iter().position(|x| *x == streamno);
         let idx = sr.unwrap();
+        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();
+            frmnum += 1;
+        }
         if let Some((ref mut dsupp, ref mut dec)) = decs[idx] {
             match dec.decode(dsupp, &pkt) {
                 Ok(frm) => {
@@ -256,7 +267,9 @@ panic!("decoder {} not found", info.get_name());
                 },
                 Err(reason) => {
                     println!("error decoding frame {:?}", reason);
-                    break;
+                    if !ignore_errors {
+                        break;
+                    }
                 },
             };
             if pkt.get_pts() != None && lastpts.is_some() && pkt.get_pts() >= lastpts { break; }