djsundog/ffplayout
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
jb-alvarado 2022-05-30 22:05:17 +02:00
parent 757077f03c
commit 3281c42298
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/output/stream.rs
View File

@ -18,7 +18,6 @@ pub fn output(config: &GlobalConfig, log_format: &str) -> process::Child {
let mut output_count = 1; let mut output_count = 1;
let mut output_v_map = "[v_out1]".to_string(); let mut output_v_map = "[v_out1]".to_string();
let mut output_params = output_cmd.clone(); let mut output_params = output_cmd.clone();
let mut filter = String::new();
let mut enc_cmd = vec_strings![ let mut enc_cmd = vec_strings![
"-hide_banner", "-hide_banner",
@ -36,7 +35,8 @@ pub fn output(config: &GlobalConfig, log_format: &str) -> process::Child {
config.text.bind_address config.text.bind_address
); );
filter.push_str("[0:v]null,"); let mut filter = "[0:v]null,".to_string();
filter.push_str( filter.push_str(
v_drawtext::filter_node(config, &mut Media::new(0, String::new(), false)).as_str(), v_drawtext::filter_node(config, &mut Media::new(0, String::new(), false)).as_str(),
); );
@ -82,8 +82,6 @@ pub fn output(config: &GlobalConfig, log_format: &str) -> process::Child {
filter.push_str(format!("split={output_count}{output_v_map}").as_str()); filter.push_str(format!("split={output_count}{output_v_map}").as_str());
println!("{}", output_params[0]);
if preview.is_empty() { if preview.is_empty() {
output_params.insert(0, "-map".to_string()); output_params.insert(0, "-map".to_string());
output_params.insert(1, "[v_out1]".to_string()); output_params.insert(1, "[v_out1]".to_string());
@ -92,9 +90,7 @@ pub fn output(config: &GlobalConfig, log_format: &str) -> process::Child {
} }
} }
if !filter.is_empty() {
enc_filter = vec!["-filter_complex".to_string(), filter]; enc_filter = vec!["-filter_complex".to_string(), filter];
}
} else if config.out.preview { } else if config.out.preview {
preview = preview_cmd; preview = preview_cmd;
} }