fix or silence clippy warnings
[nihav-encoder.git] / src / main.rs
index 8d5efd377fd67aa680101adeacd4e6ea267caafe..fadb2b9959426332eabe996edd9e43fcb268f001 100644 (file)
@@ -10,6 +10,7 @@ use nihav_core::options::*;
 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;
@@ -55,6 +56,7 @@ enum OutputConvert {
     None,
 }
 
+#[allow(clippy::large_enum_variant)]
 enum OutputMode {
     Drop,
     Copy(u32),
@@ -62,6 +64,7 @@ enum OutputMode {
 }
 
 #[derive(Default)]
+#[allow(clippy::type_complexity)]
 struct Transcoder {
     input_name:     String,
     input_fmt:      Option<String>,
@@ -71,7 +74,7 @@ struct Transcoder {
     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,
@@ -89,11 +92,10 @@ macro_rules! parse_and_apply_options {
                 if opt.name == opt_def.name {
                     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;
                 }
@@ -184,6 +186,23 @@ impl Transcoder {
             } 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();
@@ -381,7 +400,7 @@ impl Transcoder {
         }
         true
     }
-    fn apply_decoder_options(&self, dec: &mut NADecoder, str_id: u32) {
+    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; }
@@ -401,7 +420,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());
@@ -410,6 +429,7 @@ impl Transcoder {
                     return false;
                 }
                 let mut encoder = (enc_create.unwrap())();
+                let forced_out = oopts.enc_params.format != NACodecTypeInfo::None;
                 if oopts.enc_params.format == NACodecTypeInfo::None {
                     oopts.enc_params.format = istr.get_info().get_properties();
                 }
@@ -427,7 +447,7 @@ impl Transcoder {
 //todo check for params mismatch
                 let cvt = match (&oopts.enc_params.format, &ret_eparams.format) {
                         (NACodecTypeInfo::Video(svinfo), NACodecTypeInfo::Video(dvinfo)) => {
-                            if svinfo == dvinfo {
+                            if svinfo == dvinfo && !forced_out {
                                 OutputConvert::None
                             } else {
                                 let ofmt = ScaleInfo { fmt: dvinfo.format, width: dvinfo.width, height: dvinfo.height };
@@ -479,15 +499,13 @@ 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?
-                return false;
-            }
+            return false;
         }
         true
     }
@@ -584,6 +602,43 @@ println!("stream {} ({}) can't be handled", istr.id, istr.get_info().get_name())
     }
 }
 
+fn encode_frame(dst_id: u32, encoder: &mut Box<dyn 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() {
@@ -593,11 +648,35 @@ macro_rules! next_arg {
     }
 }
 
+#[allow(clippy::single_match)]
 fn main() {
     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;
     }
 
@@ -714,7 +793,7 @@ fn main() {
                 }
                 printed_info = true;
             },
-            "--input" => {
+            "--input" | "-i" => {
                 next_arg!(args, arg_idx);
                 transcoder.input_name = args[arg_idx].clone();
             },
@@ -722,7 +801,7 @@ fn main() {
                 next_arg!(args, arg_idx);
                 transcoder.input_fmt = Some(args[arg_idx].clone());
             },
-            "--output" => {
+            "--output" | "-o" => {
                 next_arg!(args, arg_idx);
                 transcoder.output_name = args[arg_idx].clone();
             },
@@ -737,10 +816,10 @@ fn main() {
                     return;
                 }
             },
-            "--no-video" => {
+            "--no-video" | "-vn" => {
                 transcoder.no_video = true;
             },
-            "--no-audio" => {
+            "--no-audio" | "-an" => {
                 transcoder.no_audio = true;
             },
             "--start" => {
@@ -759,7 +838,7 @@ fn main() {
                 if let Ok(val) = ret {
                     transcoder.end = val;
                 } else {
-                    println!("invalid start time");
+                    println!("invalid end time");
                     return;
                 }
             },
@@ -799,11 +878,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;
     }
@@ -819,14 +898,12 @@ fn main() {
 
     let dmx_name = if let Some(ref str) = transcoder.input_fmt {
             str.as_str()
+        } 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 {
-            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;
-            }
+            println!("cannot detect input format");
+            return;
         };
     let ret = dmx_reg.find_demuxer(dmx_name);
     if ret.is_none() {
@@ -852,7 +929,15 @@ println!("stream {} - {} {}", i, s, info.get_name());
                 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);
@@ -867,13 +952,11 @@ 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 ofmt = output_fmt.to_string();
@@ -918,6 +1001,7 @@ println!("stream {} - {} {}", i, s, info.get_name());
             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();
         match transcoder.encoders[src_id] {
             OutputMode::Drop => {},
@@ -931,49 +1015,25 @@ println!("stream {} - {} {}", i, s, info.get_name());
                 }
             },
             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;
+                    }
                     if ret.is_err() {
                         println!("error decoding stream {}", src_id);
                         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);
@@ -982,6 +1042,22 @@ println!("stream {} - {} {}", i, s, info.get_name());
             },
         };
     }
+    '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, _) => {