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;
mux_opts: Vec<OptionArgs>,
istr_opts: Vec<InputStreamOptions>,
ostr_opts: Vec<OutputStreamOptions>,
- decoders: Vec<Option<(Box<NADecoderSupport>, Box<dyn NADecoder>)>>,
+ decoders: Vec<Option<(Box<NADecoderSupport>, Box<dyn NADecoder>, Box<dyn FrameReorderer>)>>,
encoders: Vec<OutputMode>,
no_video: bool,
no_audio: bool,
} 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::<u32>();
+ let rden = den.parse::<u32>();
+ 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();
}
}
+fn encode_frame(dst_id: u32, encoder: &mut Box<NAEncoder>, 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() {
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;
}
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<dyn FrameReorderer> = 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);
}
},
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;
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() {
- if transcoder.end != NATimePoint::None && !pkt.ts.less_than(transcoder.end) { break 'main_loop; }
- 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);
},
};
}
+ '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, _) => {
projects / nihav-encoder.git / blobdiff