cleanup modules, rename

This commit is contained in:
Brandon Thomas committed 2024-06-22 18:31:50 -04:00
1 parent 4e6f25db83
commit d81bd219a2
3 files changed
+6 -6

No files matched your search

@@ -50,7 +50,7 @@ use crate::job::job_types::workflow::comfy_ui::video_style_transfer::steps::down
use crate::job::job_types::workflow::comfy_ui::video_style_transfer::steps::download_input_video::{download_input_video, DownloadInputVideoArgs};
use crate::job::job_types::workflow::comfy_ui::video_style_transfer::steps::post_process_add_watermark::{post_process_add_watermark, PostProcessAddWatermarkArgs};
use crate::job::job_types::workflow::comfy_ui::video_style_transfer::steps::post_process_restore_audio::{post_process_restore_audio, PostProcessRestoreVideoArgs};
use crate::job::job_types::workflow::comfy_ui::video_style_transfer::steps::trim_and_preprocess_video::{trim_and_preprocess_video, TrimAndProcessVideoArgs};
use crate::job::job_types::workflow::comfy_ui::video_style_transfer::steps::preprocess_trim_and_resample_video::{preprocess_trim_and_resample_video, ProcessTrimAndResampleVideoArgs};
use crate::job::job_types::workflow::comfy_ui::video_style_transfer::steps::validate_and_save_results::{SaveResultsArgs, validate_and_save_results};
use crate::job::job_types::workflow::comfy_ui::video_style_transfer::video_paths::VideoPaths;
use crate::job::job_types::workflow::comfy_ui::video_style_transfer::write_workflow_prompt::{WorkflowPromptArgs, write_workflow_prompt};
@@ -254,7 +254,7 @@ pub async fn process_job(args: ComfyProcessJobArgs<'_>) -> Result<JobSuccessResu
// ========================= TRIM AND PREPROCESS VIDEO ======================== //
trim_and_preprocess_video(TrimAndProcessVideoArgs {
preprocess_trim_and_resample_video(ProcessTrimAndResampleVideoArgs {
comfy_args,
comfy_deps: model_dependencies,
videos: &videos,
@@ -3,5 +3,5 @@ pub mod download_global_ipa_image;
pub mod download_input_video;
pub mod post_process_add_watermark;
pub mod post_process_restore_audio;
pub mod trim_and_preprocess_video;
pub mod preprocess_trim_and_resample_video;
pub mod validate_and_save_results;
@@ -15,14 +15,14 @@ use crate::job::job_loop::process_single_job_error::ProcessSingleJobError;
use crate::job::job_types::workflow::comfy_ui::comfy_ui_dependencies::ComfyDependencies;
use crate::job::job_types::workflow::comfy_ui::video_style_transfer::video_paths::VideoPaths;
pub struct TrimAndProcessVideoArgs<'a> {
pub struct ProcessTrimAndResampleVideoArgs<'a> {
pub comfy_args: &'a WorkflowArgs,
pub comfy_deps: &'a ComfyDependencies,
pub videos: &'a VideoPaths,
}
pub fn trim_and_preprocess_video(
args: TrimAndProcessVideoArgs<'_>
pub fn preprocess_trim_and_resample_video(
args: ProcessTrimAndResampleVideoArgs<'_>
) -> Result<(), ProcessSingleJobError> {
let target_fps = args.comfy_args.target_fps.unwrap_or(24);