whitespace fix

[nihav-encoder.git] / src / main.rs

diff --git a/src/main.rs b/src/main.rs
index 1958bedc7ac40d31be12bf095721d11461958be0..97be1e2ea36367b6b833a1b61f5134cc5a5619da 100644 (file)
--- a/src/main.rs
+++ b/src/main.rs
@@ -23,6 +23,10 @@ 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;
@@ -316,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::<u32>();
@@ -331,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::<u8>();
@@ -346,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::<usize>();
@@ -361,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::<NASoniton>();
@@ -377,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::<NAChannelMap>();
@@ -502,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;
@@ -517,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
@@ -1039,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");
@@ -1068,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();