PS-670 rendition video enhance1

infra/docker/dev/Dockerfile

@@ -10,7 +10,8 @@ RUN apk add --no-cache \
 		mysql-dev \
 		postgresql-dev \
 		zlib \
-    libreoffice \
+        ffmpeg \
+        libreoffice \
     	imagemagick \
     	rabbitmq-c-dev \
         bash \

lib/php/admin-bundle/Field/YamlField.php

@@ -3,8 +3,8 @@
 namespace Alchemy\AdminBundle\Field;
 
 use Alchemy\AdminBundle\Form\YamlType;
-use EasyCorp\Bundle\EasyAdminBundle\Field\FieldTrait;
 use EasyCorp\Bundle\EasyAdminBundle\Contracts\Field\FieldInterface;
+use EasyCorp\Bundle\EasyAdminBundle\Field\FieldTrait;
 
 final class YamlField implements FieldInterface
 {

lib/php/admin-bundle/Form/JsonType.php

@@ -26,8 +26,8 @@ public function transform(mixed $value)
 
     public function reverseTransform(mixed $value)
     {
-        if ($value !== null && json_validate($value) === false) {
-            return ['input-error' => 'Invalid JSON: ' . json_last_error_msg()];
+        if (null !== $value && false === json_validate($value)) {
+            return ['input-error' => 'Invalid JSON: '.json_last_error_msg()];
         }
 
         return json_decode($value, true, 512, JSON_THROW_ON_ERROR);
@@ -36,7 +36,7 @@ public function reverseTransform(mixed $value)
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults([
-            'attr'=> [
+            'attr' => [
                 'rows' => 10,
                 'style' => 'font-family: "Courier New"',
             ],
@@ -48,9 +48,9 @@ function (mixed $data, ExecutionContextInterface $context) {
                             ->buildViolation($data['input-error'])
                             ->addViolation();
                         }
-                    }       
-                )
-            ]
+                    }
+                ),
+            ],
         ]);
     }
 

lib/php/admin-bundle/Form/YamlType.php

@@ -4,20 +4,20 @@
 
 namespace Alchemy\AdminBundle\Form;
 
-use Symfony\Component\Yaml\Yaml;
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Yaml\Exception\ParseException;
+use Symfony\Component\Form\Extension\Core\Type\TextareaType;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Validator\Constraints as Assert;
-use Symfony\Component\Form\Extension\Core\Type\TextareaType;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
+use Symfony\Component\Yaml\Exception\ParseException;
+use Symfony\Component\Yaml\Yaml;
 
-class YamlType extends AbstractType 
+class YamlType extends AbstractType
 {
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults([
-            'attr'=> [
+            'attr' => [
                 'rows' => 10,
                 'style' => 'font-family: "Courier New"',
             ],
@@ -31,9 +31,9 @@ function (mixed $data, ExecutionContextInterface $context) {
                                 ->buildViolation(sprintf('YAML error: %s', $e->getMessage()))
                                 ->addViolation();
                         }
-                    }       
-                )
-            ]
+                    }
+                ),
+            ],
         ]);
     }
 

lib/php/rendition-factory-bundle/Resources/config/services.yaml

@@ -28,6 +28,14 @@ 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\Video\VideoToAnimationTransformerModule:
+        tags:
+            - { name: !php/const Alchemy\RenditionFactory\Transformer\TransformerModuleInterface::TAG }
+
     Alchemy\RenditionFactory\Transformer\Document\DocumentToPdfTransformerModule:
         tags:
             - { name: !php/const Alchemy\RenditionFactory\Transformer\TransformerModuleInterface::TAG }
@@ -36,7 +44,47 @@ services:
         tags:
             - { name: !php/const Alchemy\RenditionFactory\Transformer\TransformerModuleInterface::TAG }
 
