X-Git-Url: https://git.nihav.org/?p=nihav-tool.git;a=blobdiff_plain;f=src%2Fmain.rs;h=c26e671f628ab0259dc9a8a33c7b0728ffdaa453;hp=b5653f4437ddbec748db431e77b6d4e0f98f74d1;hb=e47ee41144428dafd739f6bb7fd7fc31f1c890d5;hpb=44939c842b9aa76838dae8064d1b13bb47960efb diff --git a/src/main.rs b/src/main.rs index b5653f4..c26e671 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,20 +1,22 @@ -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; -use frmwriter::*; +use crate::frmwriter::*; mod wavwriter; -use wavwriter::WavWriter; +use crate::wavwriter::WavWriter; #[derive(Clone,Copy,PartialEq)] enum NumberMode { @@ -31,19 +33,22 @@ struct FrameOutput { } 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; @@ -56,13 +61,13 @@ struct AudioOutput { } 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(); } } @@ -86,7 +91,7 @@ fn main() { let mut decode_audio = true; let mut nmode = NumberMode::FrmPTS; - 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; }, @@ -117,18 +122,27 @@ fn main() { } 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>> = Vec::new(); + let mut decs: Vec, Box)>> = Vec::new(); + let mut sids: Vec = Vec::new(); let mut writers: Vec = 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; + sids.push(str_id); if info.is_video() { if decode_video { if decfunc.is_none() { @@ -136,10 +150,11 @@ println!("stream {} - {} {}", i, s, info.get_name()); 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 { @@ -152,8 +167,9 @@ println!("stream {} - {} {}", i, s, info.get_name()); 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))); @@ -177,11 +193,13 @@ panic!("decoder {} not found", info.get_name()); 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(); + let streamno = pkt.get_stream().get_id(); + let sr = sids.iter().position(|x| *x == streamno); + let idx = sr.unwrap(); + if let Some((ref mut dsupp, ref mut dec)) = decs[idx] { + let frm = dec.decode(dsupp, &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); }, _ => {},