Compare commits

..

3 Commits

Author SHA1 Message Date
d56f7f2f0f Upping to v0.2.7
Some checks failed
ci/woodpecker/push/woodpecker Pipeline was successful
ci/woodpecker/tag/woodpecker Pipeline failed
2024-01-18 23:43:10 -05:00
1cc8306fec Upgrading Rust version used in CI
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
2024-01-18 23:42:39 -05:00
597b64c9c5 Made the video_resolution parameter optional
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
2024-01-18 23:27:04 -05:00
3 changed files with 21 additions and 10 deletions

View File

@ -1,13 +1,13 @@
pipeline: pipeline:
tests: tests:
image: rust:1.63 image: rust:1.75
commands: commands:
- "apt update" - "apt update"
- "apt install -y lsof" - "apt install -y lsof"
- "cargo test" - "cargo test"
build_release: build_release:
image: rust:1.63 image: rust:1.75
commands: commands:
- "cargo install cargo-deb cargo-generate-rpm" - "cargo install cargo-deb cargo-generate-rpm"
- "cargo build --release" - "cargo build --release"

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.6" version = "0.2.7"
edition = "2021" edition = "2021"
readme = "README.md" readme = "README.md"
license = "BSD 2-Clause" license = "BSD 2-Clause"

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");