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

simplify prepare_output_cmd

Browse Source
This commit is contained in:
jb-alvarado 2022-10-17 18:26:30 +02:00
parent 31b72db106
commit c87d71c389
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ffplayout-engine/src/utils/mod.rs
View File

@ -99,7 +99,6 @@ pub fn prepare_output_cmd(
let params_len = output_params.len(); let params_len = output_params.len();
let mut new_params = vec![]; let mut new_params = vec![];
let mut output_filter = String::new(); let mut output_filter = String::new();
let mut next_is_filter = false;
let re_map = Regex::new(r"(\[?[0-9]:[av](:[0-9]+)?\]?|-map|\[[a-z_0-9]+\])").unwrap(); let re_map = Regex::new(r"(\[?[0-9]:[av](:[0-9]+)?\]?|-map|\[[a-z_0-9]+\])").unwrap();
if let Some(mut filter) = filters.clone() { if let Some(mut filter) = filters.clone() {
@ -109,9 +108,8 @@ pub fn prepare_output_cmd(
for (i, param) in output_params.iter().enumerate() { for (i, param) in output_params.iter().enumerate() {
// Skip filter command, to concat existing filters with new ones. // Skip filter command, to concat existing filters with new ones.
if param != "-filter_complex" { if param != "-filter_complex" {
if next_is_filter { if i > 0 && output_params[i - 1] == "-filter_complex" {
output_filter = param.clone(); output_filter = param.clone();
next_is_filter = false;
} else if !output_filter.contains("split") { } else if !output_filter.contains("split") {
if !re_map.is_match(param) { if !re_map.is_match(param) {
// Skip mapping parameters, when no split filter is set // Skip mapping parameters, when no split filter is set
@ -120,8 +118,6 @@ pub fn prepare_output_cmd(
} else { } else {
new_params.push(param.clone()); new_params.push(param.clone());
} }
} else {
next_is_filter = true;
} }
// Check if parameter is a output // Check if parameter is a output