X-Git-Url: https://git.nihav.org/?p=nihav-tool.git;a=blobdiff_plain;f=src%2Fmain.rs;h=0892c43d0ba5a305c8877c2f0dfe51c8f8411c8e;hp=1541b18e757e639841c0c64da3306c2f70f75084;hb=b4a0ee1dd70e9b69fddef9cdb22083f96a29914a;hpb=7d08c359b21e4d4628e2edf1471d51265958c307

diff --git a/src/main.rs b/src/main.rs
index 1541b18..0892c43 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,21 +1,20 @@
 extern crate nihav_core;
+extern crate nihav_codec_support;
 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};
 use nihav_core::frame::*;
 use nihav_core::codecs::*;
 use nihav_core::demuxers::*;
+use nihav_codec_support::imgwrite::*;
 use nihav_registry::detect;
 use nihav_allstuff::*;
 use std::env;
 
-mod frmwriter;
-use crate::frmwriter::*;
-
 mod wavwriter;
 use crate::wavwriter::WavWriter;
 
@@ -27,7 +26,7 @@ enum NumberMode {
 }
 
 struct FrameOutput {
-    prefix:     &'static str,
+    prefix:     String,
     streamno:   usize,
     frameno:    u64,
     nmode:      NumberMode,
@@ -41,15 +40,8 @@ impl FrameOutput {
                     NumberMode::PktPTS  => { pkt.get_pts().unwrap() },
                     NumberMode::FrmPTS  => { if let Some(pt) = frm.get_pts() { pt } else { pkt.get_pts().unwrap() } },
                 };
-            let vinfo = frm.get_buffer().get_video_info().unwrap();
-            if vinfo.get_format().is_paletted() {
-                write_palppm(self.prefix, self.streamno, pts, frm);
-            } else if vinfo.get_format().get_model().is_yuv() {
-                write_pgmyuv(self.prefix, self.streamno, pts, frm);
-            } else if vinfo.get_format().get_model().is_rgb() {
-                write_ppm(self.prefix, self.streamno, pts, frm);
-            } else {
-panic!(" unknown format");
+            if let Err(_) = write_pnm(&self.prefix, self.streamno, pts, frm) {
+                println!("error writing output picture");
             }
         }
         self.frameno += 1;
@@ -92,6 +84,10 @@ fn main() {
     let mut decode_audio = true;
     let mut nmode = NumberMode::FrmPTS;
     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() {
@@ -115,6 +111,24 @@ fn main() {
                 }
                 seek_time = ret.unwrap();
             },
+            "-apfx"     => {
+                cur_arg += 1;
+                if cur_arg == args.len() {
+                    println!("name missing");
+                    return;
+                }
+                apfx = Some(&args[cur_arg]);
+            },
+            "-vpfx"     => {
+                cur_arg += 1;
+                if cur_arg == args.len() {
+                    println!("name missing");
+                    return;
+                }
+                vpfx = Some(args[cur_arg].clone());
+            },
+            "-ignerr"   => { ignore_errors = true; },
+            "-dumpfrm"  => { dump_frames = true; },
             _           => { println!("unknown option {}", args[cur_arg]); return; },
         }
         cur_arg += 1;
@@ -176,7 +190,7 @@ println!("stream {} - {} {}", i, s, info.get_name());
                 dec.init(&mut dsupp, info).unwrap();
                 decs.push(Some((dsupp, dec)));
                 if !noout {
-                    writers.push(Outputter::Video(FrameOutput{prefix: "", streamno: i, frameno: 1, nmode}));
+                    writers.push(Outputter::Video(FrameOutput{prefix: if let Some(ref str) = vpfx { str.clone() } else { "out".to_string() }, streamno: i, frameno: 1, nmode}));
                     has_out = true;
                 }
             } else {
@@ -193,7 +207,11 @@ println!("stream {} - {} {}", i, s, info.get_name());
                 dec.init(&mut dsupp, info).unwrap();
                 decs.push(Some((dsupp, dec)));
                 if !noout {
-                    let name = format!("out{:02}.wav", i);
+                    let name = if let Some(apfx) = apfx {
+                            format!("{}{:02}.wav", apfx, i)
+                        } else {
+                            format!("out{:02}.wav", i)
+                        };
                     writers.push(Outputter::Audio(AudioOutput::new(&name)));
                     has_out = true;
                 }
@@ -209,6 +227,7 @@ panic!("decoder {} not found", info.get_name());
         }
     }
 
+    let mut frmnum = 0;
     loop {
         let pktres = dmx.get_frame();
         if let Err(e) = pktres {
@@ -218,17 +237,35 @@ 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] {
-            let frm = dec.decode(dsupp, &pkt).unwrap();
-            if !noout {
-                match writers[idx] {
-                    Outputter::Video(ref mut wr) => { wr.output_frame(&pkt, frm); },
-                    Outputter::Audio(ref mut wr) => { wr.output_frame(&pkt, frm); },
-                    _ => {},
-                };
-            }
+            match dec.decode(dsupp, &pkt) {
+                Ok(frm) => {
+                    if !noout {
+                        match writers[idx] {
+                            Outputter::Video(ref mut wr) => { wr.output_frame(&pkt, frm); },
+                            Outputter::Audio(ref mut wr) => { wr.output_frame(&pkt, frm); },
+                            _ => {},
+                        };
+                    }
+                },
+                Err(DecoderError::MissingReference) if seek_time > 0 => {
+                    println!("ignoring missing ref");
+                },
+                Err(reason) => {
+                    println!("error decoding frame {:?}", reason);
+                    if !ignore_errors {
+                        break;
+                    }
+                },
+            };
+            if pkt.get_pts() != None && lastpts.is_some() && pkt.get_pts() >= lastpts { break; }
         }
-        if pkt.get_pts() != None && lastpts.is_some() && pkt.get_pts() >= lastpts { break; }
     }
 //panic!("end");
 }