X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=src%2Fmain.rs;h=a6d464aed1dfdd47f8ef2d133d7fb33ebb04f860;hb=f88b8fb4f64962205372892b782ad0ae09034e9a;hp=55630fcdcc4161c96867f5210a70037da98c02ad;hpb=935215063aed6eb588d0041b677eab6af53f58cd;p=nihav-encoder.git diff --git a/src/main.rs b/src/main.rs index 55630fc..a6d464a 100644 --- a/src/main.rs +++ b/src/main.rs @@ -13,11 +13,12 @@ use nihav_core::muxers::*; use nihav_core::scale::*; use nihav_core::soundcvt::*; use nihav_registry::detect; +use nihav_registry::register; use nihav_allstuff::*; use std::env; mod null; -use null::*; +use crate::null::*; fn print_options(name: &str, options: &[NAOptionDefinition]) { if options.is_empty() { @@ -74,6 +75,8 @@ struct Transcoder { encoders: Vec, no_video: bool, no_audio: bool, + start: NATimePoint, + end: NATimePoint, } macro_rules! parse_and_apply_options { @@ -118,7 +121,7 @@ impl Transcoder { self.istr_opts.len() - 1 }; let istr = &mut self.istr_opts[sidx]; - + for opt in opt1.split(',') { let oval: Vec<_> = opt.split('=').collect(); if oval.len() == 1 { @@ -149,7 +152,7 @@ impl Transcoder { self.ostr_opts.len() - 1 }; let ostr = &mut self.ostr_opts[sidx]; - + for opt in opt1.split(',') { let oval: Vec<_> = opt.split('=').collect(); if oval.len() == 1 { @@ -219,7 +222,21 @@ impl Transcoder { println!("video option for audio stream"); } }, -//todo formaton + "pixfmt" => { + if ostr.enc_params.format == NACodecTypeInfo::None { + ostr.enc_params.format = NACodecTypeInfo::Video(NAVideoInfo::new(0, 0, false, YUV420_FORMAT)); + } + if let NACodecTypeInfo::Video(ref mut vinfo) = ostr.enc_params.format { + let ret = oval[1].parse::(); + if let Ok(val) = ret { + vinfo.format = val; + } else { + println!("invalid pixel format"); + } + } else { + println!("video option for audio stream"); + } + }, "srate" => { if ostr.enc_params.format == NACodecTypeInfo::None { ostr.enc_params.format = NACodecTypeInfo::Audio(NAAudioInfo::new(0, 0, SND_S16_FORMAT, 0)); @@ -265,7 +282,37 @@ impl Transcoder { println!("audio option for video stream"); } }, -//todo soniton, channel map + "sfmt" => { + if ostr.enc_params.format == NACodecTypeInfo::None { + ostr.enc_params.format = NACodecTypeInfo::Audio(NAAudioInfo::new(0, 0, SND_S16_FORMAT, 0)); + } + if let NACodecTypeInfo::Audio(ref mut ainfo) = ostr.enc_params.format { + let ret = oval[1].parse::(); + if let Ok(val) = ret { + ainfo.format = val; + } else { + println!("invalid audio format"); + } + } else { + println!("audio option for video stream"); + } + }, +// todo channel map negotiation + /*"chmap" => { + if ostr.enc_params.format == NACodecTypeInfo::None { + ostr.enc_params.format = NACodecTypeInfo::Audio(NAAudioInfo::new(0, 0, SND_S16_FORMAT, 0)); + } + if let NACodecTypeInfo::Audio(ref mut ainfo) = ostr.enc_params.format { + let ret = oval[1].parse::(); + if let Ok(val) = ret { + ainfo.chmap = val; + } else { + println!("invalid channel map"); + } + } else { + println!("audio option for video stream"); + } + },*/ "bitrate" => { let ret = oval[1].parse::(); if let Ok(val) = ret { @@ -363,6 +410,7 @@ impl Transcoder { return false; } let mut encoder = (enc_create.unwrap())(); + let forced_out = oopts.enc_params.format != NACodecTypeInfo::None; if oopts.enc_params.format == NACodecTypeInfo::None { oopts.enc_params.format = istr.get_info().get_properties(); } @@ -380,7 +428,7 @@ impl Transcoder { //todo check for params mismatch let cvt = match (&oopts.enc_params.format, &ret_eparams.format) { (NACodecTypeInfo::Video(svinfo), NACodecTypeInfo::Video(dvinfo)) => { - if svinfo == dvinfo { + if svinfo == dvinfo && !forced_out { OutputConvert::None } else { let ofmt = ScaleInfo { fmt: dvinfo.format, width: dvinfo.width, height: dvinfo.height }; @@ -557,7 +605,7 @@ fn main() { 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); + nihav_register_all_decoders(&mut dec_reg); let mut mux_reg = RegisteredMuxers::new(); nihav_register_all_muxers(&mut mux_reg); @@ -569,8 +617,51 @@ fn main() { let mut transcoder = Transcoder::new(); let mut arg_idx = 1; + let mut printed_info = false; while arg_idx < args.len() { match args[arg_idx].as_str() { + "--list-decoders" => { + if dec_reg.iter().len() > 0 { + println!("Registered decoders:"); + for dec in 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); + } + } else { + println!("No registered decoders."); + } + printed_info = true; + }, + "--list-encoders" => { + if enc_reg.iter().len() > 0 { + println!("Registered encoders:"); + for enc in 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); + } + } else { + println!("No registered encoders."); + } + printed_info = true; + }, + "--list-demuxers" => { + print!("Registered demuxers:"); + for dmx in dmx_reg.iter() { + print!(" {}", dmx.get_name()); + } + println!(); + printed_info = true; + }, + "--list-muxers" => { + print!("Registered muxers:"); + for mux in mux_reg.iter() { + print!(" {}", mux.get_name()); + } + println!(); + printed_info = true; + }, "--query-decoder-options" => { next_arg!(args, arg_idx); let cname = args[arg_idx].as_str(); @@ -581,6 +672,7 @@ fn main() { } else { println!("codec {} is not found", cname); } + printed_info = true; }, "--query-demuxer-options" => { next_arg!(args, arg_idx); @@ -594,6 +686,7 @@ fn main() { } else { println!("demuxer {} is not found", dname); } + printed_info = true; }, "--query-encoder-options" => { next_arg!(args, arg_idx); @@ -605,6 +698,7 @@ fn main() { } else { println!("codec {} is not found", cname); } + printed_info = true; }, "--query-muxer-options" => { next_arg!(args, arg_idx); @@ -619,8 +713,9 @@ fn main() { } else { println!("muxer {} is not found", name); } + printed_info = true; }, - "--input" => { + "--input" | "-i" => { next_arg!(args, arg_idx); transcoder.input_name = args[arg_idx].clone(); }, @@ -628,7 +723,7 @@ fn main() { next_arg!(args, arg_idx); transcoder.input_fmt = Some(args[arg_idx].clone()); }, - "--output" => { + "--output" | "-o" => { next_arg!(args, arg_idx); transcoder.output_name = args[arg_idx].clone(); }, @@ -643,12 +738,32 @@ fn main() { return; } }, - "--no-video" => { + "--no-video" | "-vn" => { transcoder.no_video = true; }, - "--no-audio" => { + "--no-audio" | "-an" => { transcoder.no_audio = true; }, + "--start" => { + next_arg!(args, arg_idx); + let ret = args[arg_idx].parse::(); + if let Ok(val) = ret { + transcoder.start = val; + } else { + println!("invalid start time"); + return; + } + }, + "--end" => { + next_arg!(args, arg_idx); + let ret = args[arg_idx].parse::(); + if let Ok(val) = ret { + transcoder.end = val; + } else { + println!("invalid end time"); + return; + } + }, "--muxer-options" => { next_arg!(args, arg_idx); if !transcoder.parse_muxer_options(&args[arg_idx], &mux_reg) { @@ -681,6 +796,10 @@ fn main() { arg_idx += 1; } + if printed_info { + return; + } + if transcoder.input_name.len() == 0 { println!("no input name provided"); return; @@ -740,6 +859,12 @@ println!("stream {} - {} {}", i, s, info.get_name()); transcoder.decoders.push(None); } } + if transcoder.start != NATimePoint::None { + let ret = dmx.seek(transcoder.start); + if ret.is_err() { + println!(" failed to seek to {} error {:?}", transcoder.start, ret.err().unwrap()); + } + } let output_fmt = if let Some(ref str) = transcoder.output_fmt { str @@ -786,7 +911,7 @@ println!("stream {} - {} {}", i, s, info.get_name()); println!(" #{}: {} {}", ostr.get_num(), ostr, ostr.get_info().get_name()); } - loop { + 'main_loop: loop { let pktres = dmx.get_frame(); if let Err(DemuxerError::EOF) = pktres { break; } if pktres.is_err() { @@ -794,12 +919,14 @@ println!("stream {} - {} {}", i, s, info.get_name()); break; } let mut pkt = pktres.unwrap(); + if transcoder.start != NATimePoint::None && pkt.ts.less_than(transcoder.start) { continue; } let src_id = pkt.get_stream().get_num(); match transcoder.encoders[src_id] { OutputMode::Drop => {}, OutputMode::Copy(dst_id) => { let dstr = mux.get_stream(dst_id as usize).unwrap(); pkt.reassign(dstr, pkt.get_time_information()); + if transcoder.end != NATimePoint::None && !pkt.ts.less_than(transcoder.end) { break 'main_loop; } if mux.mux_frame(pkt).is_err() { println!("error muxing packet"); break; @@ -808,6 +935,9 @@ println!("stream {} - {} {}", i, s, info.get_name()); OutputMode::Encode(dst_id, ref mut encoder, ref mut cvt) => { if let Some((ref mut dsupp, ref mut decoder)) = transcoder.decoders[src_id] { let ret = decoder.decode(dsupp, &pkt); + if let (true, Err(DecoderError::MissingReference)) = (transcoder.start != NATimePoint::None, &ret) { + continue; + } if ret.is_err() { println!("error decoding stream {}", src_id); break; @@ -847,6 +977,7 @@ println!("stream {} - {} {}", i, s, info.get_name()); let cfrm = NAFrame::new(frm.get_time_information(), frm.frame_type, frm.key, frm.get_info(), cbuf); encoder.encode(&cfrm).unwrap(); while let Ok(Some(pkt)) = encoder.get_packet() { + if transcoder.end != NATimePoint::None && !pkt.ts.less_than(transcoder.end) { break 'main_loop; } mux.mux_frame(pkt).unwrap(); } } else {