+    # FFMpeg "formats"
+    Alchemy\RenditionFactory\Transformer\Video\FFMpeg\Format\JpegFormat:
+        tags:
+            - { name: !php/const Alchemy\RenditionFactory\Transformer\Video\FFMpeg\Format\FormatInterface::TAG }
+
+    Alchemy\RenditionFactory\Transformer\Video\FFMpeg\Format\MkvFormat:
+        tags:
+            - { name: !php/const Alchemy\RenditionFactory\Transformer\Video\FFMpeg\Format\FormatInterface::TAG }
+
+    Alchemy\RenditionFactory\Transformer\Video\FFMpeg\Format\Mpeg4Format:
+        tags:
+            - { name: !php/const Alchemy\RenditionFactory\Transformer\Video\FFMpeg\Format\FormatInterface::TAG }
+
+    Alchemy\RenditionFactory\Transformer\Video\FFMpeg\Format\MpegFormat:
+        tags:
+            - { name: !php/const Alchemy\RenditionFactory\Transformer\Video\FFMpeg\Format\FormatInterface::TAG }
+
+    Alchemy\RenditionFactory\Transformer\Video\FFMpeg\Format\QuicktimeFormat:
+        tags:
+            - { name: !php/const Alchemy\RenditionFactory\Transformer\Video\FFMpeg\Format\FormatInterface::TAG }
+
+    Alchemy\RenditionFactory\Transformer\Video\FFMpeg\Format\WebmFormat:
+        tags:
+            - { name: !php/const Alchemy\RenditionFactory\Transformer\Video\FFMpeg\Format\FormatInterface::TAG }
+
+    Alchemy\RenditionFactory\Transformer\Video\FFMpeg\Format\AnimatedGifFormat:
+        tags:
+            - { name: !php/const Alchemy\RenditionFactory\Transformer\Video\FFMpeg\Format\FormatInterface::TAG }
+
+    Alchemy\RenditionFactory\Transformer\Video\FFMpeg\Format\AnimatedPngFormat:
+        tags:
+            - { name: !php/const Alchemy\RenditionFactory\Transformer\Video\FFMpeg\Format\FormatInterface::TAG }
+
+    Alchemy\RenditionFactory\Transformer\Video\FFMpeg\Format\AnimatedWebpFormat:
+        tags:
+            - { name: !php/const Alchemy\RenditionFactory\Transformer\Video\FFMpeg\Format\FormatInterface::TAG }
+
+
     Imagine\Imagick\Imagine: ~
     Imagine\Image\ImagineInterface: '@Imagine\Imagick\Imagine'
 
     Alchemy\RenditionFactory\MimeType\MimeTypeGuesser: ~
+    Alchemy\RenditionFactory\Format\FormatGuesser: ~
+    Alchemy\RenditionFactory\Format\FormatFactory: ~

lib/php/rendition-factory/phpunit.xml.dist

@@ -1,11 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- https://phpunit.readthedocs.io/en/latest/configuration.html -->
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" backupGlobals="false" colors="true">
-  <coverage processUncoveredFiles="true">
-    <include>
-      <directory suffix=".php">src</directory>
-    </include>
-  </coverage>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/11.3/phpunit.xsd" backupGlobals="false" colors="true" cacheDirectory=".phpunit.cache">
   <php>
     <ini name="error_reporting" value="-1"/>
     <server name="SHELL_VERBOSITY" value="-1"/>
@@ -16,4 +11,12 @@
       <directory>tests</directory>
     </testsuite>
   </testsuites>
+  <source>
+    <include>
+      <directory suffix=".php">src</directory>
+    </include>
+    <exclude>
+        <file>tests/AbstractTest.php</file>
+    </exclude>
+  </source>
 </phpunit>

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)');
@@ -72,13 +72,19 @@ protected function execute(InputInterface $input, OutputInterface $output): int
                 $buildConfig,
                 $options
             );
+            $output->writeln(sprintf('Rendition created: %s', $outputFile->getPath()));
+
         } catch (\InvalidArgumentException $e) {
             $output->writeln(sprintf('<error>%s</error>', $e->getMessage()));
 
             return 1;
         }
 
         if ($outputPath = $input->getOption('output')) {
+            if ('/' === substr($outputPath, -1)) {
+                // a directory is specified, use the filename of the source
+                $outputPath .= pathinfo($src, PATHINFO_FILENAME);
+            }
             @mkdir(dirname($outputPath), 0755, true);
             $outputPath .= '.'.$outputFile->getExtension();
             rename($outputFile->getPath(), $outputPath);
@@ -91,8 +97,6 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             return 1;
         }
 
