X-Git-Url: https://git.nihav.org/?p=nihav-tool.git;a=blobdiff_plain;f=src%2Fmain.rs;h=1be4e2a0a7e36a42ebb004e69251cc84006bd64a;hp=bb94c1218432969bcebead768e75deb3fbaa6b68;hb=69524874857bc441acc89c768e6cc7095f615a17;hpb=e9c93f5f087a52d9f5c14c5f3bb821038f1b211d

diff --git a/src/main.rs b/src/main.rs
index bb94c12..1be4e2a 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;
 
@@ -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;
@@ -91,10 +83,12 @@ fn main() {
     let mut decode_video = true;
     let mut decode_audio = true;
     let mut nmode = NumberMode::FrmPTS;
+    let mut smode = FrameSkipMode::None;
     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() {
@@ -105,6 +99,8 @@ fn main() {
             "-nm=count"  => { nmode = NumberMode::Counter; },
             "-nm=pktpts" => { nmode = NumberMode::PktPTS; },
             "-nm=frmpts" => { nmode = NumberMode::FrmPTS; },
+            "-skip=key"   => { smode = FrameSkipMode::KeyframesOnly; },
+            "-skip=intra" => { smode = FrameSkipMode::IntraOnly; },
             "-seek"     => {
                 cur_arg += 1;
                 if cur_arg == args.len() {
@@ -135,6 +131,7 @@ 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;
@@ -177,6 +174,7 @@ println!(" seek error {:?}", ret.err().unwrap());
     let mut decs: Vec<Option<(Box<NADecoderSupport>, Box<dyn NADecoder>)>> = Vec::new();
     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())}];
     for i in 0..dmx.get_num_streams() {
         let s = dmx.get_stream(i).unwrap();
         let info = s.get_info();
@@ -194,6 +192,7 @@ println!("stream {} - {} {}", i, s, info.get_name());
                 let mut dec = (decfunc.unwrap())();
                 let mut dsupp = Box::new(NADecoderSupport::new());
                 dec.init(&mut dsupp, info).unwrap();
+                dec.set_options(&dec_opts);
                 decs.push(Some((dsupp, dec)));
                 if !noout {
                     writers.push(Outputter::Video(FrameOutput{prefix: if let Some(ref str) = vpfx { str.clone() } else { "out".to_string() }, streamno: i, frameno: 1, nmode}));
@@ -233,6 +232,7 @@ panic!("decoder {} not found", info.get_name());
         }
     }
 
+    let mut frmnum = 0;
     loop {
         let pktres = dmx.get_frame();
         if let Err(e) = pktres {
@@ -242,6 +242,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) => {