STEMMechanics/Website
1
0
Fork 0
Code Issues 4 Pull Requests 3 Actions Packages Projects Releases 3 Wiki Activity

provide progress

Browse Source
This commit is contained in:
James Collins
2023-08-28 07:39:41 +10:00
parent 0b46c34abe
commit 33f658e088
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
app/Jobs/MediaJob.php
View File

@@ -3,7 +3,6 @@
namespace App\Jobs; namespace App\Jobs;
use App\Models\Media; use App\Models\Media;
use Exception;
use Illuminate\Bus\Queueable; use Illuminate\Bus\Queueable;
use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Foundation\Bus\Dispatchable; use Illuminate\Foundation\Bus\Dispatchable;
@@ -14,11 +13,8 @@ use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Storage; use Illuminate\Support\Facades\Storage;
use FFMpeg; use FFMpeg;
use FFMpeg\Coordinate\Dimension; use FFMpeg\Coordinate\Dimension;
use FFMpeg\Exception\ExecutableNotFoundException;
use FFMpeg\Exception\InvalidArgumentException;
use FFMpeg\Exception\RuntimeException;
use FFMpeg\FFProbe; use FFMpeg\FFProbe;
use FFMpeg\Format\FormatInterface; use FFMpeg\Format\VideoInterface;
use Intervention\Image\Facades\Image; use Intervention\Image\Facades\Image;
class MediaJob implements ShouldQueue class MediaJob implements ShouldQueue
@@ -252,7 +248,14 @@ class MediaJob implements ShouldQueue
$filters->crop($cropDimension, $x, $y)->synchronize(); $filters->crop($cropDimension, $x, $y)->synchronize();
}//end if }//end if
$tempFilePath = tempnam(sys_get_temp_dir(), 'video-'); $tempFilePath = generateTempFilePath(pathinfo($stagingFilePath, PATHINFO_EXTENSION));
if (method_exists($format, 'on') === true) {
$media = $this->media;
$format->on('progress', function ($video, $format, $percentage) use ($media) {
$media->status("{$percentage}% transcoded");
});
}
$video->save($format, $tempFilePath); $video->save($format, $tempFilePath);
$this->media->changeStagingFile($tempFilePath); $this->media->changeStagingFile($tempFilePath);
}//end if }//end if
@@ -291,9 +294,9 @@ class MediaJob implements ShouldQueue
* Detects the format of a video using FFProbe * Detects the format of a video using FFProbe
* *
* @param string $videoPath The video file path. * @param string $videoPath The video file path.
* @return FormatInterface | null * @return VideoInterface | null
*/ */
public function detectVideoFormat(string $videoPath): FormatInterface | null public function detectVideoFormat(string $videoPath): VideoInterface | null
{ {
$ffprobe = FFProbe::create(); $ffprobe = FFProbe::create();