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;
mod demux;
use crate::demux::*;
mod null;
+mod acvt;
+use crate::acvt::*;
fn format_time(ms: u64) -> String {
let s = ms / 1000;
}
}
+fn parse_bitrate(strval: &str) -> Result<u32, ()> {
+ let mut val = 0;
+ let mut has_suffix = false;
+ for ch in strval.chars() {
+ match ch {
+ _ if has_suffix => return Err(()),
+ '0'..='9' => {
+ if val >= std::u32::MAX / 100 {
+ return Err(());
+ }
+ val = val * 10 + ch.to_digit(10).unwrap_or(0);
+ },
+ 'k' | 'K' => {
+ if val >= std::u32::MAX / 1000 {
+ return Err(());
+ }
+ val *= 1000;
+ has_suffix = true;
+ },
+ 'm' | 'M' => {
+ if val >= std::u32::MAX / 1000000 {
+ return Err(());
+ }
+ val *= 1000000;
+ has_suffix = true;
+ },
+ _ => return Err(()),
+ };
+ }
+ Ok(val)
+}
+
struct OptionArgs {
name: String,
value: Option<String>,
enum OutputConvert {
Video(NAScale, NABufferType),
- Audio(NAAudioInfo, NAChannelMap),
+ Audio(AudioConverter),
None,
}
no_audio: bool,
start: NATimePoint,
end: NATimePoint,
- verbose: bool,
+ verbose: u8,
}
macro_rules! parse_and_apply_options {
}
},*/
"bitrate" => {
- let ret = oval[1].parse::<u32>();
+ let ret = parse_bitrate(oval[1]);
if let Ok(val) = ret {
ostr.enc_params.bitrate = val;
} else {
return false;
},
};
+ let acvt = AudioConverter::new(sainfo, dainfo, dchmap);
//todo channelmap
- OutputConvert::Audio(*dainfo, dchmap)
+ OutputConvert::Audio(acvt)
}
},
_ => OutputConvert::None,
},
};
//todo channelmap
- OutputConvert::Audio(*dainfo, dchmap)
+ let acvt = AudioConverter::new(sainfo, dainfo, dchmap);
+ OutputConvert::Audio(acvt)
}
},
_ => OutputConvert::None,
fn encode_frame(dst_id: u32, encoder: &mut Box<dyn NAEncoder>, cvt: &mut OutputConvert, frm: NAFrameRef, scale_opts: &[(String, String)]) -> bool {
let buf = frm.get_buffer();
let cbuf = if let NABufferType::None = buf {
- buf
+ if (encoder.get_capabilities() & ENC_CAPS_SKIPFRAME) == 0 {
+ match cvt {
+ OutputConvert::Video(_, ref mut dbuf) => dbuf.clone(),
+ _ => {
+ println!("encoder does not support skip frames, skipping");
+ return true;
+ },
+ }
+ } else {
+ buf
+ }
} else {
match cvt {
OutputConvert::None => buf,
}
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;
},
}
};
return;
}
},
- "--verbose" | "-v" => transcoder.verbose = true,
+ "--verbose" | "-v" => transcoder.verbose = 1,
+ "-vv" => transcoder.verbose = 2,
+ "-v-" => transcoder.verbose = 0,
_ => {
if args[arg_idx].starts_with("--istream") {
let opt0 = &args[arg_idx];
let output_fmt = if let Some(ref str) = transcoder.output_fmt {
str
+ } 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 {
let mut time = Instant::now();
let show_interval = Duration::from_millis(100);
+ let mut adata_size = 0;
+ let mut vdata_size = 0;
'main_loop: loop {
let pktres = dmx.get_frame();
if let Err(DemuxerError::EOF) = pktres { 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();
- if transcoder.verbose && time.elapsed() >= show_interval {
+ 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));
print!(" {}", cur_time);
if !duration_string.is_empty() {
print!(" / {}", duration_string);
}
+ if transcoder.verbose > 1 {
+ print!(" data sizes V: {} A: {}", vdata_size, adata_size);
+ }
print!("\r");
std::io::stdout().flush().unwrap();
time = Instant::now();
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; }
+ let pkt_size = pkt.get_buffer().len();
+ match pkt.get_stream().get_media_type() {
+ StreamType::Video => { vdata_size += pkt_size; },
+ StreamType::Audio => { adata_size += pkt_size; },
+ _ => {},
+ };
if mux.mux_frame(pkt).is_err() {
println!("error muxing packet");
break;
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) {
}
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();
+ match pkt.get_stream().get_media_type() {
+ StreamType::Video => { vdata_size += pkt_size; },
+ StreamType::Audio => { adata_size += pkt_size; },
+ _ => {},
+ };
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;
_ => {},
};
}
- if transcoder.verbose {
+ if transcoder.verbose > 0 {
println!();
}
projects / nihav-encoder.git / blobdiff