From 3a080613e66b0daaea1b896b27397d9e0b496702 Mon Sep 17 00:00:00 2001 From: Romain Neutron Date: Tue, 12 Aug 2014 20:49:42 +0200 Subject: [PATCH] Fix CS --- src/FFMpeg/FFMpegServiceProvider.php | 2 -- src/FFMpeg/Filters/Audio/AudioFilters.php | 1 - src/FFMpeg/Filters/Video/CustomFilter.php | 3 ++- src/FFMpeg/Filters/Video/VideoFilters.php | 2 +- src/FFMpeg/Filters/Video/WatermarkFilter.php | 16 +++++----------- src/FFMpeg/Media/AbstractMediaType.php | 1 - src/FFMpeg/Media/Frame.php | 1 - src/FFMpeg/Media/Video.php | 9 ++++----- 8 files changed, 12 insertions(+), 23 deletions(-) diff --git a/src/FFMpeg/FFMpegServiceProvider.php b/src/FFMpeg/FFMpegServiceProvider.php index 4bb489b..6aa9735 100644 --- a/src/FFMpeg/FFMpegServiceProvider.php +++ b/src/FFMpeg/FFMpegServiceProvider.php @@ -12,8 +12,6 @@ namespace FFMpeg; use Doctrine\Common\Cache\ArrayCache; -use FFMpeg\FFMpeg; -use FFMpeg\FFProbe; use Silex\Application; use Silex\ServiceProviderInterface; diff --git a/src/FFMpeg/Filters/Audio/AudioFilters.php b/src/FFMpeg/Filters/Audio/AudioFilters.php index ddce8f1..fe328c5 100644 --- a/src/FFMpeg/Filters/Audio/AudioFilters.php +++ b/src/FFMpeg/Filters/Audio/AudioFilters.php @@ -3,7 +3,6 @@ namespace FFMpeg\Filters\Audio; use FFMpeg\Media\Audio; -use FFMpeg\Filters\Audio\AudioResamplableFilter; class AudioFilters { diff --git a/src/FFMpeg/Filters/Video/CustomFilter.php b/src/FFMpeg/Filters/Video/CustomFilter.php index 4946c62..eb75079 100644 --- a/src/FFMpeg/Filters/Video/CustomFilter.php +++ b/src/FFMpeg/Filters/Video/CustomFilter.php @@ -24,7 +24,7 @@ class CustomFilter implements VideoFilterInterface * A custom filter, useful if you want to build complex filters * * @param string $filter - * @param int $priority + * @param int $priority */ public function __construct($filter, $priority = 0) { @@ -46,6 +46,7 @@ class CustomFilter implements VideoFilterInterface public function apply(Video $video, VideoInterface $format) { $commands = array('-vf', $this->filter); + return $commands; } } diff --git a/src/FFMpeg/Filters/Video/VideoFilters.php b/src/FFMpeg/Filters/Video/VideoFilters.php index 91c929d..55281e4 100644 --- a/src/FFMpeg/Filters/Video/VideoFilters.php +++ b/src/FFMpeg/Filters/Video/VideoFilters.php @@ -106,7 +106,7 @@ class VideoFilters extends AudioFilters /** * @param string $imagePath - * @param array $coordinates + * @param array $coordinates * * @return $this */ diff --git a/src/FFMpeg/Filters/Video/WatermarkFilter.php b/src/FFMpeg/Filters/Video/WatermarkFilter.php index 065f177..40bb8fc 100644 --- a/src/FFMpeg/Filters/Video/WatermarkFilter.php +++ b/src/FFMpeg/Filters/Video/WatermarkFilter.php @@ -13,7 +13,6 @@ namespace FFMpeg\Filters\Video; use FFMpeg\Format\VideoInterface; use FFMpeg\Media\Video; -use FFMpeg\Coordinate\TimeCode; class WatermarkFilter implements VideoFilterInterface { @@ -24,7 +23,6 @@ class WatermarkFilter implements VideoFilterInterface /** @var integer */ private $priority; - public function __construct($watermarkPath, array $coordinates = array(), $priority = 0) { $this->watermarkPath = $watermarkPath; @@ -47,25 +45,21 @@ class WatermarkFilter implements VideoFilterInterface { $position = isset($this->coordinates['position']) ? $this->coordinates['position'] : 'absolute'; - switch($position) { + switch ($position) { case 'relative': if (isset($this->coordinates['top'])) { $y = $this->coordinates['top']; - } - elseif (isset($this->coordinates['bottom'])) { + } elseif (isset($this->coordinates['bottom'])) { $y = sprintf('main_h - %d - overlay_h', $this->coordinates['bottom']); - } - else { + } else { $y = 0; } if (isset($this->coordinates['left'])) { $x = $this->coordinates['left']; - } - elseif (isset($this->coordinates['right'])) { + } elseif (isset($this->coordinates['right'])) { $x = sprintf('main_w - %d - overlay_w', $this->coordinates['right']); - } - else { + } else { $x = 0; } diff --git a/src/FFMpeg/Media/AbstractMediaType.php b/src/FFMpeg/Media/AbstractMediaType.php index 45bb0c6..5523c0b 100644 --- a/src/FFMpeg/Media/AbstractMediaType.php +++ b/src/FFMpeg/Media/AbstractMediaType.php @@ -14,7 +14,6 @@ namespace FFMpeg\Media; use FFMpeg\Driver\FFMpegDriver; use FFMpeg\FFProbe; use FFMpeg\Filters\FiltersCollection; -use FFMpeg\Media\MediaTypeInterface; abstract class AbstractMediaType implements MediaTypeInterface { diff --git a/src/FFMpeg/Media/Frame.php b/src/FFMpeg/Media/Frame.php index b50e549..7b08eb3 100644 --- a/src/FFMpeg/Media/Frame.php +++ b/src/FFMpeg/Media/Frame.php @@ -18,7 +18,6 @@ use FFMpeg\Driver\FFMpegDriver; use FFMpeg\FFProbe; use FFMpeg\Exception\RuntimeException; use FFMpeg\Coordinate\TimeCode; -use FFMpeg\Media\Video; class Frame extends AbstractMediaType { diff --git a/src/FFMpeg/Media/Video.php b/src/FFMpeg/Media/Video.php index ae2996f..f802f5b 100644 --- a/src/FFMpeg/Media/Video.php +++ b/src/FFMpeg/Media/Video.php @@ -22,7 +22,6 @@ use FFMpeg\Format\FormatInterface; use FFMpeg\Format\ProgressableInterface; use FFMpeg\Format\AudioInterface; use FFMpeg\Format\VideoInterface; -use FFMpeg\Media\Frame; use Neutron\TemporaryFilesystem\Manager as FsManager; class Video extends Audio @@ -69,12 +68,12 @@ class Video extends Audio if ($this->driver->getConfiguration()->has('ffmpeg.threads')) { $filters->add(new SimpleFilter(array('-threads', $this->driver->getConfiguration()->get('ffmpeg.threads')))); } - if ($format instanceOf VideoInterface) { + if ($format instanceof VideoInterface) { if (null !== $format->getVideoCodec()) { $filters->add(new SimpleFilter(array('-vcodec', $format->getVideoCodec()))); } } - if ($format instanceOf AudioInterface) { + if ($format instanceof AudioInterface) { if (null !== $format->getAudioCodec()) { $filters->add(new SimpleFilter(array('-acodec', $format->getAudioCodec()))); } @@ -84,7 +83,7 @@ class Video extends Audio $commands = array_merge($commands, $filter->apply($this, $format)); } - if ($format instanceOf VideoInterface) { + if ($format instanceof VideoInterface) { $commands[] = '-b:v'; $commands[] = $format->getKiloBitrate() . 'k'; $commands[] = '-refs'; @@ -109,7 +108,7 @@ class Video extends Audio $commands[] = '1'; } - if ($format instanceOf AudioInterface) { + if ($format instanceof AudioInterface) { if (null !== $format->getAudioKiloBitrate()) { $commands[] = '-b:a'; $commands[] = $format->getAudioKiloBitrate() . 'k';