refactor

Cargo.lock

@@ -5955,6 +5955,7 @@ dependencies = [
  "easyenv",
  "enums",
  "errors",
+ "ffmpeg_utils",
  "filesys",
  "google_drive_common",
  "hashing",
@@ -11575,6 +11576,7 @@ dependencies = [
  "enums_public",
  "errors",
  "fal_client",
+ "ffmpeg_utils",
  "filesys",
  "futures 0.1.31",
  "futures 0.3.31",

crates/lib/ffmpeg_utils/src/ffmpeg/mod.rs

@@ -0,0 +1 @@
+pub mod ffmpeg_timestamp_from_duration;

crates/lib/ffmpeg_utils/src/lib.rs

@@ -17,3 +17,6 @@
 // Always allow
 #![allow(dead_code)]
 #![allow(non_snake_case)]
+
+pub mod ffmpeg;
+pub mod ffprobe;

crates/lib/files/videos/Cargo.toml

@@ -26,6 +26,7 @@ errors.workspace = true
 # External
 ffprobe = "0.4.0"
 log.workspace = true
+
 # TODO(bt,2024-08-08): We might drop `mp4` crate because it crashes on reading
 #  some videos with the message "avcc not found"
 mp4 = "0.14.0"

crates/lib/files/videos/src/lib.rs

@@ -18,7 +18,6 @@
 #![allow(dead_code)]
 #![allow(non_snake_case)]
 
-pub mod ffmpeg_timestamp_from_duration;
 pub mod ffprobe_get_dimensions;
 pub mod ffprobe_get_info;
 pub mod get_mp4_info;

crates/service/job/inference_job/Cargo.toml

@@ -49,6 +49,7 @@ subprocess_common = { path = "../../../lib/subprocess_common" }
 thumbnail_generator = { path = "../../../api_clients/thumbnail_generator"}
 tokens.workspace = true
 tts_common = { path = "../../../lib/tts_common" }
+ffmpeg_utils.workspace = true
 videos = { path = "../../../lib/files/videos" }
 
 # External

crates/service/job/inference_job/src/util/common_commands/ffmpeg/ffmpeg_resample_duration.rs

@@ -3,7 +3,7 @@ use log::debug;
 use std::path::Path;
 use std::time::Duration;
 use subprocess_common::command_runner::command_args::CommandArgs;
-use videos::ffmpeg_timestamp_from_duration::ffmpeg_timestamp_from_duration;
+use ffmpeg_utils::ffmpeg::ffmpeg_timestamp_from_duration::ffmpeg_timestamp_from_duration;
 
 /// Trim a video's duration
 /// See: https://shotstack.io/learn/use-ffmpeg-to-trim-video/

crates/service/job/inference_job/src/util/common_commands/ffmpeg/ffmpeg_resample_fps_and_duration.rs

@@ -3,7 +3,7 @@ use log::debug;
 use std::path::Path;
 use std::time::Duration;
 use subprocess_common::command_runner::command_args::CommandArgs;
-use videos::ffmpeg_timestamp_from_duration::ffmpeg_timestamp_from_duration;
+use ffmpeg_utils::ffmpeg::ffmpeg_timestamp_from_duration::ffmpeg_timestamp_from_duration;
 
 /// Resample a video's frame rate
 /// See: https://trac.ffmpeg.org/wiki/ChangingFrameRate

crates/service/web/storyteller_web/Cargo.toml

@@ -82,6 +82,7 @@ url_config = { path = "../../../lib/url_config" }
 url_utils = { path = "../../../lib/url_utils" }
 user_input_common = { path = "../../../lib/user_input_common" }
 users.workspace = true
+ffmpeg_utils.workspace = true
 videos = { path = "../../../lib/files/videos" }
 world_labs_api.workspace = true
 

crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_video_new/ffmpeg_trim_and_resample.rs

@@ -6,7 +6,7 @@ use std::process::Command;
 use std::time::Duration;
 
 use errors::AnyhowResult;
-use videos::ffmpeg_timestamp_from_duration::ffmpeg_timestamp_from_duration;
+use ffmpeg_utils::ffmpeg::ffmpeg_timestamp_from_duration::ffmpeg_timestamp_from_duration;
 
 pub struct Args<'a> {
   pub video_input_path: &'a Path,