Merge branch 'PS-670-rendition-video_enhance1' of github.com:alchemy-…

…fr/phraseanet-services into w2442
alchemy-fr · Oct 10, 2024 · 2a54563 · 2a54563
2 parents 9507b86 + 0eb9252
commit 2a54563
Show file tree

Hide file tree

Showing 8 changed files with 87 additions and 8 deletions.
diff --git a/lib/php/rendition-factory-bundle/Resources/config/services.yaml b/lib/php/rendition-factory-bundle/Resources/config/services.yaml
@@ -28,6 +28,10 @@ services:
         tags:
             - { name: !php/const Alchemy\RenditionFactory\Transformer\TransformerModuleInterface::TAG }
 
+    Alchemy\RenditionFactory\Transformer\Video\VideoToFrameTransformerModule:
+        tags:
+            - { name: !php/const Alchemy\RenditionFactory\Transformer\TransformerModuleInterface::TAG }
+
     Alchemy\RenditionFactory\Transformer\Document\DocumentToPdfTransformerModule:
         tags:
             - { name: !php/const Alchemy\RenditionFactory\Transformer\TransformerModuleInterface::TAG }

diff --git a/lib/php/rendition-factory/src/Command/CreateCommand.php b/lib/php/rendition-factory/src/Command/CreateCommand.php
@@ -32,7 +32,7 @@ protected function configure(): void
 
         $this->addArgument('src', InputArgument::REQUIRED, 'The source file');
         $this->addArgument('build-config', InputArgument::REQUIRED, 'The build config YAML file');
-        $this->addOption('type', 't', InputOption::VALUE_OPTIONAL, 'Force the MIME type of file');
+        $this->addOption('type', 't', InputOption::VALUE_REQUIRED, 'Force the MIME type of file');
         $this->addOption('working-dir', 'w', InputOption::VALUE_REQUIRED, 'The working directory. Defaults to system temp directory');
         $this->addOption('output', 'o', InputOption::VALUE_REQUIRED, 'The output file name WITHOUT extension');
         $this->addOption('debug', 'd', InputOption::VALUE_NONE, 'set to debug mode (keep files in working directory)');

