X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=src%2Fmain.rs;h=6b9086f08913a4a15023ffcdb51fb31342c7185c;hb=071d353e57497f0955fa592fa5866be80a8c4386;hp=9e2bd88efd4830abbe1ca487a6272bc2de2f4605;hpb=a7b5f0087c3e7c631902f911dc5c6f6190f3887e;p=nihav-encoder.git diff --git a/src/main.rs b/src/main.rs index 9e2bd88..6b9086f 100644 --- a/src/main.rs +++ b/src/main.rs @@ -10,12 +10,17 @@ use nihav_core::options::*; use nihav_core::codecs::*; use nihav_core::demuxers::*; use nihav_core::muxers::*; +use nihav_core::reorder::*; 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 crate::null::*; + fn print_options(name: &str, options: &[NAOptionDefinition]) { if options.is_empty() { println!("No custom options."); @@ -67,10 +72,12 @@ struct Transcoder { mux_opts: Vec, istr_opts: Vec, ostr_opts: Vec, - decoders: Vec, Box)>>, + decoders: Vec, Box, Box)>>, encoders: Vec, no_video: bool, no_audio: bool, + start: NATimePoint, + end: NATimePoint, } macro_rules! parse_and_apply_options { @@ -115,7 +122,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 { @@ -146,7 +153,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 { @@ -178,6 +185,23 @@ impl Transcoder { } else if oval.len() == 2 { //todo parse encoder options, store, init later match oval[0] { + "timebase" => { + let mut parts = oval[1].split('/'); + let num = parts.next().unwrap(); + let den = parts.next(); + if let Some(den) = den { + let rnum = num.parse::(); + let rden = den.parse::(); + if let (Ok(num), Ok(den)) = (rnum, rden) { + ostr.enc_params.tb_num = num; + ostr.enc_params.tb_den = den; + } else { + println!("invalid timebase value"); + } + } else { + println!("invalid timebase format (should be num/den)"); + } + }, "encoder" => { if enc_reg.find_encoder(oval[1]).is_some() { ostr.enc_name = oval[1].to_string(); @@ -216,7 +240,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)); @@ -262,7 +300,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 { @@ -360,6 +428,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(); } @@ -377,7 +446,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 }; @@ -534,6 +603,43 @@ 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 { + let buf = frm.get_buffer(); + let cbuf = match cvt { + OutputConvert::None => buf, + OutputConvert::Video(ref mut scaler, ref mut dbuf) => { + let cur_ifmt = get_scale_fmt_from_pic(&buf); + 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); + if ret.is_err() { + println!("error re-initialising scaler for {} -> {}", cur_ifmt, ofmt); + return false; + } + *scaler = ret.unwrap(); + } + let ret = scaler.convert(&buf, dbuf); + if ret.is_err() { + println!("error converting frame for encoding"); + return false; + } + dbuf.clone() + }, + OutputConvert::Audio(ref dinfo, ref dchmap) => { + let ret = convert_audio_frame(&buf, dinfo, dchmap); + if ret.is_err() { + println!("error converting audio for stream {}", dst_id); + return false; + } + ret.unwrap() + }, + }; + let cfrm = NAFrame::new(frm.get_time_information(), frm.frame_type, frm.key, frm.get_info(), cbuf); + encoder.encode(&cfrm).unwrap(); + true +} + macro_rules! next_arg { ($args: expr, $arg_idx: expr) => { if $arg_idx + 1 >= $args.len() { @@ -547,25 +653,93 @@ fn main() { let args: Vec<_> = env::args().collect(); if args.len() == 1 { - println!("usage: nihav-encoder [-noout] [-vn] [-an] input [lastpts]"); + println!("usage: nihav-encoder [options] --input inputfile --output outputfile"); + println!(" use nihav-encoder --help to list all available options"); + return; + } + if args.len() == 2 && (args[1] == "--help" || args[1] == "-h") { + println!("usage: nihav-encoder [options] --input inputfile --output outputfile"); + println!(" query options:"); + println!(" --list-{{decoders,encoders,demuxers,muxers}} - lists all available decoders/encoders/demuxers/muxers"); + println!(" --query-{{decoder,encoder,demuxer,muxer}}-options name - lists all options recognized by that decoder/encoder/demuxer/muxer"); + println!(" processing options:"); + println!(" --input inputfile - set input file"); + println!(" --input-format fmt - force input format"); + println!(" --demuxer-options options - set input demuxer options"); + println!(" --output outputfile - set output file"); + println!(" --output-format fmt - force output format"); + println!(" --muxer-options options - set output muxer options"); + println!(" --no-audio - do not decode audio streams"); + println!(" --no-video - do not decode video streams"); + println!(" --start starttime - start decoding from given position"); + println!(" --end endtime - end decoding at given position"); + println!(" --istreamX options - set options for input stream X"); + println!(" --ostreamX options - set options for output stream X"); + println!(); + println!(" (de)muxer and stream options are passed as comma-separated list e.g. --ostream0 width=320,height=240,flip"); return; } 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); + 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 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(); @@ -576,6 +750,7 @@ fn main() { } else { println!("codec {} is not found", cname); } + printed_info = true; }, "--query-demuxer-options" => { next_arg!(args, arg_idx); @@ -589,6 +764,7 @@ fn main() { } else { println!("demuxer {} is not found", dname); } + printed_info = true; }, "--query-encoder-options" => { next_arg!(args, arg_idx); @@ -600,6 +776,7 @@ fn main() { } else { println!("codec {} is not found", cname); } + printed_info = true; }, "--query-muxer-options" => { next_arg!(args, arg_idx); @@ -614,8 +791,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(); }, @@ -623,7 +801,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(); }, @@ -638,12 +816,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) { @@ -676,6 +874,10 @@ fn main() { arg_idx += 1; } + if printed_info { + return; + } + if transcoder.input_name.len() == 0 { println!("no input name provided"); return; @@ -729,12 +931,26 @@ println!("stream {} - {} {}", i, s, info.get_name()); return; } transcoder.apply_decoder_options(dec.as_mut(), str_id); - transcoder.decoders.push(Some((dsupp, dec))); + let desc = register::get_codec_description(info.get_name()); + let has_b = if let Some(desc) = desc { + desc.has_reorder() + } else { + println!("No codec description found, using B-frame reorderer."); + true + }; + let reord: Box = if has_b { Box::new(IPBReorderer::new()) } else { Box::new(NoReorderer::new()) }; + transcoder.decoders.push(Some((dsupp, dec, reord))); } else { println!("No decoder for stream {} ({}) is found", str_id, 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 @@ -781,7 +997,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() { @@ -789,60 +1005,39 @@ 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; } }, OutputMode::Encode(dst_id, ref mut encoder, ref mut cvt) => { - if let Some((ref mut dsupp, ref mut decoder)) = transcoder.decoders[src_id] { + if let Some((ref mut dsupp, ref mut decoder, ref mut reorderer)) = 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; } let frm = ret.unwrap(); - let buf = frm.get_buffer(); - let cbuf = match cvt { - OutputConvert::None => buf, - OutputConvert::Video(ref mut scaler, ref mut dbuf) => { - let cur_ifmt = get_scale_fmt_from_pic(&buf); - 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); - if ret.is_err() { - println!("error re-initialising scaler for {} -> {}", cur_ifmt, ofmt); - break; - } - *scaler = ret.unwrap(); - } - let ret = scaler.convert(&buf, dbuf); - if ret.is_err() { - println!("error converting frame for encoding"); - break; - } - dbuf.clone() - }, - OutputConvert::Audio(ref dinfo, ref dchmap) => { - let ret = convert_audio_frame(&buf, dinfo, dchmap); - if ret.is_err() { - println!("error converting audio for stream {}", dst_id); - break; - } - ret.unwrap() - }, - }; - 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() { - mux.mux_frame(pkt).unwrap(); + reorderer.add_frame(frm); + while let Some(frm) = reorderer.get_frame() { + if !encode_frame(dst_id, encoder, cvt, frm) { + break; + } + 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 { println!("no decoder for stream {}", src_id); @@ -851,6 +1046,22 @@ println!("stream {} - {} {}", i, s, info.get_name()); }, }; } + 'reord_flush_loop: for str in dmx.get_streams() { + let src_id = str.get_num(); + 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) { + break; + } + while let Ok(Some(pkt)) = encoder.get_packet() { + if transcoder.end != NATimePoint::None && !pkt.ts.less_than(transcoder.end) { break 'reord_flush_loop; } + mux.mux_frame(pkt).unwrap(); + } + } + } + } + } 'flush_loop: for enc in transcoder.encoders.iter_mut() { match enc { OutputMode::Encode(str_id, ref mut encoder, _) => {