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

simplify strings

Browse Source
This commit is contained in:
jb-alvarado 2022-10-04 16:53:27 +02:00
parent b0d85e067c
commit 818c8741f3
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/src/utils/mod.rs
View File

@ -589,33 +589,33 @@ pub fn prepare_output_cmd(
output_count += 1; output_count += 1;
let mut a_map = "0:a".to_string(); let mut a_map = "0:a".to_string();
let v_map = format!("[v_out{output_count}]"); let v_map = format!("[v_out{output_count}]");
output_v_map.push_str(v_map.as_str()); output_v_map.push_str(&v_map);
if mode == "hls" { if mode == "hls" {
a_map = format!("[a_out{output_count}]"); a_map = format!("[a_out{output_count}]");
} }
output_a_map.push_str(a_map.as_str()); output_a_map.push_str(&a_map);
let mut map = vec!["-map".to_string(), v_map, "-map".to_string(), a_map]; let mut map = vec_strings!["-map", v_map, "-map", a_map];
output_params.append(&mut map); output_params.append(&mut map);
} }
} }
if output_count > 1 && mode == "hls" { if output_count > 1 && mode == "hls" {
filter[1].push_str(format!(";[vout0]split={output_count}{output_v_map}").as_str()); filter[1].push_str(&format!(";[vout0]split={output_count}{output_v_map}"));
filter[1].push_str(format!(";[aout0]asplit={output_count}{output_a_map}").as_str()); filter[1].push_str(&format!(";[aout0]asplit={output_count}{output_a_map}"));
filter.drain(2..); filter.drain(2..);
cmd.append(&mut filter); cmd.append(&mut filter);
cmd.append(&mut vec_strings!["-map", "[v_out1]", "-map", "[a_out1]"]); cmd.append(&mut vec_strings!["-map", "[v_out1]", "-map", "[a_out1]"]);
} else if output_count == 1 && mode == "hls" && output_params[0].contains("split") { } else if output_count == 1 && mode == "hls" && output_params[0].contains("split") {
let out_filter = output_params.remove(0); let out_filter = output_params.remove(0);
filter[1].push_str(format!(";{out_filter}").as_str()); filter[1].push_str(&format!(";{out_filter}"));
filter.drain(2..); filter.drain(2..);
cmd.append(&mut filter); cmd.append(&mut filter);
} else if output_count > 1 && mode == "stream" { } else if output_count > 1 && mode == "stream" {
filter[1].push_str(format!(",split={output_count}{output_v_map}").as_str()); filter[1].push_str(&format!(",split={output_count}{output_v_map}"));
cmd.append(&mut filter); cmd.append(&mut filter);
cmd.append(&mut vec_strings!["-map", "[v_out1]", "-map", "0:a"]); cmd.append(&mut vec_strings!["-map", "[v_out1]", "-map", "0:a"]);
} else { } else {