X-Git-Url: https://git.nihav.org/?p=nihav-encoder.git;a=blobdiff_plain;f=src%2Fmain.rs;h=fd1fdaefbc5cb5dabcb3eaa9edb76700b8d7d460;hp=0f1109c789a50a38a42e1a822c876cb98248396d;hb=91a15e39ebb3b9fef4e8806b191a3c10ddb8a27c;hpb=73f889bfff486539ebd9cc3b8f6cb8477f49a637 diff --git a/src/main.rs b/src/main.rs index 0f1109c..fd1fdae 100644 --- a/src/main.rs +++ b/src/main.rs @@ -4,6 +4,7 @@ extern crate nihav_registry; extern crate nihav_allstuff; use std::fs::File; +use std::io::BufReader; use nihav_core::io::byteio::{FileReader, ByteReader}; use nihav_core::frame::*; use nihav_core::options::*; @@ -15,11 +16,11 @@ use nihav_core::scale::*; use nihav_core::soundcvt::*; use nihav_registry::detect; use nihav_registry::register; -use nihav_allstuff::*; use std::env; +mod demux; +use crate::demux::*; mod null; -use crate::null::*; fn print_options(name: &str, options: &[NAOptionDefinition]) { if options.is_empty() { @@ -56,6 +57,7 @@ enum OutputConvert { None, } +#[allow(clippy::large_enum_variant)] enum OutputMode { Drop, Copy(u32), @@ -63,6 +65,7 @@ enum OutputMode { } #[derive(Default)] +#[allow(clippy::type_complexity)] struct Transcoder { input_name: String, input_fmt: Option, @@ -72,6 +75,7 @@ struct Transcoder { mux_opts: Vec, istr_opts: Vec, ostr_opts: Vec, + scale_opts: Vec<(String, String)>, decoders: Vec, Box, Box)>>, encoders: Vec, no_video: bool, @@ -87,14 +91,18 @@ macro_rules! parse_and_apply_options { for opt in $in_opts.iter() { let mut found = false; for opt_def in opt_def.iter() { - if opt.name == opt_def.name { + let mut matches = opt.name == opt_def.name; + if !matches && opt.name.starts_with("no") { + let (_, name) = opt.name.split_at(2); + matches = name == opt_def.name; + } + if matches { let arg = if let Some(ref str) = opt.value { Some(str) } else { None }; let ret = opt_def.parse(&opt.name, arg); - if ret.is_err() { - println!("invalid option {} for {}", opt.name, $name); - } else { - let (val, _) = ret.unwrap(); + if let Ok((val, _)) = ret { opts.push(val); + } else { + println!("invalid option {} for {}", opt.name, $name); } found = true; } @@ -399,6 +407,20 @@ impl Transcoder { } true } + fn parse_scale_options(&mut self, opts: &str) -> bool { + for opt in opts.split(',') { + let oval: Vec<_> = opt.split('=').collect(); + if oval.len() == 1 { + self.scale_opts.push((oval[0].to_string(), "".to_string())); + } else if oval.len() == 2 { + self.scale_opts.push((oval[0].to_string(), oval[1].to_string())); + } else { + println!("unrecognized option '{}'", opt); + return false; + } + } + true + } fn apply_decoder_options(&self, dec: &mut dyn NADecoder, str_id: u32) { if let Some(str_idx) = self.istr_opts.iter().position(|str| str.id == str_id) { let dec_opts = dec.get_supported_options(); @@ -419,7 +441,7 @@ impl Transcoder { if let Some(str_idx) = self.ostr_opts.iter().position(|str| str.id == out_id) { let oopts = &mut self.ostr_opts[str_idx]; if oopts.enc_name.as_str() == "copy" && (cname == "any" || istr.get_info().get_name() == cname) { - out_sm.add_stream_ref(istr.clone()); + out_sm.add_stream_ref(istr); self.encoders.push(OutputMode::Copy(out_id)); } else if cname == "any" || oopts.enc_name.as_str() == cname { let enc_create = enc_reg.find_encoder(oopts.enc_name.as_str()); @@ -450,7 +472,7 @@ impl Transcoder { OutputConvert::None } else { let ofmt = ScaleInfo { fmt: dvinfo.format, width: dvinfo.width, height: dvinfo.height }; - let ret = NAScale::new(ofmt, ofmt); + let ret = NAScale::new_with_options(ofmt, ofmt, &self.scale_opts); if ret.is_err() { println!("cannot create scaler"); return false; @@ -498,15 +520,13 @@ println!("can't generate default channel map for {} channels", dainfo.channels); println!("encoder {} is not supported by output (expected {})", istr.id, istr.get_info().get_name()); return false; } + } else if cname == "any" || istr.get_info().get_name() == cname { + out_sm.add_stream_ref(istr); + self.encoders.push(OutputMode::Copy(out_id)); } else { - if cname == "any" || istr.get_info().get_name() == cname { - out_sm.add_stream_ref(istr.clone()); - self.encoders.push(OutputMode::Copy(out_id)); - } else { println!("stream {} ({}) can't be handled", istr.id, istr.get_info().get_name()); // todo autoselect encoder? - return false; - } + return false; } true } @@ -603,7 +623,7 @@ println!("stream {} ({}) can't be handled", istr.id, istr.get_info().get_name()) } } -fn encode_frame(dst_id: u32, encoder: &mut Box, cvt: &mut OutputConvert, frm: NAFrameRef) -> bool { +fn encode_frame(dst_id: u32, encoder: &mut Box, cvt: &mut OutputConvert, frm: NAFrameRef, scale_opts: &[(String, String)]) -> bool { let buf = frm.get_buffer(); let cbuf = match cvt { OutputConvert::None => buf, @@ -612,7 +632,7 @@ fn encode_frame(dst_id: u32, encoder: &mut Box, cvt: &mut OutputC let last_ifmt = scaler.get_in_fmt(); if cur_ifmt != last_ifmt { let ofmt = scaler.get_out_fmt(); - let ret = NAScale::new(cur_ifmt, ofmt); + let ret = NAScale::new_with_options(cur_ifmt, ofmt, scale_opts); if ret.is_err() { println!("error re-initialising scaler for {} -> {}", cur_ifmt, ofmt); return false; @@ -649,6 +669,7 @@ macro_rules! next_arg { } } +#[allow(clippy::single_match)] fn main() { let args: Vec<_> = env::args().collect(); @@ -666,6 +687,7 @@ fn main() { println!(" --input inputfile - set input file"); println!(" --input-format fmt - force input format"); println!(" --demuxer-options options - set input demuxer options"); + println!(" --scale-options options - set scaler options"); println!(" --output outputfile - set output file"); println!(" --output-format fmt - force output format"); println!(" --muxer-options options - set output muxer options"); @@ -680,17 +702,7 @@ fn main() { return; } - let mut dmx_reg = RegisteredDemuxers::new(); - nihav_register_all_demuxers(&mut dmx_reg); - let mut dec_reg = RegisteredDecoders::new(); - nihav_register_all_decoders(&mut dec_reg); - - let mut mux_reg = RegisteredMuxers::new(); - nihav_register_all_muxers(&mut mux_reg); - mux_reg.add_muxer(NULL_MUXER); - let mut enc_reg = RegisteredEncoders::new(); - nihav_register_all_encoders(&mut enc_reg); - enc_reg.add_encoder(NULL_ENCODER); + let full_reg = FullRegister::new(); let mut transcoder = Transcoder::new(); @@ -699,9 +711,9 @@ fn main() { while arg_idx < args.len() { match args[arg_idx].as_str() { "--list-decoders" => { - if dec_reg.iter().len() > 0 { + if full_reg.dec_reg.iter().len() > 0 { println!("Registered decoders:"); - for dec in dec_reg.iter() { + for dec in full_reg.dec_reg.iter() { let cdesc = register::get_codec_description(dec.name); let full_name = if let Some(cd) = cdesc { cd.get_full_name() } else { "???" }; println!(" {} ({})", dec.name, full_name); @@ -712,9 +724,9 @@ fn main() { printed_info = true; }, "--list-encoders" => { - if enc_reg.iter().len() > 0 { + if full_reg.enc_reg.iter().len() > 0 { println!("Registered encoders:"); - for enc in enc_reg.iter() { + for enc in full_reg.enc_reg.iter() { let cdesc = register::get_codec_description(enc.name); let full_name = if let Some(cd) = cdesc { cd.get_full_name() } else { "???" }; println!(" {} ({})", enc.name, full_name); @@ -726,7 +738,7 @@ fn main() { }, "--list-demuxers" => { print!("Registered demuxers:"); - for dmx in dmx_reg.iter() { + for dmx in full_reg.dmx_reg.iter() { print!(" {}", dmx.get_name()); } println!(); @@ -734,7 +746,7 @@ fn main() { }, "--list-muxers" => { print!("Registered muxers:"); - for mux in mux_reg.iter() { + for mux in full_reg.mux_reg.iter() { print!(" {}", mux.get_name()); } println!(); @@ -743,7 +755,7 @@ fn main() { "--query-decoder-options" => { next_arg!(args, arg_idx); let cname = args[arg_idx].as_str(); - if let Some(decfunc) = dec_reg.find_decoder(cname) { + if let Some(decfunc) = full_reg.dec_reg.find_decoder(cname) { let dec = (decfunc)(); let opts = dec.get_supported_options(); print_options(cname, opts); @@ -757,7 +769,7 @@ fn main() { let dname = args[arg_idx].as_str(); let mut mr = MemoryReader::new_read(&[]); let mut br = ByteReader::new(&mut mr); - if let Some(dmx_creator) = dmx_reg.find_demuxer(dname) { + if let Some(dmx_creator) = full_reg.dmx_reg.find_demuxer(dname) { let dmx = dmx_creator.new_demuxer(&mut br); let opts = dmx.get_supported_options(); print_options(dname, opts); @@ -769,7 +781,7 @@ fn main() { "--query-encoder-options" => { next_arg!(args, arg_idx); let cname = args[arg_idx].as_str(); - if let Some(encfunc) = enc_reg.find_encoder(cname) { + if let Some(encfunc) = full_reg.enc_reg.find_encoder(cname) { let enc = (encfunc)(); let opts = enc.get_supported_options(); print_options(cname, opts); @@ -784,7 +796,7 @@ fn main() { let mut data = []; let mut mw = MemoryWriter::new_write(&mut data); let mut bw = ByteWriter::new(&mut mw); - if let Some(mux_creator) = mux_reg.find_muxer(name) { + if let Some(mux_creator) = full_reg.mux_reg.find_muxer(name) { let mux = mux_creator.new_muxer(&mut bw); let opts = mux.get_supported_options(); print_options(name, opts); @@ -811,11 +823,18 @@ fn main() { }, "--demuxer-options" => { next_arg!(args, arg_idx); - if !transcoder.parse_demuxer_options(&args[arg_idx], &dmx_reg) { + if !transcoder.parse_demuxer_options(&args[arg_idx], &full_reg.dmx_reg) { println!("invalid demuxer option syntax"); return; } }, + "--scale-options" => { + next_arg!(args, arg_idx); + if !transcoder.parse_scale_options(&args[arg_idx]) { + println!("invalid scale option syntax"); + return; + } + }, "--no-video" | "-vn" => { transcoder.no_video = true; }, @@ -844,7 +863,7 @@ fn main() { }, "--muxer-options" => { next_arg!(args, arg_idx); - if !transcoder.parse_muxer_options(&args[arg_idx], &mux_reg) { + if !transcoder.parse_muxer_options(&args[arg_idx], &full_reg.mux_reg) { println!("invalid muxer option syntax"); return; } @@ -860,7 +879,7 @@ fn main() { } else if args[arg_idx].starts_with("--ostream") { let opt0 = &args[arg_idx]; next_arg!(args, arg_idx); - if !transcoder.parse_ostream_options(opt0, &args[arg_idx], &enc_reg) { + if !transcoder.parse_ostream_options(opt0, &args[arg_idx], &full_reg.enc_reg) { println!("invalid output stream option syntax"); return; } @@ -878,11 +897,11 @@ fn main() { return; } - if transcoder.input_name.len() == 0 { + if transcoder.input_name.is_empty() { println!("no input name provided"); return; } - if transcoder.output_name.len() == 0 { + if transcoder.output_name.is_empty() { println!("no output name provided"); return; } @@ -892,34 +911,35 @@ fn main() { println!("error opening input"); return; } - let mut file = res.unwrap(); - let mut fr = FileReader::new_read(&mut file); + let file = res.unwrap(); + let file = BufReader::new(file); + let mut fr = FileReader::new_read(file); let mut br = ByteReader::new(&mut fr); - - let dmx_name = if let Some(ref str) = transcoder.input_fmt { - str.as_str() + let (is_raw, start, end) = if transcoder.input_fmt.is_none() { + detect_tags(&mut br) } else { - if let Some((dmx_name, score)) = detect::detect_format(transcoder.input_name.as_str(), &mut br) { - println!("detected {} with score {:?}", dmx_name, score); - dmx_name - } else { - println!("cannot detect input format"); - return; - } + (false, 0, None) }; - let ret = dmx_reg.find_demuxer(dmx_name); - if ret.is_none() { - println!("cannot find demuxer for '{}'", dmx_name); + + let mut nfr: Box; + if start != 0 || end.is_some() { + let file = fr.finish(); + nfr = Box::new(BoundedFileReader::new_read(file, start, end).unwrap()); + } else { + nfr = Box::new(fr); + } + let mut br = ByteReader::new(nfr.as_mut()); + + let mut dmx = DemuxerObject::create(&mut br, &full_reg, transcoder.input_name.as_str(), &transcoder.input_fmt, is_raw); + if dmx.is_none() { + println!("cannot find demuxer for '{}'", transcoder.input_name.as_str()); return; } - let dmx_fact = ret.unwrap(); - br.seek(SeekFrom::Start(0)).unwrap(); - let mut dmx = create_demuxer(dmx_fact, &mut br).unwrap(); parse_and_apply_options!(dmx, &transcoder.demux_opts, "input"); for i in 0..dmx.get_num_streams() { let s = dmx.get_stream(i).unwrap(); let info = s.get_info(); - let decfunc = dec_reg.find_decoder(info.get_name()); + let decfunc = full_reg.dec_reg.find_decoder(info.get_name()); println!("stream {} - {} {}", i, s, info.get_name()); let str_id = s.get_num() as u32; if let Some(create_dec) = decfunc { @@ -954,15 +974,13 @@ println!("stream {} - {} {}", i, s, info.get_name()); let output_fmt = if let Some(ref str) = transcoder.output_fmt { str + } else if let Some(str) = detect::detect_format_by_name(transcoder.output_name.as_str()) { + str } else { - if let Some(str) = detect::detect_format_by_name(transcoder.output_name.as_str()) { - str - } else { - println!("Cannot guess muxer for output"); - return; - } + println!("Cannot guess muxer for output"); + return; }; - let ret = mux_reg.find_muxer(output_fmt); + let ret = full_reg.mux_reg.find_muxer(output_fmt); let ofmt = output_fmt.to_string(); if ret.is_none() { @@ -972,7 +990,7 @@ println!("stream {} - {} {}", i, s, info.get_name()); let mux_caps = mux_creator.get_capabilities(); let mut out_sm = StreamManager::new(); - if !transcoder.negotiate_stream_map(dmx.get_stream_manager(), mux_caps, &mut out_sm, &enc_reg) { + if !transcoder.negotiate_stream_map(dmx.get_stream_manager(), mux_caps, &mut out_sm, &full_reg.enc_reg) { println!("cannot determine stream map"); return; } @@ -1031,7 +1049,7 @@ println!("stream {} - {} {}", i, s, info.get_name()); let frm = ret.unwrap(); reorderer.add_frame(frm); while let Some(frm) = reorderer.get_frame() { - if !encode_frame(dst_id, encoder, cvt, frm) { + if !encode_frame(dst_id, encoder, cvt, frm, &transcoder.scale_opts) { break; } while let Ok(Some(pkt)) = encoder.get_packet() { @@ -1051,7 +1069,7 @@ println!("stream {} - {} {}", i, s, info.get_name()); if let OutputMode::Encode(dst_id, ref mut encoder, ref mut cvt) = transcoder.encoders[src_id] { if let Some((_, _, ref mut reorderer)) = transcoder.decoders[src_id] { while let Some(frm) = reorderer.get_last_frames() { - if !encode_frame(dst_id, encoder, cvt, frm) { + if !encode_frame(dst_id, encoder, cvt, frm, &transcoder.scale_opts) { break; } while let Ok(Some(pkt)) = encoder.get_packet() {