Made the video_resolution parameter optional
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful

This commit is contained in:
Gregory Ballantine 2024-01-18 23:27:04 -05:00
parent e479959ca8
commit 597b64c9c5

View File

@ -73,17 +73,28 @@ impl Transcoder {
let video_codec = &self.config.get_string("transcoder.video_codec").unwrap(); let video_codec = &self.config.get_string("transcoder.video_codec").unwrap();
info!("Transcoding {} to {} with the {} encoder.", ingest_file.display(), output_file.display(), video_codec); info!("Transcoding {} to {} with the {} encoder.", ingest_file.display(), output_file.display(), video_codec);
let cmd_output = process::Command::new("/usr/bin/ffmpeg") let binding = process::Command::new("/usr/bin/ffmpeg");
.arg("-i") .arg(&*ingest_file.to_string_lossy()) let mut cmd = binding;
// start building the command
cmd.arg("-i") .arg(&*ingest_file.to_string_lossy())
.arg("-y") .arg("-y")
.arg("-f") .arg(&video_format) .arg("-f") .arg(&video_format)
.arg("-c:v") .arg(&video_codec) .arg("-c:v") .arg(&video_codec);
.arg("-s") .arg(&self.config.get_string("transcoder.video_resolution").unwrap())
.arg("-r") .arg(format!("{}", self.config.get_string("transcoder.video_framerate").unwrap())) // add video resolution if it's available
if self.config.get_string("transcoder.video_resolution").is_ok() {
cmd.arg("-s").arg(&self.config.get_string("transcoder.video_resolution").unwrap());
};
// finish out command
cmd.arg("-r").arg(format!("{}", self.config.get_string("transcoder.video_framerate").unwrap()))
.arg("-vf") .arg(format!("format={}", &self.config.get_string("transcoder.video_color").unwrap())) .arg("-vf") .arg(format!("format={}", &self.config.get_string("transcoder.video_color").unwrap()))
.arg("-profile:v").arg(&self.config.get_string("transcoder.video_profile").unwrap()) .arg("-profile:v").arg(&self.config.get_string("transcoder.video_profile").unwrap())
.arg("-c:a") .arg(&self.config.get_string("transcoder.audio_codec").unwrap()) .arg("-c:a") .arg(&self.config.get_string("transcoder.audio_codec").unwrap());
.arg(&*output_file.to_string_lossy())
// finish the command and run it
let cmd_output = cmd.arg(&*output_file.to_string_lossy())
.output() .output()
.expect("Failed to execute command"); .expect("Failed to execute command");