simplify code
This commit is contained in:
parent
31a4e10df1
commit
d5356803d0
@ -94,7 +94,9 @@ pub fn ingest_server(
|
|||||||
server_cmd.append(&mut filter.map());
|
server_cmd.append(&mut filter.map());
|
||||||
}
|
}
|
||||||
|
|
||||||
server_cmd.append(&mut config.processing.settings.unwrap());
|
if let Some(mut cmd) = config.processing.cmd {
|
||||||
|
server_cmd.append(&mut cmd);
|
||||||
|
}
|
||||||
|
|
||||||
let mut is_running;
|
let mut is_running;
|
||||||
|
|
||||||
|
@ -107,7 +107,9 @@ pub fn player(
|
|||||||
dec_cmd.append(&mut filter.map());
|
dec_cmd.append(&mut filter.map());
|
||||||
}
|
}
|
||||||
|
|
||||||
dec_cmd.append(&mut config.processing.clone().settings.unwrap());
|
if let Some(mut cmd) = config.processing.cmd.clone() {
|
||||||
|
dec_cmd.append(&mut cmd);
|
||||||
|
}
|
||||||
|
|
||||||
debug!(
|
debug!(
|
||||||
"Decoder CMD: <bright-blue>\"ffmpeg {}\"</>",
|
"Decoder CMD: <bright-blue>\"ffmpeg {}\"</>",
|
||||||
|
@ -83,7 +83,7 @@ impl fmt::Display for TextFilter {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
write!(f, "{}", s)
|
write!(f, "{s}")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -160,6 +160,7 @@ pub fn json_rpc_server(
|
|||||||
&& map.contains_key("message")
|
&& map.contains_key("message")
|
||||||
{
|
{
|
||||||
let filter = filter_from_json(map["message"].clone());
|
let filter = filter_from_json(map["message"].clone());
|
||||||
|
debug!("Got drawtext command: <bright-blue>\"{filter}\"</>");
|
||||||
|
|
||||||
// TODO: in Rust 1.65 use let_chains instead
|
// TODO: in Rust 1.65 use let_chains instead
|
||||||
if !filter.is_empty() && config.text.zmq_stream_socket.is_some() {
|
if !filter.is_empty() && config.text.zmq_stream_socket.is_some() {
|
||||||
|
@ -164,7 +164,7 @@ pub struct Processing {
|
|||||||
pub custom_filter: String,
|
pub custom_filter: String,
|
||||||
|
|
||||||
#[serde(skip_serializing, skip_deserializing)]
|
#[serde(skip_serializing, skip_deserializing)]
|
||||||
pub settings: Option<Vec<String>>,
|
pub cmd: Option<Vec<String>>,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, Serialize, Deserialize, Clone)]
|
#[derive(Debug, Serialize, Deserialize, Clone)]
|
||||||
@ -289,8 +289,7 @@ impl PlayoutConfig {
|
|||||||
config.processing.audio_tracks = 1
|
config.processing.audio_tracks = 1
|
||||||
}
|
}
|
||||||
|
|
||||||
// We set the decoder settings here, so we only define them ones.
|
config.processing.cmd = Some(vec_strings![
|
||||||
let mut settings = vec_strings![
|
|
||||||
"-pix_fmt",
|
"-pix_fmt",
|
||||||
"yuv420p",
|
"yuv420p",
|
||||||
"-r",
|
"-r",
|
||||||
@ -300,10 +299,7 @@ impl PlayoutConfig {
|
|||||||
"-g",
|
"-g",
|
||||||
"1",
|
"1",
|
||||||
"-qscale:v",
|
"-qscale:v",
|
||||||
"2"
|
"2",
|
||||||
];
|
|
||||||
|
|
||||||
settings.append(&mut vec_strings![
|
|
||||||
"-c:a",
|
"-c:a",
|
||||||
"pcm_bluray",
|
"pcm_bluray",
|
||||||
"-mpegts_m2ts_mode",
|
"-mpegts_m2ts_mode",
|
||||||
@ -317,8 +313,6 @@ impl PlayoutConfig {
|
|||||||
"-"
|
"-"
|
||||||
]);
|
]);
|
||||||
|
|
||||||
config.processing.settings = Some(settings);
|
|
||||||
|
|
||||||
config.ingest.input_cmd = split(config.ingest.input_param.as_str());
|
config.ingest.input_cmd = split(config.ingest.input_param.as_str());
|
||||||
|
|
||||||
config.out.output_count = 1;
|
config.out.output_count = 1;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user