Audio Params (#344)

* 🚀 video profile and level
* add missing getter
* add missing use statement
* add missing return $this
* 1 test fixed
* fix other tests and clean up
We MUST rewrite them. They are too complex when it comes to new features
* trim trailing whitespaces
* fix typo
* 🚀 support for additional params in audio

src/FFMpeg/Format/Audio/DefaultAudio.php

@@ -46,6 +46,31 @@ abstract class DefaultAudio extends EventEmitter implements AudioInterface, Prog
         return $this->audioCodec;
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function getAdditionalParameters()
+    {
+        return $this->additionalParameters;
+    }
+
+    /**
+     * Sets additional parameters.
+     *
+     * @param  array                    $additionalParameters
+     * @throws InvalidArgumentException
+     */
+    public function setAdditionalParameters($additionalParameters)
+    {
+        if (!is_array($additionalParameters)) {
+            throw new InvalidArgumentException('Wrong additionalParamaters value');
+        }
+
+        $this->additionalParameters = $additionalParameters;
+
+        return $this;
+    }
+
     /**
      * Sets the audio codec, Should be in the available ones, otherwise an
      * exception is thrown.

src/FFMpeg/Format/AudioInterface.php

@@ -26,6 +26,13 @@ interface AudioInterface extends FormatInterface
      */
     public function getAudioChannels();
     
+    /**
+     * Returns the list of available video codecs for this format.
+     *
+     * @return array
+     */
+    public function getAdditionalParameters();
+
     /**
      * Returns the audio codec.
      *

src/FFMpeg/Format/Profile.php

@@ -0,0 +1,22 @@
+<?php
+
+/*
+ * This file is part of PHP-FFmpeg.
+ *
+ * (c) Alchemy <info@alchemy.fr>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace FFMpeg\Format;
+
+interface Profile {
+
+    const HIGH = 'high';
+
+    const MAIN = 'main';
+
+    const BASELINE = 'baseline';
+
+}

src/FFMpeg/Format/Video/DefaultVideo.php

@@ -16,6 +16,7 @@ use FFMpeg\Exception\InvalidArgumentException;
 use FFMpeg\Format\Audio\DefaultAudio;
 use FFMpeg\Format\VideoInterface;
 use FFMpeg\Media\MediaTypeInterface;
+use FFMpeg\Format\Profile;
 use FFMpeg\Format\ProgressListener\VideoProgressListener;
 
 /**
@@ -32,8 +33,56 @@ abstract class DefaultVideo extends DefaultAudio implements VideoInterface
     /** @var Integer */
     protected $modulus = 16;
 
-    /** @var Array */
+    /** @var string */
-    protected $additionalParamaters;
+    private $profile = Profile::MAIN;
+
+    /** @var float */
+    private $level = 3.1;
+
+    /** @var string[] */
+    protected $additionalParameters;
+
+    /**
+     * Sets the profile of this video
+     * @var string  $profile    must be one of `baseline`, `main` or `high`
+     * @throws \InvalidArgumentException
+     */
+    public function setProfile(string $profile) {
+        switch($profile) {
+            case Profile::BASELINE:
+            case Profile::MAIN:
+            case Profile::HIGH:
+            // these are fine
+            break;
+            default:
+                throw new \InvalidArgumentException('Invalid profile given! Must be one of `baseline`, `main` or `high`!');
+        }
+        $this->profile = $profile;
+        return $this;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getProfile() {
+        return $this->profile;
+    }
+
+    /**
+     * Sets the given level
+     * @param   float   $level  The level(for example: 3.0, 3.1, 4.0, 4.1)
+     */
+    public function setLevel(float $level) {
+        $this->level = $level;
+        return $this;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getLevel() {
+        return $this->level;
+    }
 
     /**
      * {@inheritdoc}
@@ -97,31 +146,6 @@ abstract class DefaultVideo extends DefaultAudio implements VideoInterface
         return $this->modulus;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getAdditionalParameters()
-    {
-        return $this->additionalParamaters;
-    }
-
-    /**
-     * Sets additional parameters.
-     *
-     * @param  array                    $additionalParamaters
-     * @throws InvalidArgumentException
-     */
-    public function setAdditionalParameters($additionalParamaters)
-    {
-        if (!is_array($additionalParamaters)) {
-            throw new InvalidArgumentException('Wrong additionalParamaters value');
-        }
-
-        $this->additionalParamaters = $additionalParamaters;
-
-        return $this;
-    }
-
     /**
      * {@inheritdoc}
      */

src/FFMpeg/Format/VideoInterface.php

@@ -56,9 +56,14 @@ interface VideoInterface extends AudioInterface
     public function getAvailableVideoCodecs();
 
     /**
-     * Returns the list of available video codecs for this format.
+     * Returns the current profile
-     *
+     * @return string
-     * @return array
      */
-    public function getAdditionalParameters();
+    public function getProfile();
+
+    /**
+     * Returns the level
+     * @return float
+     */
+    public function getLevel();
 }

src/FFMpeg/Media/Audio.php

@@ -91,6 +91,13 @@ class Audio extends AbstractStreamableMedia
             $commands[] = '-ac';
             $commands[] = $format->getAudioChannels();
         }
+        // If the user passed some additional parameters
+        if (null !== $format->getAdditionalParameters()) {
+            foreach ($format->getAdditionalParameters() as $additionalParameter) {
+                $commands[] = $additionalParameter;
+            }
+        }
+
         $commands[] = $outputPathfile;
 
         try {

src/FFMpeg/Media/Video.php

@@ -72,6 +72,8 @@ class Video extends Audio
         if ($format instanceof VideoInterface) {
             if (null !== $format->getVideoCodec()) {
                 $filters->add(new SimpleFilter(array('-vcodec', $format->getVideoCodec())));
+                $filters->add(new SimpleFilter(array('-vprofile', $format->getProfile())));
+                $filters->add(new SimpleFilter(array('-level', $format->getLevel())));
             }
         }
         if ($format instanceof AudioInterface) {
@@ -121,11 +123,9 @@ class Video extends Audio
         }
 
         // If the user passed some additional parameters
-        if ($format instanceof VideoInterface) {
+        if (null !== $format->getAdditionalParameters()) {
-            if (null !== $format->getAdditionalParameters()) {
+            foreach ($format->getAdditionalParameters() as $additionalParameter) {
-                foreach ($format->getAdditionalParameters() as $additionalParameter) {
+                $commands[] = $additionalParameter;
-                    $commands[] = $additionalParameter;
-                }
             }
         }
 

tests/Unit/Media/VideoTest.php

@@ -449,60 +449,81 @@ class VideoTest extends AbstractStreamableTestCase
 
         return array(
             array(false, array(array(
-                    '-y', '-i', __FILE__, '-b:v', '663k',
+                    '-y',
-                    '-refs', '6', '-coder', '1', '-sc_threshold', '40', '-flags', '+loop',
+                    '-i', __FILE__,
-                    '-me_range', '16', '-subq', '7', '-i_qfactor', '0.71', '-qcomp', '0.6',
-                    '-qdiff', '4', '-trellis', '1', '-b:a', '92k', '-ac', 2, 'foo', 'bar', '-pass', 1, '-passlogfile',
-                    '/target/file',
-                ), array(
-                    '-y', '-i', __FILE__,
                     '-b:v', '663k',
-                    '-refs', '6', '-coder', '1', '-sc_threshold', '40', '-flags', '+loop',
+                    '-refs', '6',
-                    '-me_range', '16', '-subq', '7', '-i_qfactor', '0.71', '-qcomp', '0.6',
+                    '-coder', '1',
-                    '-qdiff', '4', '-trellis', '1', '-b:a', '92k', '-ac', 2, 'foo', 'bar', '-pass', 2, '-passlogfile',
+                    '-sc_threshold', '40',
-                    '/target/file',
+                    '-flags', '+loop',
+                    '-me_range', '16',
+                    '-subq', '7',
+                    '-i_qfactor', '0.71',
+                    '-qcomp', '0.6',
+                    '-qdiff', '4',
+                    '-trellis', '1',
+                    '-b:a', '92k',
+                    '-ac', 2,
+                    'foo', 'bar',
+                    '-pass', 1,
+                    '-passlogfile', '/target/file',
+                ), array(
+                    '-y',
+                    '-i', __FILE__,
+                    '-b:v', '663k',
+                    '-refs', '6',
+                    '-coder', '1',
+                    '-sc_threshold', '40',
+                    '-flags', '+loop',
+                    '-me_range', '16',
+                    '-subq', '7',
+                    '-i_qfactor', '0.71',
+                    '-qcomp', '0.6',
+                    '-qdiff', '4',
+                    '-trellis', '1',
+                    '-b:a', '92k',
+                    '-ac', 2,
+                    'foo', 'bar',
+                    '-pass', 2,
+                    '-passlogfile', '/target/file'
                 )), null, $format),
             array(false, array(array(
-                    '-y', '-i', __FILE__,
+                    '-y',
-                    '-vcodec', 'gloubi-boulga-video',
+                    '-i', __FILE__,
-                    '-acodec', 'patati-patata-audio', '-b:v', '664k',
+                    'extra', 'param',
-                    '-refs', '6', '-coder', '1', '-sc_threshold', '40', '-flags', '+loop',
+                    '-b:v', '665k',
-                    '-me_range', '16', '-subq', '7', '-i_qfactor', '0.71', '-qcomp', '0.6',
+                    '-refs', '6',
-                    '-qdiff', '4', '-trellis', '1', '-b:a', '92k', '-ac', '2', '-pass', '1', '-passlogfile',
+                    '-coder', '1',
-                    '/target/file',
+                    '-sc_threshold', '40',
+                    '-flags', '+loop',
+                    '-me_range', '16',
+                    '-subq', '7',
+                    '-i_qfactor', '0.71',
+                    '-qcomp', '0.6',
+                    '-qdiff', '4',
+                    '-trellis', '1',
+                    '-b:a', '92k',
+                    '-ac', '2',
+                    '-pass', '1',
+                    '-passlogfile', '/target/file',
                 ), array(
                     '-y', '-i', __FILE__,
-                    '-vcodec', 'gloubi-boulga-video',
+                    'extra', 'param',
-                    '-acodec', 'patati-patata-audio',
+                    '-b:v', '665k',
-                    '-b:v', '664k',
+                    '-refs', '6',
-                    '-refs', '6', '-coder', '1', '-sc_threshold', '40', '-flags', '+loop',
+                    '-coder', '1',
-                    '-me_range', '16', '-subq', '7', '-i_qfactor', '0.71', '-qcomp', '0.6',
+                    '-sc_threshold', '40',
-                    '-qdiff', '4', '-trellis', '1', '-b:a', '92k', '-ac', '2', '-pass', '2', '-passlogfile',
+                    '-flags', '+loop',
-                    '/target/file',
+                    '-me_range', '16',
-                )), null, $audioVideoFormat),
+                    '-subq', '7',
-            array(false, array(array(
+                    '-i_qfactor', '0.71',
-                    '-y', '-i', __FILE__,
+                    '-qcomp', '0.6',
-                    '-vcodec', 'gloubi-boulga-video',
+                    '-qdiff', '4',
-                    '-acodec', 'patati-patata-audio', '-b:v', '664k',
+                    '-trellis', '1',
-                    '-refs', '6', '-coder', '1', '-sc_threshold', '40', '-flags', '+loop',
+                    '-b:a', '92k',
-                    '-me_range', '16', '-subq', '7', '-i_qfactor', '0.71', '-qcomp', '0.6',
+                    '-ac', '2',
-                    '-qdiff', '4', '-trellis', '1', '-b:a', '92k', '-ac', '2',
+                    '-pass', '2',
-                    '/target/file',
+                    '-passlogfile', '/target/file',
-                )), null, $audioVideoFormatSinglePass),
-            array(false, array(array(
-                    '-y', '-i', __FILE__,
-                    'extra', 'param','-b:v', '665k',
-                    '-refs', '6', '-coder', '1', '-sc_threshold', '40', '-flags', '+loop',
-                    '-me_range', '16', '-subq', '7', '-i_qfactor', '0.71', '-qcomp', '0.6',
-                    '-qdiff', '4', '-trellis', '1', '-b:a', '92k', '-ac', '2', '-pass', '1', '-passlogfile',
-                    '/target/file',
-                ), array(
-                    '-y', '-i', __FILE__,
-                    'extra', 'param', '-b:v', '665k',
-                    '-refs', '6', '-coder', '1', '-sc_threshold', '40', '-flags', '+loop',
-                    '-me_range', '16', '-subq', '7', '-i_qfactor', '0.71', '-qcomp', '0.6',
-                    '-qdiff', '4', '-trellis', '1', '-b:a', '92k', '-ac', '2', '-pass', '2', '-passlogfile',
-                    '/target/file',
                 )), null, $formatExtra),
             array(true, array(array(
                     '-y', '-i', __FILE__,