projects
/
nihav-tool.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
adapt to new split crates
[nihav-tool.git]
/
src
/
main.rs
diff --git
a/src/main.rs
b/src/main.rs
index c1f44281ed156e8155a19d1085c85ac594d10652..214427ec296889d9130a8dde15e7079a684bb258 100644
(file)
--- a/
src/main.rs
+++ b/
src/main.rs
@@
-1,31
+1,46
@@
-extern crate nihav;
+extern crate nihav_core;
+extern crate nihav_allstuff;
use std::io::SeekFrom;
use std::fs::File;
use std::path::Path;
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;
use std::env;
mod frmwriter;
-use frmwriter::*;
+use
crate::
frmwriter::*;
mod wavwriter;
mod wavwriter;
-use wavwriter::WavWriter;
+use crate::wavwriter::WavWriter;
+
+#[derive(Clone,Copy,PartialEq)]
+enum NumberMode {
+ Counter,
+ PktPTS,
+ FrmPTS,
+}
struct FrameOutput {
prefix: &'static str,
streamno: usize,
struct FrameOutput {
prefix: &'static str,
streamno: usize,
+ frameno: u64,
+ nmode: NumberMode,
}
impl FrameOutput {
fn output_frame(&mut self, pkt: &NAPacket, frmref: NAFrameRef) {
let frm = frmref.borrow();
if frm.get_frame_type() != FrameType::Skip {
}
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 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() {
write_palppm(self.prefix, self.streamno, pts, frm);
let frmbuf = frm.get_buffer().get_vbuf().unwrap();
if frmbuf.get_info().get_format().is_paletted() {
write_palppm(self.prefix, self.streamno, pts, frm);
@@
-33,6
+48,7
@@
impl FrameOutput {
write_pgmyuv(self.prefix, self.streamno, pts, frm);
}
}
write_pgmyuv(self.prefix, self.streamno, pts, frm);
}
}
+ self.frameno += 1;
}
}
}
}
@@
-70,6
+86,7
@@
fn main() {
let mut noout = false;
let mut decode_video = true;
let mut decode_audio = true;
let mut noout = false;
let mut decode_video = true;
let mut decode_audio = true;
+ let mut nmode = NumberMode::FrmPTS;
while (cur_arg < args.len()) && (args[cur_arg].chars().next().unwrap() == '-') {
match args[cur_arg].as_str() {
while (cur_arg < args.len()) && (args[cur_arg].chars().next().unwrap() == '-') {
match args[cur_arg].as_str() {
@@
-77,6
+94,9
@@
fn main() {
"-noout" => { noout = true; },
"-an" => { decode_audio = false; },
"-vn" => { decode_video = false; },
"-noout" => { noout = true; },
"-an" => { decode_audio = false; },
"-vn" => { decode_video = false; },
+ "-nm=count" => { nmode = NumberMode::Counter; },
+ "-nm=pktpts" => { nmode = NumberMode::PktPTS; },
+ "-nm=frmpts" => { nmode = NumberMode::FrmPTS; },
_ => { println!("unknown option {}", args[cur_arg]); return; },
}
cur_arg += 1;
_ => { println!("unknown option {}", args[cur_arg]); return; },
}
cur_arg += 1;
@@
-99,25
+119,38
@@
fn main() {
}
let (dmx_name, _) = res.unwrap();
println!("trying demuxer {} on {}", dmx_name, name);
}
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();
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 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 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());
println!("stream {} - {} {}", i, s, info.get_name());
+ let str_id = s.get_id();
let mut has_out = false;
let mut has_out = false;
+ sids.push(str_id);
if info.is_video() {
if decode_video {
if info.is_video() {
if decode_video {
+ if decfunc.is_none() {
+ println!("no video decoder found!");
+ return;
+ }
let mut dec = (decfunc.unwrap())();
dec.init(info).unwrap();
decs.push(Some(dec));
if !noout {
let mut dec = (decfunc.unwrap())();
dec.init(info).unwrap();
decs.push(Some(dec));
if !noout {
- writers.push(Outputter::Video(FrameOutput{prefix: "", streamno: i}));
+ writers.push(Outputter::Video(FrameOutput{prefix: "", streamno: i
, frameno: 1, nmode: nmode
}));
has_out = true;
}
} else {
has_out = true;
}
} else {
@@
-125,6
+158,10
@@
println!("stream {} - {} {}", i, s, info.get_name());
}
} else if info.is_audio() {
if decode_audio {
}
} else if info.is_audio() {
if decode_audio {
+ if decfunc.is_none() {
+ println!("no audio decoder found!");
+ return;
+ }
let mut dec = (decfunc.unwrap())();
dec.init(info).unwrap();
decs.push(Some(dec));
let mut dec = (decfunc.unwrap())();
dec.init(info).unwrap();
decs.push(Some(dec));
@@
-151,18
+188,20
@@
panic!("decoder {} not found", info.get_name());
if e == DemuxerError::EOF { break; }
}
let pkt = pktres.unwrap();
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 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 !noout {
let frm = dec.decode(&pkt).unwrap();
if !noout {
- match writers[
streamno
] {
+ match writers[
idx
] {
Outputter::Video(ref mut wr) => { wr.output_frame(&pkt, frm); },
Outputter::Audio(ref mut wr) => { wr.output_frame(&pkt, frm); },
_ => {},
};
}
}
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; }
+ if pkt.get_pts() != None &&
lastpts.is_some() &&
pkt.get_pts() >= lastpts { break; }
}
//panic!("end");
}
}
//panic!("end");
}