check against more parameters, change error message
This commit is contained in:
parent
d073b862f5
commit
cfaa70891c
@ -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 let Some(mut cmd) = config.out.output_cmd.clone() {
|
||||||
if !cmd
|
if !cmd.iter().any(|i| {
|
||||||
.iter()
|
[
|
||||||
.any(|i| ["-c:v", "-vcodec", "-c:a", "-acodec"].contains(&i.as_str()))
|
"-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);
|
enc_cmd.append(&mut cmd);
|
||||||
} else {
|
} 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!");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -159,7 +159,7 @@ pub fn player(
|
|||||||
|
|
||||||
for rx in ingest_receiver.as_ref().unwrap().try_iter() {
|
for rx in ingest_receiver.as_ref().unwrap().try_iter() {
|
||||||
if let Err(e) = enc_writer.write(&rx.1[..rx.0]) {
|
if let Err(e) = enc_writer.write(&rx.1[..rx.0]) {
|
||||||
error!("Encoder write error: {:?}", e);
|
error!("Error from Ingest: {:?}", e);
|
||||||
|
|
||||||
break 'source_iter;
|
break 'source_iter;
|
||||||
};
|
};
|
||||||
@ -187,7 +187,7 @@ pub fn player(
|
|||||||
|
|
||||||
if dec_bytes_len > 0 {
|
if dec_bytes_len > 0 {
|
||||||
if let Err(e) = enc_writer.write(&buffer[..dec_bytes_len]) {
|
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;
|
break 'source_iter;
|
||||||
};
|
};
|
||||||
|
Loading…
Reference in New Issue
Block a user