From cc77bba7e79b44d72db90f4db60fdbacdd1a8377 Mon Sep 17 00:00:00 2001 From: Marcel Wagner Date: Sun, 29 Dec 2024 17:16:27 +0100 Subject: [PATCH] Increase Timeout of Prepare-Processes (#30) --- app/Conversion/MediaOperations/AutoCropFilterOperation.php | 4 +++- app/Conversion/MediaOperations/MaxSizeOperation.php | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/Conversion/MediaOperations/AutoCropFilterOperation.php b/app/Conversion/MediaOperations/AutoCropFilterOperation.php index 6dc1240..e429a3f 100644 --- a/app/Conversion/MediaOperations/AutoCropFilterOperation.php +++ b/app/Conversion/MediaOperations/AutoCropFilterOperation.php @@ -30,9 +30,11 @@ public function applyToMedia(MediaOpener $media): MediaOpener private function prepareData(): void { $path = Storage::disk($this->conversion->file->disk)->path($this->conversion->file->filename); + $ffmpeg = config('laravel-ffmpeg.ffmpeg.binaries'); + $timeout = config('laravel-ffmpeg.timeout'); - $process = Process::run("{$ffmpeg} -flags2 +export_mvs -i {$path} -vf cropdetect -f null - 2>&1 | awk '/crop/ { print \$NF }' | tail -1"); + $process = Process::run("{$ffmpeg} -timeout {$timeout} -flags2 +export_mvs -i {$path} -vf cropdetect -f null - 2>&1 | awk '/crop/ { print \$NF }' | tail -1"); $this->crop = trim($process->output()); } diff --git a/app/Conversion/MediaOperations/MaxSizeOperation.php b/app/Conversion/MediaOperations/MaxSizeOperation.php index a50d5cd..9bb2d96 100644 --- a/app/Conversion/MediaOperations/MaxSizeOperation.php +++ b/app/Conversion/MediaOperations/MaxSizeOperation.php @@ -56,7 +56,8 @@ public function applyToFormat(DefaultVideo $format): DefaultVideo $input = Storage::disk($this->conversion->file->disk)->path($this->conversion->file->filename); $ffmpeg = config('laravel-ffmpeg.ffmpeg.binaries'); - Process::run("{$ffmpeg} -y -i {$input} -c:v libx264 -b:v {$kiloBitRate}k -pass 1 -f null /dev/null"); + $timeout = config('laravel-ffmpeg.timeout'); + Process::run("{$ffmpeg} -timeout {$timeout} -y -i {$input} -c:v libx264 -b:v {$kiloBitRate}k -pass 1 -f null /dev/null"); $format->setKiloBitrate($kiloBitRate); $format->setPasses(2);