-        $output->writeln(sprintf('Rendition created: %s', $outputFile->getPath()));
-
         if (!$input->getOption('debug')) {
             $this->renditionCreator->cleanUp();
         }

lib/php/rendition-factory/src/Config/YamlLoader.php

@@ -60,7 +60,9 @@ private function parseFamilyConfig(array $data): FamilyBuildConfig
 
         $transformations = [];
         foreach ($data['transformations'] as $transformation) {
-            $transformations[] = $this->parseTransformation($transformation);
+            if ($transformation['enabled'] ?? true) {
+                $transformations[] = $this->parseTransformation($transformation);
+            }
         }
 
         return new FamilyBuildConfig($transformations, $data['normalization'] ?? []);

lib/php/rendition-factory/src/Transformer/Video/FFMpeg/Format/AnimatedGifFormat.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace Alchemy\RenditionFactory\Transformer\Video\FFMpeg\Format;
+
+use Alchemy\RenditionFactory\DTO\FamilyEnum;
+
+class AnimatedGifFormat implements FormatInterface
+{
+    public static function getAllowedExtensions(): array
+    {
+        return ['gif'];
+    }
+
+    public static function getMimeType(): string
+    {
+        return 'image/gif';
+    }
+
+    public static function getFormat(): string
+    {
+        return 'animated-gif';
+    }
+
+    public static function getFamily(): FamilyEnum
+    {
+        return FamilyEnum::Animation;
+    }
+}

lib/php/rendition-factory/src/Transformer/Video/FFMpeg/Format/AnimatedPngFormat.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace Alchemy\RenditionFactory\Transformer\Video\FFMpeg\Format;
+
+use Alchemy\RenditionFactory\DTO\FamilyEnum;
+
+class AnimatedPngFormat implements FormatInterface
+{
+    public static function getAllowedExtensions(): array
+    {
+        return ['apng', 'png'];
+    }
+
+    public static function getMimeType(): string
+    {
+        return 'image/apng';
+    }
+
+    public static function getFormat(): string
+    {
+        return 'animated-png';
+    }
+
+    public static function getFamily(): FamilyEnum
+    {
+        return FamilyEnum::Animation;
+    }
+}

lib/php/rendition-factory/src/Transformer/Video/FFMpeg/Format/AnimatedWebpFormat.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace Alchemy\RenditionFactory\Transformer\Video\FFMpeg\Format;
+
+use Alchemy\RenditionFactory\DTO\FamilyEnum;
+
+class AnimatedWebpFormat implements FormatInterface
+{
+    public static function getAllowedExtensions(): array
+    {
+        return ['webp'];
+    }
+
+    public static function getMimeType(): string
+    {
+        return 'image/webp';
+    }
+
+    public static function getFormat(): string
+    {
+        return 'animated-webp';
+    }
+
+    public static function getFamily(): FamilyEnum
+    {
+        return FamilyEnum::Animation;
+    }
+}

lib/php/rendition-factory/src/Transformer/Video/FFMpeg/Format/FormatInterface.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace Alchemy\RenditionFactory\Transformer\Video\FFMpeg\Format;
+
+use Alchemy\RenditionFactory\DTO\FamilyEnum;
+
+interface FormatInterface
+{
+    final public const TAG = 'alchemy_rendition_factory.ffmpeg_format';
+
+    public static function getAllowedExtensions(): array;
+
+    public static function getMimeType(): string;
+
+    public static function getFormat(): string;
+
+    public static function getFamily(): FamilyEnum;
+}

lib/php/rendition-factory/src/Transformer/Video/FFMpeg/Format/JpegFormat.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace Alchemy\RenditionFactory\Transformer\Video\FFMpeg\Format;
+
+use Alchemy\RenditionFactory\DTO\FamilyEnum;
+
+class JpegFormat implements FormatInterface
+{
+    public static function getAllowedExtensions(): array
+    {
+        return ['jpg', 'jpeg'];
+    }
+
+    public static function getMimeType(): string
+    {
+        return 'image/jpeg';
+    }
+
+    public static function getFormat(): string
+    {
+        return 'image-jpeg';
+    }
+
+    public static function getFamily(): FamilyEnum
+    {
+        return FamilyEnum::Image;
+    }
+}