X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=src%2Fmain.rs;h=a6d464aed1dfdd47f8ef2d133d7fb33ebb04f860;hb=f88b8fb4f64962205372892b782ad0ae09034e9a;hp=0d5082d78162452bf0b74b10c1b501eba76dc574;hpb=7b6dcb1ec809818b7f76fd1d0db7e3df7d85ce48;p=nihav-encoder.git

diff --git a/src/main.rs b/src/main.rs
index 0d5082d..a6d464a 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -121,7 +121,7 @@ impl Transcoder {
                 self.istr_opts.len() - 1
             };
         let istr = &mut self.istr_opts[sidx];
-        
+
         for opt in opt1.split(',') {
             let oval: Vec<_> = opt.split('=').collect();
             if oval.len() == 1 {
@@ -152,7 +152,7 @@ impl Transcoder {
                 self.ostr_opts.len() - 1
             };
         let ostr = &mut self.ostr_opts[sidx];
-        
+
         for opt in opt1.split(',') {
             let oval: Vec<_> = opt.split('=').collect();
             if oval.len() == 1 {
@@ -222,7 +222,21 @@ impl Transcoder {
                             println!("video option for audio stream");
                         }
                     },
-//todo formaton
+                    "pixfmt" => {
+                        if ostr.enc_params.format == NACodecTypeInfo::None {
+                            ostr.enc_params.format = NACodecTypeInfo::Video(NAVideoInfo::new(0, 0, false, YUV420_FORMAT));
+                        }
+                        if let NACodecTypeInfo::Video(ref mut vinfo) = ostr.enc_params.format {
+                            let ret = oval[1].parse::<NAPixelFormaton>();
+                            if let Ok(val) = ret {
+                                vinfo.format = val;
+                            } else {
+                                println!("invalid pixel format");
+                            }
+                        } else {
+                            println!("video option for audio stream");
+                        }
+                    },
                     "srate" => {
                         if ostr.enc_params.format == NACodecTypeInfo::None {
                             ostr.enc_params.format = NACodecTypeInfo::Audio(NAAudioInfo::new(0, 0, SND_S16_FORMAT, 0));
@@ -268,7 +282,37 @@ impl Transcoder {
                             println!("audio option for video stream");
                         }
                     },
-//todo soniton, channel map
+                    "sfmt" => {
+                        if ostr.enc_params.format == NACodecTypeInfo::None {
+                            ostr.enc_params.format = NACodecTypeInfo::Audio(NAAudioInfo::new(0, 0, SND_S16_FORMAT, 0));
+                        }
+                        if let NACodecTypeInfo::Audio(ref mut ainfo) = ostr.enc_params.format {
+                            let ret = oval[1].parse::<NASoniton>();
+                            if let Ok(val) = ret {
+                                ainfo.format = val;
+                            } else {
+                                println!("invalid audio format");
+                            }
+                        } else {
+                            println!("audio option for video stream");
+                        }
+                    },
+// 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));
+                        }
+                        if let NACodecTypeInfo::Audio(ref mut ainfo) = ostr.enc_params.format {
+                            let ret = oval[1].parse::<NAChannelMap>();
+                            if let Ok(val) = ret {
+                                ainfo.chmap = val;
+                            } else {
+                                println!("invalid channel map");
+                            }
+                        } else {
+                            println!("audio option for video stream");
+                        }
+                    },*/
                     "bitrate" => {
                         let ret = oval[1].parse::<u32>();
                         if let Ok(val) = ret {
@@ -366,6 +410,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();
                 }
@@ -383,7 +428,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 };
@@ -670,7 +715,7 @@ fn main() {
                 }
                 printed_info = true;
             },
-            "--input" => {
+            "--input" | "-i" => {
                 next_arg!(args, arg_idx);
                 transcoder.input_name = args[arg_idx].clone();
             },
@@ -678,7 +723,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();
             },
@@ -693,10 +738,10 @@ fn main() {
                     return;
                 }
             },
-            "--no-video" => {
+            "--no-video" | "-vn" => {
                 transcoder.no_video = true;
             },
-            "--no-audio" => {
+            "--no-audio" | "-an" => {
                 transcoder.no_audio = true;
             },
             "--start" => {
@@ -715,7 +760,7 @@ fn main() {
                 if let Ok(val) = ret {
                     transcoder.end = val;
                 } else {
-                    println!("invalid start time");
+                    println!("invalid end time");
                     return;
                 }
             },
@@ -874,6 +919,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 => {},
@@ -889,6 +935,9 @@ 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] {
                     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;