-extern crate nihav;
+extern crate nihav_core;
+extern crate nihav_allstuff;
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 nihav_core::io::byteio::{FileReader, ByteReader};
+use nihav_core::frame::*;
+use nihav_core::codecs::*;
+use nihav_core::demuxers::*;
+use nihav_core::detect;
+use nihav_allstuff::*;
use std::env;
mod frmwriter;
}
impl FrameOutput {
- fn output_frame(&mut self, pkt: &NAPacket, frmref: NAFrameRef) {
- let frm = frmref.borrow();
+ fn output_frame(&mut self, pkt: &NAPacket, frm: NAFrameRef) {
if frm.get_frame_type() != FrameType::Skip {
let pts = match self.nmode {
NumberMode::Counter => { self.frameno },
NumberMode::PktPTS => { pkt.get_pts().unwrap() },
NumberMode::FrmPTS => { 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() {
+ let vinfo = frm.get_buffer().get_video_info().unwrap();
+ if vinfo.get_format().is_paletted() {
write_palppm(self.prefix, self.streamno, pts, frm);
- } else {
+ } 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");
}
}
self.frameno += 1;
}
impl AudioOutput {
- fn new(name: &String) -> Self { Self { wwr: WavWriter::new(name), wrote_header: false } }
+ fn new(name: &str) -> 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.wwr.write_header(frm.get_info().as_ref().get_properties().get_audio_info().unwrap()).unwrap();
self.wrote_header = true;
}
- self.wwr.write_frame(frm.borrow().get_buffer()).unwrap();
+ self.wwr.write_frame(frm.get_buffer()).unwrap();
}
}
let mut decode_video = true;
let mut decode_audio = true;
let mut nmode = NumberMode::FrmPTS;
+ let mut seek_time = 0u64;
- while (cur_arg < args.len()) && (args[cur_arg].chars().next().unwrap() == '-') {
+ while (cur_arg < args.len()) && args[cur_arg].starts_with('-') {
match args[cur_arg].as_str() {
"--" => { break; },
"-noout" => { noout = true; },
"-nm=count" => { nmode = NumberMode::Counter; },
"-nm=pktpts" => { nmode = NumberMode::PktPTS; },
"-nm=frmpts" => { nmode = NumberMode::FrmPTS; },
+ "-seek" => {
+ cur_arg += 1;
+ if cur_arg == args.len() {
+ println!("seek time missing");
+ return;
+ }
+ let ret = args[cur_arg].parse::<u64>();
+ if ret.is_err() {
+ println!("wrong seek time");
+ return;
+ }
+ seek_time = ret.unwrap();
+ },
_ => { println!("unknown option {}", args[cur_arg]); return; },
}
cur_arg += 1;
}
let (dmx_name, _) = res.unwrap();
println!("trying demuxer {} on {}", dmx_name, name);
- dmx_fact = find_demuxer(dmx_name).unwrap();
+
+ let mut dmx_reg = RegisteredDemuxers::new();
+ nihav_register_all_demuxers(&mut dmx_reg);
+ let mut dec_reg = RegisteredDecoders::new();
+ nihav_register_all_codecs(&mut dec_reg);
+
+ dmx_fact = dmx_reg.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();
+ if seek_time > 0 {
+ let ret = dmx.seek(seek_time);
+ if ret.is_err() {
+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();
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());
+ let decfunc = dec_reg.find_decoder(info.get_name());
println!("stream {} - {} {}", i, s, info.get_name());
let str_id = s.get_id();
let mut has_out = false;
return;
}
let mut dec = (decfunc.unwrap())();
- dec.init(info).unwrap();
- decs.push(Some(dec));
+ let mut dsupp = Box::new(NADecoderSupport::new());
+ dec.init(&mut dsupp, info).unwrap();
+ decs.push(Some((dsupp, dec)));
if !noout {
- writers.push(Outputter::Video(FrameOutput{prefix: "", streamno: i, frameno: 1, nmode: nmode}));
+ writers.push(Outputter::Video(FrameOutput{prefix: "", streamno: i, frameno: 1, nmode}));
has_out = true;
}
} else {
return;
}
let mut dec = (decfunc.unwrap())();
- dec.init(info).unwrap();
- decs.push(Some(dec));
+ let mut dsupp = Box::new(NADecoderSupport::new());
+ dec.init(&mut dsupp, info).unwrap();
+ decs.push(Some((dsupp, dec)));
if !noout {
let name = format!("out{:02}.wav", i);
writers.push(Outputter::Audio(AudioOutput::new(&name)));
let streamno = pkt.get_stream().get_id();
let sr = sids.iter().position(|x| *x == streamno);
let idx = sr.unwrap();
- if let Some(ref mut dec) = decs[idx] {
- let frm = dec.decode(&pkt).unwrap();
+ 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); },
projects / nihav-tool.git / blobdiff