Compare commits

..

No commits in common. "ce00bf5c708e256db15791c7ffb529609ce389b1" and "e479959ca810e584d259e13024e8d7a2b4a80ed8" have entirely different histories.

2 changed files with 8 additions and 19 deletions

View File

@ -1,7 +1,7 @@
[package] [package]
name = "zealot" name = "zealot"
description = "Bit Goblin automated video transcoding service." description = "Bit Goblin automated video transcoding service."
version = "0.2.7" version = "0.2.6"
edition = "2021" edition = "2021"
readme = "README.md" readme = "README.md"
license = "BSD 2-Clause" license = "BSD 2-Clause"

View File

@ -73,28 +73,17 @@ 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 binding = process::Command::new("/usr/bin/ffmpeg"); let cmd_output = process::Command::new("/usr/bin/ffmpeg")
let mut cmd = binding; .arg("-i") .arg(&*ingest_file.to_string_lossy())
// 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())
// add video resolution if it's available .arg("-r") .arg(format!("{}", self.config.get_string("transcoder.video_framerate").unwrap()))
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");