X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=src%2Fmain.rs;h=97be1e2ea36367b6b833a1b61f5134cc5a5619da;hb=60dc08af39f51c44bff95b106337c60191912197;hp=a2889a86b6ab7df77251d3f9bf2f8aa5ba9d54c7;hpb=30611a63a7e339e63f05acb263a41307255040f1;p=nihav-encoder.git diff --git a/src/main.rs b/src/main.rs index a2889a8..97be1e2 100644 --- a/src/main.rs +++ b/src/main.rs @@ -13,7 +13,6 @@ 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 std::env; @@ -22,6 +21,12 @@ use std::time::{Duration, Instant}; mod demux; use crate::demux::*; mod null; +mod acvt; +use crate::acvt::*; +mod imgseq; +use crate::imgseq::*; + +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; @@ -102,7 +107,7 @@ struct OutputStreamOptions { enum OutputConvert { Video(NAScale, NABufferType), - Audio(NAAudioInfo, NAChannelMap), + Audio(AudioConverter), None, } @@ -147,7 +152,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); @@ -173,7 +178,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() }); @@ -204,7 +209,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() }); @@ -315,7 +320,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::(); @@ -330,7 +335,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::(); @@ -345,7 +350,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::(); @@ -360,7 +365,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::(); @@ -376,7 +381,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::(); @@ -472,7 +477,7 @@ 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); @@ -481,14 +486,14 @@ impl Transcoder { } fn register_output_stream(&mut self, cname: &str, istr: NAStreamRef, out_sm: &mut StreamManager, enc_reg: &RegisteredEncoders) -> bool { 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; } } - 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); @@ -501,8 +506,35 @@ impl Transcoder { } 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 oopts.enc_params.tb_num == 0 { oopts.enc_params.tb_num = istr.tb_num; @@ -516,7 +548,7 @@ impl Transcoder { 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 @@ -549,8 +581,9 @@ println!("can't generate default channel map for {} channels", dainfo.channels); return false; }, }; + let acvt = AudioConverter::new(sainfo, dainfo, dchmap); //todo channelmap - OutputConvert::Audio(*dainfo, dchmap) + OutputConvert::Audio(acvt) } }, _ => OutputConvert::None, @@ -627,7 +660,8 @@ println!("can't generate default channel map for {} channels", dainfo.channels); }, }; //todo channelmap - OutputConvert::Audio(*dainfo, dchmap) + let acvt = AudioConverter::new(sainfo, dainfo, dchmap); + OutputConvert::Audio(acvt) } }, _ => OutputConvert::None, @@ -740,10 +774,16 @@ fn encode_frame(dst_id: u32, encoder: &mut Box, cvt: &mut OutputC let buf = frm.get_buffer(); let cbuf = if let NABufferType::None = buf { if (encoder.get_capabilities() & ENC_CAPS_SKIPFRAME) == 0 { - println!("encoder does not support skip frames, skipping"); - return true; + match cvt { + OutputConvert::Video(_, ref mut dbuf) => dbuf.clone(), + _ => { + println!("encoder does not support skip frames, skipping"); + return true; + }, + } + } else { + buf } - buf } else { match cvt { OutputConvert::None => buf, @@ -766,13 +806,12 @@ fn encode_frame(dst_id: u32, encoder: &mut Box, cvt: &mut OutputC } dbuf.clone() }, - OutputConvert::Audio(ref dinfo, ref dchmap) => { - let ret = convert_audio_frame(&buf, dinfo, dchmap); - if ret.is_err() { + OutputConvert::Audio(ref mut acvt) => { + if !acvt.queue_frame(buf, frm.get_time_information()) { println!("error converting audio for stream {}", dst_id); return false; } - ret.unwrap() + return true; }, } }; @@ -1031,6 +1070,20 @@ fn main() { return; } + if let Some("imgseq") = transcoder.input_fmt.as_deref() { + let mut isdc = ImgSeqDemuxerCreator::new(transcoder.input_name.as_str()); + parse_and_apply_options!(isdc, &transcoder.demux_opts, "input"); + let isd = if let Ok(ctx) = isdc.open() { + ctx + } else { + println!("failed to create image sequence demuxer!"); + return; + }; + let mut dmx = DemuxerObject::create_imgseq(isd); + transcode(transcoder, full_reg, &mut dmx); + return; + } + let res = File::open(transcoder.input_name.as_str()); if res.is_err() { println!("error opening input"); @@ -1060,10 +1113,14 @@ fn main() { println!("cannot find demuxer for '{}'", transcoder.input_name.as_str()); return; } + parse_and_apply_options!(dmx, &transcoder.demux_opts, "input"); + transcode(transcoder, full_reg, &mut dmx); +} + +fn transcode(mut transcoder: Transcoder, full_reg: FullRegister, dmx: &mut DemuxerObject) { let duration = dmx.get_duration(); 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(); @@ -1100,10 +1157,12 @@ 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 + 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(fmtname) = detect::detect_format_by_name(transcoder.output_name.as_str()) { + fmtname } else { println!("Cannot guess muxer for output"); return; @@ -1202,6 +1261,7 @@ println!("stream {} - {} {}", i, s, info.get_name()); break; } let frm = ret.unwrap(); + let tinfo = frm.get_info(); reorderer.add_frame(frm); while let Some(frm) = reorderer.get_frame() { if !encode_frame(dst_id, encoder, cvt, frm, &transcoder.scale_opts) { @@ -1218,6 +1278,19 @@ println!("stream {} - {} {}", i, s, info.get_name()); mux.mux_frame(pkt).unwrap(); } } + if let OutputConvert::Audio(ref mut acvt) = cvt { + while let Some(ofrm) = acvt.get_frame(tinfo.clone()) { + if encoder.encode(&ofrm).is_err() { + break; + } + while let Ok(Some(pkt)) = encoder.get_packet() { + if transcoder.end != NATimePoint::None && !pkt.ts.less_than(transcoder.end) { break 'main_loop; } + let pkt_size = pkt.get_buffer().len(); + adata_size += pkt_size; + mux.mux_frame(pkt).unwrap(); + } + } + } } else { println!("no decoder for stream {}", src_id); break; @@ -1225,8 +1298,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 dmx.get_streams() { + 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() {