Revert "Audio Params" (#377)

* Revert "Correct  type in VideoFilters->framerate (#372)"

This reverts commit cedcd37bd2.

* Revert "fix sources parameter type (array) in concat function (#363)"

This reverts commit af00b9d6a3.

* Revert "Audio Params (#344)"

This reverts commit cb7d850338.

src/FFMpeg/Format/Audio/DefaultAudio.php

@@ -46,31 +46,6 @@ 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

@@ -25,13 +25,6 @@ interface AudioInterface extends FormatInterface
      * @return integer
      */
     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

@@ -1,22 +0,0 @@
-<?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,7 +16,6 @@ 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;
 
 /**
@@ -33,56 +32,8 @@ abstract class DefaultVideo extends DefaultAudio implements VideoInterface
     /** @var Integer */
     protected $modulus = 16;
 
-    /** @var string */
+    /** @var Array */
-    private $profile = Profile::MAIN;
+    protected $additionalParamaters;
-
-    /** @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}
@@ -146,6 +97,31 @@ 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,14 +56,9 @@ interface VideoInterface extends AudioInterface
     public function getAvailableVideoCodecs();
 
     /**
-     * Returns the current profile
+     * Returns the list of available video codecs for this format.
-     * @return string
+     *
+     * @return array
      */
-    public function getProfile();
+    public function getAdditionalParameters();
-
-    /**
-     * Returns the level
-     * @return float
-     */
-    public function getLevel();
 }

src/FFMpeg/Media/Audio.php

@@ -91,13 +91,6 @@ 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,8 +72,6 @@ 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) {
@@ -123,9 +121,11 @@ class Video extends Audio
         }
 
         // If the user passed some additional parameters
-        if (null !== $format->getAdditionalParameters()) {
+        if ($format instanceof VideoInterface) {
-            foreach ($format->getAdditionalParameters() as $additionalParameter) {
+            if (null !== $format->getAdditionalParameters()) {
-                $commands[] = $additionalParameter;
+                foreach ($format->getAdditionalParameters() as $additionalParameter) {
+                    $commands[] = $additionalParameter;
+                }
             }
         }
 

tests/Unit/Media/VideoTest.php

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