diff --git a/lib/php/rendition-factory/src/Config/YamlLoader.php b/lib/php/rendition-factory/src/Config/YamlLoader.php
@@ -70,6 +70,7 @@ private function parseTransformation(array $transformation): Transformation
     {
         return new Transformation(
             $transformation['module'],
+            $transformation['enabled'] ?? true,
             $transformation['options'] ?? [],
             $transformation['description'] ?? null
         );

diff --git a/lib/php/rendition-factory/src/DTO/BuildConfig/FamilyBuildConfig.php b/lib/php/rendition-factory/src/DTO/BuildConfig/FamilyBuildConfig.php
@@ -14,7 +14,10 @@ public function __construct(
 
     public function getTransformations(): array
     {
-        return $this->transformations;
+        return array_filter(
+            $this->transformations,
+            fn (Transformation $transformation) => $transformation->isEnabled()
+        );
     }
 
     public function getNormalization(): array

diff --git a/lib/php/rendition-factory/src/DTO/BuildConfig/Transformation.php b/lib/php/rendition-factory/src/DTO/BuildConfig/Transformation.php
@@ -6,6 +6,7 @@
 {
     public function __construct(
         private string $module,
+        private bool $enabled,
         private array $options,
         private ?string $description,
     ) {
@@ -25,4 +26,9 @@ public function getOptions(): array
     {
         return $this->options;
     }
+
+    public function isEnabled(): bool
+    {
+        return $this->enabled;
+    }
 }
diff --git a/lib/php/rendition-factory/src/Transformer/Video/FFMpegTransformerModule.php b/lib/php/rendition-factory/src/Transformer/Video/FFMpegTransformerModule.php
@@ -138,10 +138,11 @@ private function doVideo(string $format, string $extension, InputFileInterface $
 
         $clip->save($ouputFormat, $outputPath);
 
-        unset($clip);
-        unset($video);
+        unset($clip, $video);
+        gc_collect_cycles();
 
         $mimeType = $context->guessMimeTypeFromPath($outputPath);
+
         $fileFamilyGuesser = new FileFamilyGuesser();
         $family = $fileFamilyGuesser->getFamily($outputPath, $mimeType);
 

diff --git a/lib/php/rendition-factory/src/Transformer/Video/VideoSummaryTransformerModule.php b/lib/php/rendition-factory/src/Transformer/Video/VideoSummaryTransformerModule.php
@@ -3,10 +3,10 @@
 namespace Alchemy\RenditionFactory\Transformer\Video;
 
 use Alchemy\RenditionFactory\Context\TransformationContextInterface;
-use Alchemy\RenditionFactory\DTO\FamilyEnum;
 use Alchemy\RenditionFactory\DTO\InputFileInterface;
 use Alchemy\RenditionFactory\DTO\OutputFile;
 use Alchemy\RenditionFactory\DTO\OutputFileInterface;
+use Alchemy\RenditionFactory\FileFamilyGuesser;
 use Alchemy\RenditionFactory\Transformer\TransformerModuleInterface;
 use FFMpeg;
 use FFMpeg\Coordinate\TimeCode;
@@ -108,13 +108,19 @@ private function processVideo(string $format, string $extension, InputFileInterf
 
             $context->log(sprintf('Duration duration: %s, extracting %d clips of %d seconds', $inputDuration, $nClips, $clipDuration));
             $clipDuration = TimeCode::fromSeconds($clipDuration);
+            $removeAudioFilter = new FFMpeg\Filters\Audio\SimpleFilter(['-an']);
             for ($i = 0; $i < $nClips; ++$i) {
                 $start = $i * $period;
                 $clip = $video->clip(TimeCode::fromSeconds($start), $clipDuration);
+                $clip->addFilter($removeAudioFilter);
                 $clipPath = $context->createTmpFilePath($clipsExtension);
                 $clip->save($clipsFormat, $clipPath);
+                unset($clip);
+                gc_collect_cycles();
                 $clipsFiles[] = realpath($clipPath);
             }
+            unset($removeAudioFilter, $video);
+            gc_collect_cycles();
 
             $outVideo = $ffmpeg->open($clipsFiles[0]);
 
@@ -127,6 +133,9 @@ private function processVideo(string $format, string $extension, InputFileInterf
                     ->concat($clipsFiles)
                     ->saveFromDifferentCodecs($outpuFormat, $outputPath);
             }
+
+            unset($outVideo);
+            gc_collect_cycles();
         } finally {
             foreach ($clipsFiles as $clipFile) {
                 @unlink($clipFile);
@@ -137,11 +146,15 @@ private function processVideo(string $format, string $extension, InputFileInterf
             throw new \RuntimeException(sprintf('Failed to create summary video'));
         }
 
-        // TODO return the correct family and MIME type
+        $mimeType = $context->guessMimeTypeFromPath($outputPath);
+
+        $fileFamilyGuesser = new FileFamilyGuesser();
+        $family = $fileFamilyGuesser->getFamily($outputPath, $mimeType);
+
         return new OutputFile(
             $outputPath,
-            'application/octet-stream',
-            FamilyEnum::Unknown
+            $mimeType,
+            $family
         );
     }
 }
diff --git a/lib/php/rendition-factory/src/Transformer/Video/VideoToFrameTransformerModule.php b/lib/php/rendition-factory/src/Transformer/Video/VideoToFrameTransformerModule.php
@@ -0,0 +1,51 @@
+<?php
+
+namespace Alchemy\RenditionFactory\Transformer\Video;
+
+use Alchemy\RenditionFactory\Context\TransformationContextInterface;
+use Alchemy\RenditionFactory\DTO\InputFileInterface;
+use Alchemy\RenditionFactory\DTO\OutputFile;
+use Alchemy\RenditionFactory\DTO\OutputFileInterface;
+use Alchemy\RenditionFactory\FileFamilyGuesser;
+use Alchemy\RenditionFactory\Transformer\TransformerModuleInterface;
+use FFMpeg;
+
+final readonly class VideoToFrameTransformerModule implements TransformerModuleInterface
+{
+    public function __construct()
+    {
+    }
+
+    public static function getName(): string
+    {
+        return 'video_to_frame';
+    }
+
+    public function transform(InputFileInterface $inputFile, array $options, TransformationContextInterface $context): OutputFileInterface
+    {
+        $ffmpeg = FFMpeg\FFMpeg::create(); // (new FFMpeg\FFMpeg)->open('/path/to/video');
+
+        $from_seconds = $options['from_seconds'] ?? 0;
+        $extension = $options['extension'] ?? '.jpg';
+
+        $video = $ffmpeg->open($inputFile->getPath());
+        $frame = $video->frame(FFMpeg\Coordinate\TimeCode::fromSeconds($from_seconds));
+        $outputPath = $context->createTmpFilePath($extension);
+
+        $frame->save($outputPath);
+
+        unset($frame, $video);
+        gc_collect_cycles();
+
+        $mimeType = $context->guessMimeTypeFromPath($outputPath);
+
+        $fileFamilyGuesser = new FileFamilyGuesser();
+        $family = $fileFamilyGuesser->getFamily($outputPath, $mimeType);
+
+        return new OutputFile(
+            $outputPath,
+            $mimeType,
+            $family
+        );
+    }
+}