X-Git-Url: https://git.nihav.org/?p=nihav-tool.git;a=blobdiff_plain;f=src%2Fmain.rs;h=02005904802e747076fcd6ccb05399974deff1f8;hp=2517b53fd51c5d28eafe33cf8b6a094f0529b4c9;hb=3660c127f52a92862248464767a3d92cf63aa182;hpb=019f9f9c8f115c0b7e3a18f1ad81a47546aa0793

diff --git a/src/main.rs b/src/main.rs
dissimilarity index 67%
index 2517b53..0200590 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,148 +1,169 @@
-extern crate nihav;
-
-use std::io::prelude::*;
-use std::io::SeekFrom;
-use std::fs::File;
-use std::path::Path;
-use nihav::io::byteio::{FileReader, ByteReader};
-use nihav::frame::*;
-use nihav::codecs::*;
-use nihav::demuxers::*;
-use nihav::detect;
-use std::env;
-
-fn write_pgmyuv(pfx: &str, strno: usize, num: u64, frmref: NAFrameRef) {
-    let frm = frmref.borrow();
-    if let NABufferType::None = frm.get_buffer() { return; }
-    let name = format!("{}out{:02}_{:04}.pgm", pfx, strno, num);
-    let mut ofile = File::create(name).unwrap();
-    let buf = frm.get_buffer().get_vbuf().unwrap();
-    let (w, h) = buf.get_dimensions(0);
-    let (w2, h2) = buf.get_dimensions(1);
-    let tot_h = h + h2;
-    let hdr = format!("P5\n{} {}\n255\n", w, tot_h);
-    ofile.write_all(hdr.as_bytes()).unwrap();
-    let dta = buf.get_data();
-    let ls = buf.get_stride(0);
-    let mut idx = 0;
-    let mut idx2 = w;
-    let mut pad: Vec<u8> = Vec::with_capacity((w - w2 * 2) / 2);
-    pad.resize((w - w2 * 2) / 2, 0xFF);
-    for _ in 0..h {
-        let line = &dta[idx..idx2];
-        ofile.write_all(line).unwrap();
-        idx  += ls;
-        idx2 += ls;
-    }
-    let mut base1 = buf.get_offset(1);
-    let stride1 = buf.get_stride(1);
-    let mut base2 = buf.get_offset(2);
-    let stride2 = buf.get_stride(2);
-    for _ in 0..h2 {
-        let bend1 = base1 + w2;
-        let line = &dta[base1..bend1];
-        ofile.write_all(line).unwrap();
-        ofile.write_all(pad.as_slice()).unwrap();
-
-        let bend2 = base2 + w2;
-        let line = &dta[base2..bend2];
-        ofile.write_all(line).unwrap();
-        ofile.write_all(pad.as_slice()).unwrap();
-
-        base1 += stride1;
-        base2 += stride2;
-    }
-}
-
-fn write_palppm(pfx: &str, strno: usize, num: u64, frmref: NAFrameRef) {
-    let frm = frmref.borrow();
-    let name = format!("{}out{:02}_{:04}.ppm", pfx, strno, num);
-    let mut ofile = File::create(name).unwrap();
-    let buf = frm.get_buffer().get_vbuf().unwrap();
-    let (w, h) = buf.get_dimensions(0);
-    let paloff = buf.get_offset(1);
-    let hdr = format!("P6\n{} {}\n255\n", w, h);
-    ofile.write_all(hdr.as_bytes()).unwrap();
-    let dta = buf.get_data();
-    let ls = buf.get_stride(0);
-    let mut idx  = 0;
-    let mut line: Vec<u8> = Vec::with_capacity(w * 3);
-    line.resize(w * 3, 0);
-    for _ in 0..h {
-        let src = &dta[idx..(idx+w)];
-        for x in 0..w {
-            let pix = src[x] as usize;
-            line[x * 3 + 0] = dta[paloff + pix * 3 + 2];
-            line[x * 3 + 1] = dta[paloff + pix * 3 + 1];
-            line[x * 3 + 2] = dta[paloff + pix * 3 + 0];
-        }
-        ofile.write_all(line.as_slice()).unwrap();
-        idx  += ls;
-    }
-}
-
-fn main() {
-    let args: Vec<_> = env::args().collect();
-
-    if args.len() == 1 { return; }
-    let lastpts = if args.len() > 2 {
-                      Some(u64::from_str_radix(args[2].as_str(), 10).unwrap())
-                  } else { None };
-
-    let name = args[1].as_str();
-    let path = Path::new(name);
-    let mut file = File::open(path).unwrap();
-    let dmx_fact;
-    let mut fr = FileReader::new_read(&mut file);
-    let mut br = ByteReader::new(&mut fr);
-    let res = detect::detect_format(name, &mut br);
-    if res.is_none() {
-        println!("cannot detect format for {}", name);
-        return;
-    }
-    let (dmx_name, _) = res.unwrap();
-println!("trying demuxer {}", dmx_name);
-    dmx_fact = find_demuxer(dmx_name).unwrap();
-    br.seek(SeekFrom::Start(0)).unwrap();
-    let mut dmx = dmx_fact.new_demuxer(&mut br);
-    dmx.open().unwrap();
-
-    let mut decs: Vec<Option<Box<NADecoder>>> = Vec::new();
-    for i in 0..dmx.get_num_streams() {
-        let s = dmx.get_stream(i).unwrap();
-        let info = s.get_info();
-        let decfunc = find_decoder(info.get_name());
-        if !info.is_video() {
-            decs.push(None);
-        } else if let Some(df) = decfunc {
-            let mut dec = (df)();
-            dec.init(info).unwrap();
-            decs.push(Some(dec));
-        } else {
-panic!("decoder {} not found", info.get_name());
-        }
-    }
-
-    loop {
-        let pktres = dmx.get_frame();
-        if let Err(e) = pktres {
-            if e == DemuxerError::EOF { break; }
-        }
-        let pkt = pktres.unwrap();
-        let streamno = pkt.get_stream().get_id() as usize;
-        if let Some(ref mut dec) = decs[streamno] {
-            let frm = dec.decode(&pkt).unwrap();
-            if pkt.get_stream().get_info().is_video() {
-                if frm.borrow().get_frame_type() != FrameType::Skip {
-                    if frm.borrow().get_buffer().get_vbuf().unwrap().get_info().get_format().is_paletted() {
-                        write_palppm("", streamno, pkt.get_pts().unwrap(), frm);
-                    } else {
-                        write_pgmyuv("", streamno, pkt.get_pts().unwrap(), frm);
-                    }
-                }
-            }
-        }
-        if pkt.get_pts() != None && pkt.get_pts() == lastpts { break; }
-    }
-//panic!("end");
-}
+extern crate nihav;
+
+use std::io::SeekFrom;
+use std::fs::File;
+use std::path::Path;
+use nihav::io::byteio::{FileReader, ByteReader};
+use nihav::frame::*;
+use nihav::codecs::*;
+use nihav::demuxers::*;
+use nihav::detect;
+use std::env;
+
+mod frmwriter;
+use frmwriter::*;
+
+mod wavwriter;
+use wavwriter::WavWriter;
+
+struct FrameOutput {
+    prefix:     &'static str,
+    streamno:   usize,
+}
+
+impl FrameOutput {
+    fn output_frame(&mut self, pkt: &NAPacket, frmref: NAFrameRef) {
+        let frm = frmref.borrow();
+        if frm.get_frame_type() != FrameType::Skip {
+            let pts = if let Some(pt) = frm.get_pts() { pt } else { pkt.get_pts().unwrap() };
+            let frmbuf = frm.get_buffer().get_vbuf().unwrap();
+            if frmbuf.get_info().get_format().is_paletted() {
+                write_palppm(self.prefix, self.streamno, pts, frm);
+            } else {
+                write_pgmyuv(self.prefix, self.streamno, pts, frm);
+            }
+        }
+    }
+}
+
+struct AudioOutput {
+    wwr:    WavWriter<'static>,
+    wrote_header: bool,
+}
+
+impl AudioOutput {
+    fn new(name: &String) -> Self { Self { wwr: WavWriter::new(name), wrote_header: false } }
+    fn output_frame(&mut self, _pkt: &NAPacket, frm: NAFrameRef) {
+        if !self.wrote_header {
+            self.wwr.write_header(frm.borrow().get_info().as_ref().get_properties().get_audio_info().unwrap()).unwrap();
+            self.wrote_header = true;
+        }
+        self.wwr.write_frame(frm.borrow().get_buffer()).unwrap();
+    }
+}
+
+enum Outputter {
+    Video(FrameOutput),
+    Audio(AudioOutput),
+    None,
+}
+
+fn main() {
+    let args: Vec<_> = env::args().collect();
+
+    if args.len() == 1 {
+        println!("usage: nihav-tool [-noout] [-vn] [-an] input [lastpts]");
+        return;
+    }
+    let mut lastpts: Option<u64> = None;
+    let mut cur_arg: usize = 1;
+    let mut noout = false;
+    let mut decode_video = true;
+    let mut decode_audio = true;
+
+    while (cur_arg < args.len()) && (args[cur_arg].chars().next().unwrap() == '-') {
+        match args[cur_arg].as_str() {
+            "--"        => { break; },
+            "-noout"    => { noout = true; },
+            "-an"       => { decode_audio = false; },
+            "-vn"       => { decode_video = false; },
+            _           => { println!("unknown option {}", args[cur_arg]); return; },
+        }
+        cur_arg += 1;
+    }
+    let name = args[cur_arg].as_str();
+    cur_arg += 1;
+println!(" name = {} arg pos {}/{}", name, cur_arg, args.len());
+    if cur_arg < args.len() {
+        lastpts = Some(u64::from_str_radix(args[cur_arg].as_str(), 10).unwrap());
+    }
+
+    let path = Path::new(name);
+    let mut file = File::open(path).unwrap();
+    let dmx_fact;
+    let mut fr = FileReader::new_read(&mut file);
+    let mut br = ByteReader::new(&mut fr);
+    let res = detect::detect_format(name, &mut br);
+    if res.is_none() {
+        println!("cannot detect format for {}", name);
+        return;
+    }
+    let (dmx_name, _) = res.unwrap();
+println!("trying demuxer {} on {}", dmx_name, name);
+    dmx_fact = find_demuxer(dmx_name).unwrap();
+    br.seek(SeekFrom::Start(0)).unwrap();
+    let mut dmx = create_demuxer(dmx_fact, &mut br).unwrap();
+
+    let mut decs: Vec<Option<Box<NADecoder>>> = Vec::new();
+    let mut writers: Vec<Outputter> = Vec::new();
+    for i in 0..dmx.get_num_streams() {
+        let s = dmx.get_stream(i).unwrap();
+        let info = s.get_info();
+        let decfunc = find_decoder(info.get_name());
+println!("stream {} - {} {}", i, s, info.get_name());
+        let mut has_out = false;
+        if info.is_video() {
+            if decode_video {
+                let mut dec = (decfunc.unwrap())();
+                dec.init(info).unwrap();
+                decs.push(Some(dec));
+                if !noout {
+                    writers.push(Outputter::Video(FrameOutput{prefix: "", streamno: i}));
+                    has_out = true;
+                }
+            } else {
+                decs.push(None);
+            }
+        } else if info.is_audio() {
+            if decode_audio {
+                let mut dec = (decfunc.unwrap())();
+                dec.init(info).unwrap();
+                decs.push(Some(dec));
+                if !noout {
+                    let name = format!("out{:02}.wav", i);
+                    writers.push(Outputter::Audio(AudioOutput::new(&name)));
+                    has_out = true;
+                }
+            } else {
+                decs.push(None);
+            }
+        } else {
+            decs.push(None);
+panic!("decoder {} not found", info.get_name());
+        }
+        if !has_out {
+            writers.push(Outputter::None);
+        }
+    }
+
+    loop {
+        let pktres = dmx.get_frame();
+        if let Err(e) = pktres {
+            if e == DemuxerError::EOF { break; }
+        }
+        let pkt = pktres.unwrap();
+        let streamno = pkt.get_stream().get_id() as usize;
+        if let Some(ref mut dec) = decs[streamno] {
+            let frm = dec.decode(&pkt).unwrap();
+            if !noout {
+                match writers[streamno] {
+                    Outputter::Video(ref mut wr) => { wr.output_frame(&pkt, frm); },
+                    Outputter::Audio(ref mut wr) => { wr.output_frame(&pkt, frm); },
+                    _ => {},
+                };
+            }
+        }
+        if pkt.get_pts() != None && pkt.get_pts() == lastpts { break; }
+    }
+//panic!("end");
+}