Merge branch 'master' into multipleframes

src/FFMpeg/Filters/Audio/AddMetadataFilter.php

@@ -0,0 +1,45 @@
+<?php
+namespace FFMpeg\Filters\Audio;
+
+use FFMpeg\Filters\Audio\AudioFilterInterface;
+use FFMpeg\Format\AudioInterface;
+use FFMpeg\Media\Audio;
+
+class AddMetadataFilter implements AudioFilterInterface
+{	
+	/** @var Array */
+	private $metaArr;
+	/** @var Integer */
+	private $priority;
+
+	function __construct($data = null, $priority = 9)
+	{
+		$this->metaArr = $data;
+		$this->priority = $priority;
+	}
+
+	public function getPriority()
+	{
+		//must be of high priority in case theres a second input stream (artwork) to register with audio
+		return $this->priority;
+	}
+
+	public function apply(Audio $audio, AudioInterface $format)
+	{
+		if (is_null($this->metaArr))
+			return ['-map_metadata', '-1', '-vn'];
+
+		$metadata = [];
+
+		if (array_key_exists("artwork", $this->metaArr)) {
+			array_push($metadata, "-i", $this->metaArr['artwork'], "-map", "0", "-map", "1");
+			unset($this->metaArr['artwork']);
+		}
+
+		foreach ($this->metaArr as $k => $v) {
+			array_push($metadata, "-metadata", "$k=$v");
+		}
+
+		return $metadata;
+	}
+}

src/FFMpeg/Filters/Audio/AudioFilters.php

@@ -2,6 +2,7 @@
 
 namespace FFMpeg\Filters\Audio;
 
+use FFMpeg\Filters\Audio\AddMetadataFilter;
 use FFMpeg\Media\Audio;
 
 class AudioFilters
@@ -26,4 +27,25 @@ class AudioFilters
 
         return $this;
     }
+
+    /**
+     * Add metadata to an audio file. If no arguments are given then filter
+     * will remove all metadata from the audio file
+     * @param Array|Null $data  If array must contain one of these key/value pairs:
+     *    - "title": Title metadata
+     *    - "artist": Artist metadata
+     *    - "composer": Composer metadata
+     *    - "album": Album metadata
+     *    - "track": Track metadata
+     *    - "artwork": Song artwork. String of file path
+     *    - "year": Year metadata
+     *    - "genre": Genre metadata
+     *    - "description": Description metadata
+     */
+    public function addMetadata($data = null)
+    {
+        $this->media->addFilter(new AddMetadataFilter($data));
+
+        return $this;
+    }
 }

src/FFMpeg/Filters/Video/PadFilter.php

@@ -0,0 +1,60 @@
+<?php
+
+/*
+ * This file is part of PHP-FFmpeg.
+ *
+ * (c) Strime <contact@strime.io>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace FFMpeg\Filters\Video;
+
+use FFMpeg\Coordinate\Dimension;
+use FFMpeg\Exception\RuntimeException;
+use FFMpeg\Media\Video;
+use FFMpeg\Format\VideoInterface;
+
+class PadFilter implements VideoFilterInterface
+{
+    /** @var Dimension */
+    private $dimension;
+    /** @var integer */
+    private $priority;
+
+    public function __construct(Dimension $dimension, $priority = 0)
+    {
+        $this->dimension = $dimension;
+        $this->priority = $priority;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getPriority()
+    {
+        return $this->priority;
+    }
+
+    /**
+     * @return Dimension
+     */
+    public function getDimension()
+    {
+        return $this->dimension;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function apply(Video $video, VideoInterface $format)
+    {
+        $commands = array();
+
+        $commands[] = '-vf';
+        $commands[] = 'scale=iw*min(' . $this->dimension->getWidth() . '/iw\,' . $this->dimension->getHeight() .'/ih):ih*min(' . $this->dimension->getWidth() . '/iw\,' . $this->dimension->getHeight() .'/ih),pad=' . $this->dimension->getWidth() . ':' . $this->dimension->getHeight() . ':(' . $this->dimension->getWidth() . '-iw)/2:(' . $this->dimension->getHeight() .'-ih)/2';
+
+        return $commands;
+    }
+}

src/FFMpeg/Filters/Video/VideoFilters.php

@@ -113,6 +113,20 @@ class VideoFilters extends AudioFilters
         return $this;
     }
 
+    /**
+     * Adds padding (black bars) to a video.
+     *
+     * @param Dimension $dimension
+     *
+     * @return VideoFilters
+     */
+    public function pad(Dimension $dimension)
+    {
+        $this->media->addFilter(new PadFilter($dimension));
+
+        return $this;
+    }
+
     public function rotate($angle)
     {
         $this->media->addFilter(new RotateFilter($angle, 30));
@@ -147,4 +161,18 @@ class VideoFilters extends AudioFilters
 
         return $this;
     }
+
+    /**
+     * Applies a custom filter: -vf foo bar
+     *
+     * @param string    $parameters
+     *
+     * @return VideoFilters
+     */
+    public function custom($parameters)
+    {
+        $this->media->addFilter(new CustomFilter($parameters));
+
+        return $this;
+    }
 }