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

check against more parameters, change error message

Browse Source
This commit is contained in:
jb-alvarado 2023-03-08 17:24:50 +01:00
parent d073b862f5
commit cfaa70891c
2 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ffplayout-engine/src/output/desktop.rs
View File

@ -24,13 +24,24 @@ pub fn output(config: &PlayoutConfig, log_format: &str) -> process::Child {
];
if let Some(mut cmd) = config.out.output_cmd.clone() {
if !cmd
.iter()
.any(|i| ["-c:v", "-vcodec", "-c:a", "-acodec"].contains(&i.as_str()))
{
if !cmd.iter().any(|i| {
[
"-c:v",
"-c:v:0",
"-b:v",
"-b:v:0",
"-vcodec",
"-c:a",
"-acodec",
"-crf",
"-map",
"-filter_complex",
]
.contains(&i.as_str())
}) {
enc_cmd.append(&mut cmd);
} else {
warn!("Desktop output supports custom parameters, but given ones a not supported by ffplay!");
warn!("Given output parameter a skipped, they are not supported by ffplay!");
}
}

4
ffplayout-engine/src/output/mod.rs
View File

@ -159,7 +159,7 @@ pub fn player(
for rx in ingest_receiver.as_ref().unwrap().try_iter() {
if let Err(e) = enc_writer.write(&rx.1[..rx.0]) {
error!("Encoder write error: {:?}", e);
error!("Error from Ingest: {:?}", e);
break 'source_iter;
};
@ -187,7 +187,7 @@ pub fn player(
if dec_bytes_len > 0 {
if let Err(e) = enc_writer.write(&buffer[..dec_bytes_len]) {
error!("Encoder write error: {e:?}");
error!("Encoder write error: {}", e.kind());
break 'source_iter;
};