X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=src%2Fmain.rs;h=0a36cc88da1c09579c9ec8da73ee75e675ce04c0;hb=HEAD;hp=3c39857eec672b6de55ecc4dbe6a1e4167c75c08;hpb=c23d0c3a348fdc64a1cd6f71200b9d0fe0f6159c;p=nihav-encoder.git diff --git a/src/main.rs b/src/main.rs index 3c39857..ee6ba25 100644 --- a/src/main.rs +++ b/src/main.rs @@ -5,6 +5,7 @@ extern crate nihav_allstuff; use std::fs::File; use std::io::{BufReader, Write}; +use std::pin::Pin; use nihav_core::io::byteio::{FileReader, ByteReader}; use nihav_core::frame::*; use nihav_core::options::*; @@ -23,6 +24,58 @@ use crate::demux::*; mod null; mod acvt; use crate::acvt::*; +mod imgseq; +use crate::imgseq::*; + +#[derive(Clone,Copy,Default,PartialEq)] +enum RegisterResult { + #[default] + Ok, + Ignored, + Failed, +} + +pub struct SelfBorrow { + bval: T, + dst: Option, +} + +impl SelfBorrow { + pub fn new(src: T, create: F) -> Pin> + where F: Fn(*mut T) -> U { + let mut obj = Box::pin(Self{ + bval: src, + dst: None, + }); + let ptr = &mut obj.bval as *mut T; + obj.dst = Some(create(ptr)); + obj + } + fn get_object(&self) -> &U { + if let Some(ref dst) = self.dst { + dst + } else { + unreachable!() + } + } + fn get_object_mut(&mut self) -> &mut U { + if let Some(ref mut dst) = self.dst { + dst + } else { + unreachable!() + } + } +} + +impl Drop for SelfBorrow { + fn drop(&mut self) { + self.dst = None; + } +} + +pub type SBBox = Pin>>; + +const SND_NO_FORMAT: NASoniton = NASoniton { bits: 0, be: false, packed: false, planar: false, float: false, signed: false }; fn format_time(ms: u64) -> String { let s = ms / 1000; @@ -117,11 +170,11 @@ enum OutputMode { #[derive(Default)] #[allow(clippy::type_complexity)] struct Transcoder { - input_name: String, - input_fmt: Option, + input_name: [Option; 16], + input_fmt: [Option; 16], output_name: String, output_fmt: Option, - demux_opts: Vec, + demux_opts: [Vec; 16], mux_opts: Vec, istr_opts: Vec, ostr_opts: Vec, @@ -133,6 +186,10 @@ struct Transcoder { start: NATimePoint, end: NATimePoint, verbose: u8, + + calc_len: bool, + nframes: Vec, + global_tb: (u32, u32), } macro_rules! parse_and_apply_options { @@ -148,7 +205,7 @@ macro_rules! parse_and_apply_options { matches = name == opt_def.name; } if matches { - let arg = if let Some(ref str) = opt.value { Some(str) } else { None }; + let arg = if let Some(ref strval) = opt.value { Some(strval) } else { None }; let ret = opt_def.parse(&opt.name, arg); if let Ok((val, _)) = ret { opts.push(val); @@ -174,7 +231,7 @@ impl Transcoder { if ret.is_err() { return false; } let streamno = ret.unwrap(); - let sidx = if let Some(idx) = self.istr_opts.iter().position(|str| str.id == streamno) { + let sidx = if let Some(idx) = self.istr_opts.iter().position(|el| el.id == streamno) { idx } else { self.istr_opts.push(InputStreamOptions {id: streamno, drop: false, dec_opts: Vec::new() }); @@ -205,7 +262,7 @@ impl Transcoder { if ret.is_err() { return false; } let streamno = ret.unwrap(); - let sidx = if let Some(idx) = self.ostr_opts.iter().position(|str| str.id == streamno) { + let sidx = if let Some(idx) = self.ostr_opts.iter().position(|el| el.id == streamno) { idx } else { self.ostr_opts.push(OutputStreamOptions {id: streamno, enc_name: String::new(), enc_params: EncodeParameters::default(), enc_opts: Vec::new() }); @@ -316,7 +373,7 @@ impl Transcoder { }, "srate" => { if ostr.enc_params.format == NACodecTypeInfo::None { - ostr.enc_params.format = NACodecTypeInfo::Audio(NAAudioInfo::new(0, 0, SND_S16_FORMAT, 0)); + ostr.enc_params.format = NACodecTypeInfo::Audio(NAAudioInfo::new(0, 0, SND_NO_FORMAT, 0)); } if let NACodecTypeInfo::Audio(ref mut ainfo) = ostr.enc_params.format { let ret = oval[1].parse::(); @@ -331,7 +388,7 @@ impl Transcoder { }, "channels" => { if ostr.enc_params.format == NACodecTypeInfo::None { - ostr.enc_params.format = NACodecTypeInfo::Audio(NAAudioInfo::new(0, 0, SND_S16_FORMAT, 0)); + ostr.enc_params.format = NACodecTypeInfo::Audio(NAAudioInfo::new(0, 0, SND_NO_FORMAT, 0)); } if let NACodecTypeInfo::Audio(ref mut ainfo) = ostr.enc_params.format { let ret = oval[1].parse::(); @@ -346,7 +403,7 @@ impl Transcoder { }, "block_len" => { if ostr.enc_params.format == NACodecTypeInfo::None { - ostr.enc_params.format = NACodecTypeInfo::Audio(NAAudioInfo::new(0, 0, SND_S16_FORMAT, 0)); + ostr.enc_params.format = NACodecTypeInfo::Audio(NAAudioInfo::new(0, 0, SND_NO_FORMAT, 0)); } if let NACodecTypeInfo::Audio(ref mut ainfo) = ostr.enc_params.format { let ret = oval[1].parse::(); @@ -361,7 +418,7 @@ impl Transcoder { }, "sfmt" => { if ostr.enc_params.format == NACodecTypeInfo::None { - ostr.enc_params.format = NACodecTypeInfo::Audio(NAAudioInfo::new(0, 0, SND_S16_FORMAT, 0)); + ostr.enc_params.format = NACodecTypeInfo::Audio(NAAudioInfo::new(0, 0, SND_NO_FORMAT, 0)); } if let NACodecTypeInfo::Audio(ref mut ainfo) = ostr.enc_params.format { let ret = oval[1].parse::(); @@ -377,7 +434,7 @@ impl Transcoder { // 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)); + ostr.enc_params.format = NACodecTypeInfo::Audio(NAAudioInfo::new(0, 0, SND_NO_FORMAT, 0)); } if let NACodecTypeInfo::Audio(ref mut ainfo) = ostr.enc_params.format { let ret = oval[1].parse::(); @@ -416,20 +473,20 @@ impl Transcoder { } true } - fn parse_demuxer_options(&mut self, opts: &str, dmx_reg: &RegisteredDemuxers) -> bool { + fn parse_demuxer_options(&mut self, opts: &str, dmx_reg: &RegisteredDemuxers, input_no: usize) -> bool { for opt in opts.split(',') { let oval: Vec<_> = opt.split('=').collect(); if oval.len() == 1 { - self.demux_opts.push(OptionArgs{ name: oval[0].to_string(), value: None }); + self.demux_opts[input_no].push(OptionArgs{ name: oval[0].to_string(), value: None }); } else if oval.len() == 2 { if oval[0] == "format" { if dmx_reg.find_demuxer(oval[1]).is_some() { - self.input_fmt = Some(oval[1].to_string()); + self.input_fmt[input_no] = Some(oval[1].to_string()); } else { println!("unknown demuxer format '{}'", oval[1]); } } else { - self.demux_opts.push(OptionArgs{ name: oval[0].to_string(), value: Some(oval[1].to_string()) }); + self.demux_opts[input_no].push(OptionArgs{ name: oval[0].to_string(), value: Some(oval[1].to_string()) }); } } else { println!("unrecognized option '{}'", opt); @@ -473,37 +530,68 @@ impl Transcoder { 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) { + if let Some(str_idx) = self.istr_opts.iter().position(|el| el.id == str_id) { let dec_opts = dec.get_supported_options(); if dec_opts.is_empty() { return; } let name = format!("input stream {}", str_id); parse_and_apply_options!(dec, &self.istr_opts[str_idx].dec_opts, name); } } - fn register_output_stream(&mut self, cname: &str, istr: NAStreamRef, out_sm: &mut StreamManager, enc_reg: &RegisteredEncoders) -> bool { + fn register_output_stream(&mut self, cname: &str, istr: NAStreamRef, iidx: usize, out_sm: &mut StreamManager, enc_reg: &RegisteredEncoders) -> RegisterResult { let out_id = out_sm.get_num_streams() as u32; - if let Some(str_idx) = self.istr_opts.iter().position(|str| str.id == (istr.get_num() as u32)) { + if let Some(str_idx) = self.istr_opts.iter().position(|el| el.id == (istr.get_num() as u32)) { if self.istr_opts[str_idx].drop { self.encoders.push(OutputMode::Drop); - return true; + return RegisterResult::Ignored; } } - if let Some(str_idx) = self.ostr_opts.iter().position(|str| str.id == out_id) { + if let Some(str_idx) = self.ostr_opts.iter().position(|el| el.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); + out_sm.add_stream((*istr).clone()); 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()); if enc_create.is_none() { println!("encoder '{}' not found", oopts.enc_name.as_str()); - return false; + return RegisterResult::Failed; } let mut encoder = (enc_create.unwrap())(); let forced_out = oopts.enc_params.format != NACodecTypeInfo::None; + let iformat = istr.get_info().get_properties(); if oopts.enc_params.format == NACodecTypeInfo::None { oopts.enc_params.format = istr.get_info().get_properties(); + } else { + match (&iformat, &mut oopts.enc_params.format) { + (NACodecTypeInfo::Video(svinfo), NACodecTypeInfo::Video(ref mut dvinfo)) => { + if dvinfo.width == 0 { + dvinfo.width = svinfo.width; + } + if dvinfo.height == 0 { + dvinfo.height = svinfo.height; + } + }, + (NACodecTypeInfo::Audio(sainfo), NACodecTypeInfo::Audio(ref mut dainfo)) => { + if dainfo.sample_rate == 0 { + dainfo.sample_rate = sainfo.sample_rate; + } + if dainfo.format == SND_NO_FORMAT { + dainfo.format = sainfo.format; + } + if dainfo.channels == 0 { + dainfo.channels = sainfo.channels; + } + if dainfo.block_len == 0 { + dainfo.block_len = sainfo.block_len; + } + }, + _ => {}, + }; + } + if self.global_tb != (0, 0) { + oopts.enc_params.tb_num = self.global_tb.0; + oopts.enc_params.tb_den = self.global_tb.1; } if oopts.enc_params.tb_num == 0 { oopts.enc_params.tb_num = istr.tb_num; @@ -512,12 +600,12 @@ impl Transcoder { let ret_eparams = encoder.negotiate_format(&oopts.enc_params); if ret_eparams.is_err() { println!("cannot negotiate encoding parameters"); - return false; + return RegisterResult::Failed; } let ret_eparams = ret_eparams.unwrap(); //todo check for params mismatch - let cvt = match (&oopts.enc_params.format, &ret_eparams.format) { + let cvt = match (&iformat, &ret_eparams.format) { (NACodecTypeInfo::Video(svinfo), NACodecTypeInfo::Video(dvinfo)) => { if svinfo == dvinfo && !forced_out { OutputConvert::None @@ -526,20 +614,21 @@ impl Transcoder { let ret = NAScale::new_with_options(ofmt, ofmt, &self.scale_opts); if ret.is_err() { println!("cannot create scaler"); - return false; + return RegisterResult::Failed; } let scaler = ret.unwrap(); let ret = alloc_video_buffer(*dvinfo, 4); if ret.is_err() { println!("cannot create scaler buffer"); - return false; + return RegisterResult::Failed; } let cvt_buf = ret.unwrap(); OutputConvert::Video(scaler, cvt_buf) } }, (NACodecTypeInfo::Audio(sainfo), NACodecTypeInfo::Audio(dainfo)) => { - if sainfo == dainfo { + let icodec = istr.get_info().get_name(); + if (sainfo == dainfo) && (icodec != "pcm" || oopts.enc_name.as_str() == "pcm") { OutputConvert::None } else { let dchmap = match dainfo.channels { @@ -547,7 +636,7 @@ impl Transcoder { 2 => NAChannelMap::from_ms_mapping(0x3), _ => { println!("can't generate default channel map for {} channels", dainfo.channels); - return false; + return RegisterResult::Failed; }, }; let acvt = AudioConverter::new(sainfo, dainfo, dchmap); @@ -557,23 +646,29 @@ println!("can't generate default channel map for {} channels", dainfo.channels); }, _ => OutputConvert::None, }; + let name = format!("output stream {}", out_id); + parse_and_apply_options!(encoder, &oopts.enc_opts, name); + + if self.calc_len && self.nframes.len() > iidx { + encoder.set_options(&[NAOption{name: "nframes", value: NAValue::Int(self.nframes[iidx] as i64)}]); + } + let ret = encoder.init(out_id, ret_eparams); if ret.is_err() { println!("error initialising encoder"); - return false; + return RegisterResult::Failed; } out_sm.add_stream_ref(ret.unwrap()); - let name = format!("output stream {}", out_id); parse_and_apply_options!(encoder, &oopts.enc_opts, name); self.encoders.push(OutputMode::Encode(out_id, encoder, cvt)); } else { println!("encoder {} is not supported by output (expected {})", istr.id, istr.get_info().get_name()); - return false; + return RegisterResult::Failed; } } else if cname == "any" || istr.get_info().get_name() == cname { - out_sm.add_stream_ref(istr); + out_sm.add_stream((*istr).clone()); self.encoders.push(OutputMode::Copy(out_id)); } else { let mut oopts = OutputStreamOptions {id: out_id, enc_name: cname.to_owned(), enc_params: EncodeParameters::default(), enc_opts: Vec::new() }; @@ -581,16 +676,21 @@ println!("encoder {} is not supported by output (expected {})", istr.id, istr.ge let enc_create = enc_reg.find_encoder(cname); if enc_create.is_none() { println!("encoder '{}' not found", oopts.enc_name.as_str()); - return false; + return RegisterResult::Failed; } let mut encoder = (enc_create.unwrap())(); oopts.enc_params.format = istr.get_info().get_properties(); - oopts.enc_params.tb_num = istr.tb_num; - oopts.enc_params.tb_den = istr.tb_den; + if self.global_tb != (0, 0) { + oopts.enc_params.tb_num = self.global_tb.0; + oopts.enc_params.tb_den = self.global_tb.1; + } else { + oopts.enc_params.tb_num = istr.tb_num; + oopts.enc_params.tb_den = istr.tb_den; + } let ret_eparams = encoder.negotiate_format(&oopts.enc_params); if ret_eparams.is_err() { println!("cannot negotiate encoding parameters"); - return false; + return RegisterResult::Failed; } let ret_eparams = ret_eparams.unwrap(); @@ -604,13 +704,13 @@ println!("encoder {} is not supported by output (expected {})", istr.id, istr.ge let ret = NAScale::new_with_options(ofmt, ofmt, &self.scale_opts); if ret.is_err() { println!("cannot create scaler"); - return false; + return RegisterResult::Failed; } let scaler = ret.unwrap(); let ret = alloc_video_buffer(*dvinfo, 4); if ret.is_err() { println!("cannot create scaler buffer"); - return false; + return RegisterResult::Failed; } let cvt_buf = ret.unwrap(); OutputConvert::Video(scaler, cvt_buf) @@ -625,7 +725,7 @@ println!("encoder {} is not supported by output (expected {})", istr.id, istr.ge 2 => NAChannelMap::from_ms_mapping(0x3), _ => { println!("can't generate default channel map for {} channels", dainfo.channels); - return false; + return RegisterResult::Failed; }, }; //todo channelmap @@ -638,24 +738,25 @@ println!("can't generate default channel map for {} channels", dainfo.channels); let ret = encoder.init(out_id, ret_eparams); if ret.is_err() { println!("error initialising encoder"); - return false; + return RegisterResult::Failed; } out_sm.add_stream_ref(ret.unwrap()); self.encoders.push(OutputMode::Encode(out_id, encoder, cvt)); self.ostr_opts.push(oopts); } - true + RegisterResult::Ok } fn map_single(&mut self, cname: &str, ctype: StreamType, src_sm: &StreamManager, out_sm: &mut StreamManager, enc_reg: &RegisteredEncoders) -> bool { let mut found_stream = false; - for istr in src_sm.iter() { + for (iidx, istr) in src_sm.iter().enumerate() { if istr.get_media_type() != ctype || found_stream { self.encoders.push(OutputMode::Drop); } else { - if !self.register_output_stream(cname, istr, out_sm, enc_reg) { - return false; - } - found_stream = true; + match self.register_output_stream(cname, istr, iidx, out_sm, enc_reg) { + RegisterResult::Ok => found_stream = true, + RegisterResult::Failed => return false, + RegisterResult::Ignored => {}, + }; } } found_stream @@ -673,17 +774,19 @@ println!("can't generate default channel map for {} channels", dainfo.channels); MuxerCapabilities::SingleVideoAndAudio(vname, aname) => { let mut found_vid = false; let mut found_aud = false; - for istr in src_sm.iter() { + for (iidx, istr) in src_sm.iter().enumerate() { if istr.get_media_type() == StreamType::Video && !found_vid && !self.no_video { - if !self.register_output_stream(vname, istr, out_sm, enc_reg) { - return false; - } - found_vid = true; + match self.register_output_stream(vname, istr, iidx, out_sm, enc_reg) { + RegisterResult::Ok => found_vid = true, + RegisterResult::Failed => return false, + RegisterResult::Ignored => {}, + }; } else if istr.get_media_type() == StreamType::Audio && !found_aud && !self.no_audio { - if !self.register_output_stream(aname, istr, out_sm, enc_reg) { - return false; - } - found_aud = true; + match self.register_output_stream(aname, istr, iidx, out_sm, enc_reg) { + RegisterResult::Ok => found_aud = true, + RegisterResult::Failed => return false, + RegisterResult::Ignored => {}, + }; } else { self.encoders.push(OutputMode::Drop); } @@ -694,12 +797,13 @@ println!("can't generate default channel map for {} channels", dainfo.channels); if self.no_video { return false; } let mut found_vid = false; - for istr in src_sm.iter() { - if istr.get_media_type() == StreamType::Video && !found_vid { - if !self.register_output_stream("any", istr, out_sm, enc_reg) { - return false; - } - found_vid = true; + for (iidx, istr) in src_sm.iter().enumerate() { + if istr.get_media_type() == StreamType::Video { + match self.register_output_stream("any", istr, iidx, out_sm, enc_reg) { + RegisterResult::Ok => found_vid = true, + RegisterResult::Failed => return false, + RegisterResult::Ignored => {}, + }; } else { self.encoders.push(OutputMode::Drop); } @@ -710,12 +814,13 @@ println!("can't generate default channel map for {} channels", dainfo.channels); if self.no_audio { return false; } let mut found_aud = false; - for istr in src_sm.iter() { - if istr.get_media_type() == StreamType::Audio && !found_aud { - if !self.register_output_stream("any", istr, out_sm, enc_reg) { - return false; - } - found_aud = true; + for (iidx, istr) in src_sm.iter().enumerate() { + if istr.get_media_type() == StreamType::Audio { + match self.register_output_stream("any", istr, iidx, out_sm, enc_reg) { + RegisterResult::Ok => found_aud = true, + RegisterResult::Failed => return false, + RegisterResult::Ignored => {}, + }; } else { self.encoders.push(OutputMode::Drop); } @@ -723,13 +828,13 @@ println!("can't generate default channel map for {} channels", dainfo.channels); found_aud }, MuxerCapabilities::Universal => { - for istr in src_sm.iter() { + for (iidx, istr) in src_sm.iter().enumerate() { if (istr.get_media_type() == StreamType::Video && self.no_video) || (istr.get_media_type() == StreamType::Audio && self.no_audio) { self.encoders.push(OutputMode::Drop); continue; } - if !self.register_output_stream("any", istr, out_sm, enc_reg) { + if self.register_output_stream("any", istr, iidx, out_sm, enc_reg) == RegisterResult::Failed { return false; } } @@ -737,6 +842,81 @@ println!("can't generate default channel map for {} channels", dainfo.channels); }, } } + fn create_demuxers(&mut self, demuxers: &mut Vec<(DemuxerObject, bool)>, full_reg: &FullRegister, print_info: bool) -> bool { + let mut isn_start = 0; + for (i, (iname, ifmt)) in self.input_name.iter().zip( + self.input_fmt.iter()).enumerate() { + match (iname, ifmt.as_ref().map(|s| s.as_str())) { + (Some(name), Some("imgseq")) => { + println!("trying image sequence {}", name); + let mut isdc = ImgSeqDemuxerCreator::new(name.as_str()); + parse_and_apply_options!(isdc, &self.demux_opts[i], "input"); + let isd = if let Ok(ctx) = isdc.open() { + ctx + } else { + println!("failed to create image sequence demuxer!"); + return false; + }; + let dmx = DemuxerObject::create_imgseq(isd); + if print_info { + for i in 0..dmx.get_num_streams() { + let s = dmx.get_stream(i).unwrap(); + let info = s.get_info(); + println!(" stream {}({}) - {} {}", i, i + isn_start, s, info.get_name()); + } + } + isn_start += dmx.get_num_streams(); + demuxers.push((dmx, false)) + }, + (Some(name), _) => { + let res = File::open(name); + if res.is_err() { + println!("error opening input"); + return false; + } + let file = res.unwrap(); + let file = BufReader::new(file); + let mut fr = FileReader::new_read(file); + let mut br = ByteReader::new(&mut fr); + let (is_raw, start, end) = if ifmt.is_none() { + detect_tags(&mut br) + } else { + (false, 0, None) + }; + + let nfr: Box = if start != 0 || end.is_some() { + let file = fr.finish(); + Box::new(BoundedFileReader::new_read(file, start, end).unwrap()) + } else { + Box::new(fr) + }; + let sb = SelfBorrow::new(nfr, |rd| { + unsafe { + ByteReader::new(rd.as_mut().unwrap().as_mut()) + } + }); + + let mut dmx = DemuxerObject::create(sb, full_reg, name, ifmt, is_raw, print_info); + if dmx.is_none() { + println!("cannot find demuxer for '{}'", name); + return false; + } + parse_and_apply_options!(dmx, &self.demux_opts[i], "input"); + if print_info { + for i in 0..dmx.get_num_streams() { + let s = dmx.get_stream(i).unwrap(); + let info = s.get_info(); + println!(" stream {}({}) - {} {}", i, i + isn_start, s, info.get_name()); + } + } + isn_start += dmx.get_num_streams(); + demuxers.push((dmx, false)); + }, + _ => {}, + }; + } + true + } } fn encode_frame(dst_id: u32, encoder: &mut Box, cvt: &mut OutputConvert, frm: NAFrameRef, scale_opts: &[(String, String)]) -> bool { @@ -798,6 +978,24 @@ macro_rules! next_arg { } } +macro_rules! parse_id { + ($val: expr, $stype: expr, $maxval: expr) => { + if $val.is_empty() { + 0 + } else if let Ok(val) = $val.parse::() { + if val < $maxval { + val + } else { + println!("{} number should be below {}", $stype, $maxval); + return; + } + } else { + println!("invalid {} number '{}'", $stype, $val); + return; + } + } +} + #[allow(clippy::single_match)] fn main() { let args: Vec<_> = env::args().collect(); @@ -835,6 +1033,7 @@ fn main() { let full_reg = FullRegister::new(); let mut transcoder = Transcoder::new(); + let mut use_video_tb = false; let mut arg_idx = 1; let mut printed_info = false; @@ -935,14 +1134,6 @@ fn main() { } printed_info = true; }, - "--input" | "-i" => { - next_arg!(args, arg_idx); - transcoder.input_name = args[arg_idx].clone(); - }, - "--input-format" => { - next_arg!(args, arg_idx); - transcoder.input_fmt = Some(args[arg_idx].clone()); - }, "--output" | "-o" => { next_arg!(args, arg_idx); transcoder.output_name = args[arg_idx].clone(); @@ -951,13 +1142,6 @@ fn main() { next_arg!(args, arg_idx); transcoder.output_fmt = Some(args[arg_idx].clone()); }, - "--demuxer-options" => { - next_arg!(args, arg_idx); - 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]) { @@ -998,6 +1182,12 @@ fn main() { return; } }, + "--calc-len" => { + transcoder.calc_len = true; + }, + "--use-video-tb" => { + use_video_tb = true; + }, "--verbose" | "-v" => transcoder.verbose = 1, "-vv" => transcoder.verbose = 2, "-v-" => transcoder.verbose = 0, @@ -1016,10 +1206,29 @@ fn main() { println!("invalid output stream option syntax"); return; } + } else if args[arg_idx].starts_with("--input-format") { + let id = parse_id!(&args[arg_idx][14..], "input format", transcoder.input_fmt.len()); + next_arg!(args, arg_idx); + transcoder.input_fmt[id] = Some(args[arg_idx].clone()); + } else if args[arg_idx].starts_with("--input") { // should be after --input-format + let id = parse_id!(&args[arg_idx][7..], "input", transcoder.input_name.len()); + next_arg!(args, arg_idx); + transcoder.input_name[id] = Some(args[arg_idx].clone()); + } else if args[arg_idx].starts_with("-i") { + let id = parse_id!(&args[arg_idx][2..], "input", transcoder.input_name.len()); + next_arg!(args, arg_idx); + transcoder.input_name[id] = Some(args[arg_idx].clone()); + } else if args[arg_idx].starts_with("--demuxer-options") { + let id = parse_id!(&args[arg_idx][17..], "input options", transcoder.demux_opts.len()); + next_arg!(args, arg_idx); + if !transcoder.parse_demuxer_options(&args[arg_idx], &full_reg.dmx_reg, id) { + println!("invalid demuxer option syntax"); + return; + } } else if args[arg_idx].starts_with("--") { - println!("unknown option"); + println!("unknown option '{}'", args[arg_idx]); } else { - println!("unrecognized argument"); + println!("unrecognized argument '{}'", args[arg_idx]); } }, }; @@ -1030,8 +1239,8 @@ fn main() { return; } - if transcoder.input_name.is_empty() { - println!("no input name provided"); + if transcoder.input_name.iter().flatten().count() == 0 { + println!("no input name(s) provided"); return; } if transcoder.output_name.is_empty() { @@ -1039,81 +1248,84 @@ fn main() { return; } - let res = File::open(transcoder.input_name.as_str()); - if res.is_err() { - println!("error opening input"); + let mut demuxers = Vec::with_capacity(1); + if !transcoder.create_demuxers(&mut demuxers, &full_reg, true) { return; } - let file = res.unwrap(); - let file = BufReader::new(file); - let mut fr = FileReader::new_read(file); - let mut br = ByteReader::new(&mut fr); - let (is_raw, start, end) = if transcoder.input_fmt.is_none() { - detect_tags(&mut br) - } else { - (false, 0, None) - }; - - 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 duration = dmx.get_duration(); + let duration = demuxers.iter().fold(0u64, |mindur, (dmx, _)| { + let dur = dmx.get_duration(); + if dur > 0 { + mindur.min(dur) + } else { + mindur + } + }); let duration_string = if duration != 0 { format_time(duration) } else { String::new() }; - 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 = 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 { - let mut dec = (create_dec)(); - let mut dsupp = Box::new(NADecoderSupport::new()); - let ret = dec.init(&mut dsupp, info.clone()); - if ret.is_err() { - println!("Error initialising decoder '{}' for stream {}", info.get_name(), str_id); - return; + let mut ism = StreamManager::new(); + let mut is_offset = Vec::with_capacity(demuxers.len()); + let mut start = 0; + let mut nstreams = 0; + for (dmx, _) in demuxers.iter() { + is_offset.push(nstreams); + let sm = dmx.get_stream_manager(); + let max_id = sm.iter().fold(0u32, |id, strm| id.max(strm.id)); + for stream in sm.iter() { + let mut newstream = (*stream).clone(); + if use_video_tb && transcoder.global_tb == (0, 0) && newstream.get_media_type() == StreamType::Video { + transcoder.global_tb = newstream.get_timebase(); } - transcoder.apply_decoder_options(dec.as_mut(), str_id); - 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); + newstream.id += start; + ism.add_stream(newstream); } + start += max_id + 1; + nstreams += sm.get_num_streams(); } - 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()); + + for (&is_off, (dmx, _)) in is_offset.iter().zip(demuxers.iter_mut()) { + for i in 0..dmx.get_num_streams() { + let s = dmx.get_stream(i).unwrap(); + let info = s.get_info(); + let decfunc = full_reg.dec_reg.find_decoder(info.get_name()); + let str_id = (s.get_num() + is_off) as u32; + if let Some(create_dec) = decfunc { + let mut dec = (create_dec)(); + let mut dsupp = Box::new(NADecoderSupport::new()); + let ret = dec.init(&mut dsupp, info.clone()); + if ret.is_err() { + println!("Error initialising decoder '{}' for stream {}", info.get_name(), str_id); + return; + } + transcoder.apply_decoder_options(dec.as_mut(), str_id); + 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 + let output_fmt = if let Some(ref fmtname) = transcoder.output_fmt { + fmtname } else if transcoder.output_name.as_str() == "/dev/null" { "null" - } else if let Some(str) = detect::detect_format_by_name(transcoder.output_name.as_str()) { - str + } else if let Some(fmtname) = detect::detect_format_by_name(transcoder.output_name.as_str()) { + fmtname } else { println!("Cannot guess muxer for output"); return; @@ -1123,12 +1335,39 @@ println!("stream {} - {} {}", i, s, info.get_name()); if ret.is_none() { println!("cannot find muxer '{}'", output_fmt); + return; } let mux_creator = ret.unwrap(); + if transcoder.calc_len { + let mut sids = Vec::new(); + transcoder.nframes.clear(); + for (dmx, _) in demuxers.iter_mut() { + let sstart = transcoder.nframes.len(); + let sm = dmx.get_stream_manager(); + sids.clear(); + for stream in sm.iter() { + transcoder.nframes.push(0); + sids.push(stream.get_id()); + } + + while let Ok(pkt) = dmx.get_frame() { + let stream = pkt.get_stream(); + let pos = sstart + sids.iter().position(|&x| x == stream.get_id()).unwrap(); + transcoder.nframes[pos] += 1; + } + } + // this is necessary since not all demuxers allow to seek even back to the start + demuxers.clear(); + if !transcoder.create_demuxers(&mut demuxers, &full_reg, false) { + println!("failed to re-create demuxer(s)"); + return; + } + } + 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, &full_reg.enc_reg) { + if !transcoder.negotiate_stream_map(&ism, mux_caps, &mut out_sm, &full_reg.enc_reg) { println!("cannot determine stream map"); return; } @@ -1157,8 +1396,29 @@ println!("stream {} - {} {}", i, s, info.get_name()); let show_interval = Duration::from_millis(100); let mut adata_size = 0; let mut vdata_size = 0; + let mut cur_dmx = 0; 'main_loop: loop { - let pktres = dmx.get_frame(); + let mut pktres = Err(DemuxerError::EOF); + let mut src_dmx = 0; + loop { + if !demuxers.iter().any(|(_, eof)| !eof) { + break; + } + let mut got_res = false; + if !demuxers[cur_dmx].1 { + pktres = demuxers[cur_dmx].0.get_frame(); + got_res = true; + src_dmx = cur_dmx; + } + cur_dmx += 1; + if cur_dmx >= demuxers.len() { + cur_dmx = 0; + } + if got_res { + break; + } + } + if let Err(DemuxerError::EOF) = pktres { break; } if pktres.is_err() { println!("demuxing error"); @@ -1166,7 +1426,11 @@ println!("stream {} - {} {}", i, s, info.get_name()); } 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(); + let src_id = pkt.get_stream().get_num() + is_offset[src_dmx]; + let ts = pkt.ts; + let newstream = ism.get_stream(src_id).unwrap(); + pkt.reassign(newstream, ts); + if transcoder.verbose > 0 && time.elapsed() >= show_interval { if let Some(pts) = pkt.get_pts() { let cur_time = format_time(NATimeInfo::ts_to_time(pts, 1000, pkt.ts.tb_num, pkt.ts.tb_den)); @@ -1249,8 +1513,8 @@ println!("stream {} - {} {}", i, s, info.get_name()); }, }; } - 'reord_flush_loop: for str in dmx.get_streams() { - let src_id = str.get_num(); + 'reord_flush_loop: for stream in ism.iter() { + let src_id = stream.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() {