X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=src%2Fmain.rs;h=191a8a6133c2d24175464ebc88995a6ba75ab317;hb=4dd9047c4ba7e1ee7f1e163e0c551d318497d6db;hp=6b9086f08913a4a15023ffcdb51fb31342c7185c;hpb=071d353e57497f0955fa592fa5866be80a8c4386;p=nihav-encoder.git

diff --git a/src/main.rs b/src/main.rs
index 6b9086f..191a8a6 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -4,6 +4,7 @@ extern crate nihav_registry;
 extern crate nihav_allstuff;
 
 use std::fs::File;
+use std::io::{BufReader, Write};
 use nihav_core::io::byteio::{FileReader, ByteReader};
 use nihav_core::frame::*;
 use nihav_core::options::*;
@@ -15,11 +16,28 @@ use nihav_core::scale::*;
 use nihav_core::soundcvt::*;
 use nihav_registry::detect;
 use nihav_registry::register;
-use nihav_allstuff::*;
 use std::env;
+use std::time::{Duration, Instant};
 
+mod demux;
+use crate::demux::*;
 mod null;
-use crate::null::*;
+
+fn format_time(ms: u64) -> String {
+    let s = ms / 1000;
+    let ds = (ms % 1000) / 100;
+    let (min, s) = (s / 60, s % 60);
+    let (h, min) = (min / 60, min % 60);
+    if h == 0 {
+        if min == 0 {
+            format!("{}.{}", s, ds)
+        } else {
+            format!("{}:{:02}.{}", min, s, ds)
+        }
+    } else {
+        format!("{}:{:02}:{:02}.{}", h, min, s, ds)
+    }
+}
 
 fn print_options(name: &str, options: &[NAOptionDefinition]) {
     if options.is_empty() {
@@ -56,6 +74,7 @@ enum OutputConvert {
     None,
 }
 
+#[allow(clippy::large_enum_variant)]
 enum OutputMode {
     Drop,
     Copy(u32),
@@ -63,6 +82,7 @@ enum OutputMode {
 }
 
 #[derive(Default)]
+#[allow(clippy::type_complexity)]
 struct Transcoder {
     input_name:     String,
     input_fmt:      Option<String>,
@@ -72,12 +92,14 @@ struct Transcoder {
     mux_opts:       Vec<OptionArgs>,
     istr_opts:      Vec<InputStreamOptions>,
     ostr_opts:      Vec<OutputStreamOptions>,
+    scale_opts:     Vec<(String, String)>,
     decoders:       Vec<Option<(Box<NADecoderSupport>, Box<dyn NADecoder>, Box<dyn FrameReorderer>)>>,
     encoders:       Vec<OutputMode>,
     no_video:       bool,
     no_audio:       bool,
     start:          NATimePoint,
     end:            NATimePoint,
+    verbose:        bool,
 }
 
 macro_rules! parse_and_apply_options {
@@ -87,14 +109,18 @@ macro_rules! parse_and_apply_options {
         for opt in $in_opts.iter() {
             let mut found = false;
             for opt_def in opt_def.iter() {
-                if opt.name == opt_def.name {
+                let mut matches = opt.name == opt_def.name;
+                if !matches && opt.name.starts_with("no") {
+                    let (_, name) = opt.name.split_at(2);
+                    matches = name == opt_def.name;
+                }
+                if matches {
                     let arg = if let Some(ref str) = opt.value { Some(str) } else { None };
                     let ret = opt_def.parse(&opt.name, arg);
-                    if ret.is_err() {
-                        println!("invalid option {} for {}", opt.name, $name);
-                    } else {
-                        let (val, _) = ret.unwrap();
+                    if let Ok((val, _)) = ret {
                         opts.push(val);
+                    } else {
+                        println!("invalid option {} for {}", opt.name, $name);
                     }
                     found = true;
                 }
@@ -399,7 +425,21 @@ impl Transcoder {
         }
         true
     }
-    fn apply_decoder_options(&self, dec: &mut NADecoder, str_id: u32) {
+    fn parse_scale_options(&mut self, opts: &str) -> bool {
+        for opt in opts.split(',') {
+            let oval: Vec<_> = opt.split('=').collect();
+            if oval.len() == 1 {
+                self.scale_opts.push((oval[0].to_string(), "".to_string()));
+            } else if oval.len() == 2 {
+                self.scale_opts.push((oval[0].to_string(), oval[1].to_string()));
+            } else {
+                println!("unrecognized option '{}'", opt);
+                return false;
+            }
+        }
+        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) {
             let dec_opts = dec.get_supported_options();
             if dec_opts.is_empty() { return; }
@@ -419,7 +459,7 @@ impl Transcoder {
         if let Some(str_idx) = self.ostr_opts.iter().position(|str| str.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.clone());
+                out_sm.add_stream_ref(istr);
                 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());
@@ -450,7 +490,7 @@ impl Transcoder {
                                 OutputConvert::None
                             } else {
                                 let ofmt = ScaleInfo { fmt: dvinfo.format, width: dvinfo.width, height: dvinfo.height };
-                                let ret = NAScale::new(ofmt, ofmt);
+                                let ret = NAScale::new_with_options(ofmt, ofmt, &self.scale_opts);
                                 if ret.is_err() {
                                     println!("cannot create scaler");
                                     return false;
@@ -498,15 +538,76 @@ println!("can't generate default channel map for {} channels", dainfo.channels);
 println!("encoder {} is not supported by output (expected {})", istr.id, istr.get_info().get_name());
                 return false;
             }
+        } else if cname == "any" || istr.get_info().get_name() == cname {
+            out_sm.add_stream_ref(istr);
+            self.encoders.push(OutputMode::Copy(out_id));
         } else {
-            if cname == "any" || istr.get_info().get_name() == cname {
-                out_sm.add_stream_ref(istr.clone());
-                self.encoders.push(OutputMode::Copy(out_id));
-            } else {
-println!("stream {} ({}) can't be handled", istr.id, istr.get_info().get_name());
-// todo autoselect encoder?
+            let mut oopts = OutputStreamOptions {id: out_id, enc_name: cname.to_owned(), enc_params: EncodeParameters::default(), enc_opts: Vec::new() };
+
+            let enc_create = enc_reg.find_encoder(cname);
+            if enc_create.is_none() {
+                println!("encoder '{}' not found", oopts.enc_name.as_str());
                 return false;
             }
+            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;
+            let ret_eparams = encoder.negotiate_format(&oopts.enc_params);
+            if ret_eparams.is_err() {
+                println!("cannot negotiate encoding parameters");
+                return false;
+            }
+            let ret_eparams = ret_eparams.unwrap();
+
+//todo check for params mismatch
+            let cvt = match (&oopts.enc_params.format, &ret_eparams.format) {
+                    (NACodecTypeInfo::Video(svinfo), NACodecTypeInfo::Video(dvinfo)) => {
+                        if svinfo == dvinfo {
+                            OutputConvert::None
+                        } else {
+                            let ofmt = ScaleInfo { fmt: dvinfo.format, width: dvinfo.width, height: dvinfo.height };
+                            let ret = NAScale::new_with_options(ofmt, ofmt, &self.scale_opts);
+                            if ret.is_err() {
+                                println!("cannot create scaler");
+                                return false;
+                            }
+                            let scaler = ret.unwrap();
+                            let ret = alloc_video_buffer(*dvinfo, 4);
+                            if ret.is_err() {
+                                println!("cannot create scaler buffer");
+                                return false;
+                            }
+                            let cvt_buf = ret.unwrap();
+                            OutputConvert::Video(scaler, cvt_buf)
+                        }
+                    },
+                    (NACodecTypeInfo::Audio(sainfo), NACodecTypeInfo::Audio(dainfo)) => {
+                        if sainfo == dainfo {
+                            OutputConvert::None
+                        } else {
+                            let dchmap = match dainfo.channels {
+                                    1 => NAChannelMap::from_ms_mapping(0x4),
+                                    2 => NAChannelMap::from_ms_mapping(0x3),
+                                    _ => {
+println!("can't generate default channel map for {} channels", dainfo.channels);
+                                        return false;
+                                    },
+                                };
+//todo channelmap
+                            OutputConvert::Audio(*dainfo, dchmap)
+                        }
+                    },
+                    _ => OutputConvert::None,
+                };
+            let ret = encoder.init(out_id, ret_eparams);
+            if ret.is_err() {
+                println!("error initialising encoder");
+                return false;
+            }
+            out_sm.add_stream_ref(ret.unwrap());
+            self.encoders.push(OutputMode::Encode(out_id, encoder, cvt));
+            self.ostr_opts.push(oopts);
         }
         true
     }
@@ -603,7 +704,7 @@ println!("stream {} ({}) can't be handled", istr.id, istr.get_info().get_name())
     }
 }
 
-fn encode_frame(dst_id: u32, encoder: &mut Box<NAEncoder>, cvt: &mut OutputConvert, frm: NAFrameRef) -> bool {
+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 = match cvt {
             OutputConvert::None => buf,
@@ -612,7 +713,7 @@ fn encode_frame(dst_id: u32, encoder: &mut Box<NAEncoder>, cvt: &mut OutputConve
                 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);
+                    let ret = NAScale::new_with_options(cur_ifmt, ofmt, scale_opts);
                     if ret.is_err() {
                         println!("error re-initialising scaler for {} -> {}", cur_ifmt, ofmt);
                         return false;
@@ -649,6 +750,7 @@ macro_rules! next_arg {
     }
 }
 
+#[allow(clippy::single_match)]
 fn main() {
     let args: Vec<_> = env::args().collect();
 
@@ -663,9 +765,11 @@ fn main() {
         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!("  --verbose                   - show time for the currently processed input");
         println!("  --input inputfile           - set input file");
         println!("  --input-format fmt          - force input format");
         println!("  --demuxer-options options   - set input demuxer options");
+        println!("  --scale-options options     - set scaler options");
         println!("  --output outputfile         - set output file");
         println!("  --output-format fmt         - force output format");
         println!("  --muxer-options options     - set output muxer options");
@@ -680,17 +784,7 @@ fn main() {
         return;
     }
 
-    let mut dmx_reg = RegisteredDemuxers::new();
-    nihav_register_all_demuxers(&mut dmx_reg);
-    let mut dec_reg = RegisteredDecoders::new();
-    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 full_reg = FullRegister::new();
 
     let mut transcoder = Transcoder::new();
 
@@ -699,9 +793,9 @@ fn main() {
     while arg_idx < args.len() {
         match args[arg_idx].as_str() {
             "--list-decoders" => {
-                if dec_reg.iter().len() > 0 {
+                if full_reg.dec_reg.iter().len() > 0 {
                     println!("Registered decoders:");
-                    for dec in dec_reg.iter() {
+                    for dec in full_reg.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);
@@ -712,9 +806,9 @@ fn main() {
                 printed_info = true;
             },
             "--list-encoders" => {
-                if enc_reg.iter().len() > 0 {
+                if full_reg.enc_reg.iter().len() > 0 {
                     println!("Registered encoders:");
-                    for enc in enc_reg.iter() {
+                    for enc in full_reg.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);
@@ -726,7 +820,7 @@ fn main() {
             },
             "--list-demuxers" => {
                 print!("Registered demuxers:");
-                for dmx in dmx_reg.iter() {
+                for dmx in full_reg.dmx_reg.iter() {
                     print!(" {}", dmx.get_name());
                 }
                 println!();
@@ -734,7 +828,7 @@ fn main() {
             },
             "--list-muxers" => {
                 print!("Registered muxers:");
-                for mux in mux_reg.iter() {
+                for mux in full_reg.mux_reg.iter() {
                     print!(" {}", mux.get_name());
                 }
                 println!();
@@ -743,7 +837,7 @@ fn main() {
             "--query-decoder-options" => {
                 next_arg!(args, arg_idx);
                 let cname = args[arg_idx].as_str();
-                if let Some(decfunc) = dec_reg.find_decoder(cname) {
+                if let Some(decfunc) = full_reg.dec_reg.find_decoder(cname) {
                     let dec = (decfunc)();
                     let opts = dec.get_supported_options();
                     print_options(cname, opts);
@@ -757,7 +851,7 @@ fn main() {
                 let dname = args[arg_idx].as_str();
                 let mut mr = MemoryReader::new_read(&[]);
                 let mut br = ByteReader::new(&mut mr);
-                if let Some(dmx_creator) = dmx_reg.find_demuxer(dname) {
+                if let Some(dmx_creator) = full_reg.dmx_reg.find_demuxer(dname) {
                     let dmx = dmx_creator.new_demuxer(&mut br);
                     let opts = dmx.get_supported_options();
                     print_options(dname, opts);
@@ -769,7 +863,7 @@ fn main() {
             "--query-encoder-options" => {
                 next_arg!(args, arg_idx);
                 let cname = args[arg_idx].as_str();
-                if let Some(encfunc) = enc_reg.find_encoder(cname) {
+                if let Some(encfunc) = full_reg.enc_reg.find_encoder(cname) {
                     let enc = (encfunc)();
                     let opts = enc.get_supported_options();
                     print_options(cname, opts);
@@ -784,7 +878,7 @@ fn main() {
                 let mut data = [];
                 let mut mw = MemoryWriter::new_write(&mut data);
                 let mut bw = ByteWriter::new(&mut mw);
-                if let Some(mux_creator) = mux_reg.find_muxer(name) {
+                if let Some(mux_creator) = full_reg.mux_reg.find_muxer(name) {
                     let mux = mux_creator.new_muxer(&mut bw);
                     let opts = mux.get_supported_options();
                     print_options(name, opts);
@@ -811,11 +905,18 @@ fn main() {
             },
             "--demuxer-options" => {
                 next_arg!(args, arg_idx);
-                if !transcoder.parse_demuxer_options(&args[arg_idx], &dmx_reg) {
+                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]) {
+                    println!("invalid scale option syntax");
+                    return;
+                }
+            },
             "--no-video" | "-vn" => {
                 transcoder.no_video = true;
             },
@@ -844,11 +945,12 @@ fn main() {
             },
             "--muxer-options" => {
                 next_arg!(args, arg_idx);
-                if !transcoder.parse_muxer_options(&args[arg_idx], &mux_reg) {
+                if !transcoder.parse_muxer_options(&args[arg_idx], &full_reg.mux_reg) {
                     println!("invalid muxer option syntax");
                     return;
                 }
             },
+            "--verbose" | "-v" => transcoder.verbose = true,
             _ => {
                 if args[arg_idx].starts_with("--istream") {
                     let opt0 = &args[arg_idx];
@@ -860,7 +962,7 @@ fn main() {
                 } else if args[arg_idx].starts_with("--ostream") {
                     let opt0 = &args[arg_idx];
                     next_arg!(args, arg_idx);
-                    if !transcoder.parse_ostream_options(opt0, &args[arg_idx], &enc_reg) {
+                    if !transcoder.parse_ostream_options(opt0, &args[arg_idx], &full_reg.enc_reg) {
                         println!("invalid output stream option syntax");
                         return;
                     }
@@ -878,11 +980,11 @@ fn main() {
         return;
     }
 
-    if transcoder.input_name.len() == 0 {
+    if transcoder.input_name.is_empty() {
         println!("no input name provided");
         return;
     }
-    if transcoder.output_name.len() == 0 {
+    if transcoder.output_name.is_empty() {
         println!("no output name provided");
         return;
     }
@@ -892,34 +994,38 @@ fn main() {
         println!("error opening input");
         return;
     }
-    let mut file = res.unwrap();
-    let mut fr = FileReader::new_read(&mut file);
+    let file = res.unwrap();
+    let file = BufReader::new(file);
+    let mut fr = FileReader::new_read(file);
     let mut br = ByteReader::new(&mut fr);
-
-    let dmx_name = if let Some(ref str) = transcoder.input_fmt {
-            str.as_str()
+    let (is_raw, start, end) = if transcoder.input_fmt.is_none() {
+            detect_tags(&mut br)
         } else {
-            if let Some((dmx_name, score)) = detect::detect_format(transcoder.input_name.as_str(), &mut br) {
-                println!("detected {} with score {:?}", dmx_name, score);
-                dmx_name
-            } else {
-                println!("cannot detect input format");
-                return;
-            }
+            (false, 0, None)
         };
-    let ret = dmx_reg.find_demuxer(dmx_name);
-    if ret.is_none() {
-        println!("cannot find demuxer for '{}'", dmx_name);
+
+    let mut nfr: Box<dyn ByteIO>;
+    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 dmx_fact = ret.unwrap();
-    br.seek(SeekFrom::Start(0)).unwrap();
-    let mut dmx = create_demuxer(dmx_fact, &mut br).unwrap();
+    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();
-        let decfunc = dec_reg.find_decoder(info.get_name());
+        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 {
@@ -954,15 +1060,13 @@ 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
         } else {
-            if let Some(str) = detect::detect_format_by_name(transcoder.output_name.as_str()) {
-                str
-            } else {
-                println!("Cannot guess muxer for output");
-                return;
-            }
+            println!("Cannot guess muxer for output");
+            return;
         };
-    let ret = mux_reg.find_muxer(output_fmt);
+    let ret = full_reg.mux_reg.find_muxer(output_fmt);
     let ofmt = output_fmt.to_string();
 
     if ret.is_none() {
@@ -972,7 +1076,7 @@ println!("stream {} - {} {}", i, s, info.get_name());
 
     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, &enc_reg) {
+    if !transcoder.negotiate_stream_map(dmx.get_stream_manager(), mux_caps, &mut out_sm, &full_reg.enc_reg) {
         println!("cannot determine stream map");
         return;
     }
@@ -997,6 +1101,8 @@ println!("stream {} - {} {}", i, s, info.get_name());
         println!(" #{}: {} {}", ostr.get_num(), ostr, ostr.get_info().get_name());
     }
 
+    let mut time = Instant::now();
+    let show_interval = Duration::from_millis(100);
     'main_loop: loop {
         let pktres = dmx.get_frame();
         if let Err(DemuxerError::EOF) = pktres { break; }
@@ -1007,6 +1113,20 @@ 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();
+        if transcoder.verbose && 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);
+            } else {
+                print!(" ???");
+            }
+            if !duration_string.is_empty() {
+                print!(" / {}", duration_string);
+            }
+            print!("\r");
+            std::io::stdout().flush().unwrap();
+            time = Instant::now();
+        }
         match transcoder.encoders[src_id] {
             OutputMode::Drop => {},
             OutputMode::Copy(dst_id) => {
@@ -1031,7 +1151,7 @@ println!("stream {} - {} {}", i, s, info.get_name());
                     let frm = ret.unwrap();
                     reorderer.add_frame(frm);
                     while let Some(frm) = reorderer.get_frame() {
-                        if !encode_frame(dst_id, encoder, cvt, frm) {
+                        if !encode_frame(dst_id, encoder, cvt, frm, &transcoder.scale_opts) {
                             break;
                         }
                         while let Ok(Some(pkt)) = encoder.get_packet() {
@@ -1051,7 +1171,7 @@ println!("stream {} - {} {}", i, s, info.get_name());
         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) {
+                    if !encode_frame(dst_id, encoder, cvt, frm, &transcoder.scale_opts) {
                         break;
                     }
                     while let Ok(Some(pkt)) = encoder.get_packet() {
@@ -1081,6 +1201,9 @@ println!("stream {} - {} {}", i, s, info.get_name());
             _ => {},
         };
     }
+    if transcoder.verbose {
+        println!();
+    }
 
     let ret = mux.end();
     if ret.is_err() {