dan/ffmpeg-mappable-media
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix CS

Browse source
This commit is contained in:
Romain Neutron 2012-05-25 15:44:43 +02:00
commit 0b74d0c30c
12 changed files with 36 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/FFMpeg/Binary.php
View file

@ -31,8 +31,8 @@ abstract class Binary implements AdapterInterface
/**
* Binary constructor
*
* @param type $binary The path file to the binary
* @param \Monolog\Logger $logger A logger
* @param type $binary The path file to the binary
* @param \Monolog\Logger $logger A logger
*/
public function __construct($binary, \Monolog\Logger $logger = null)
{
@ -49,8 +49,8 @@ abstract class Binary implements AdapterInterface
/**
* Load the static binary
*
* @param \Monolog\Logger $logger A logger
* @return \FFMpeg\Binary The binary
* @param \Monolog\Logger $logger A logger
* @return \FFMpeg\Binary The binary
* @throws Exception\BinaryNotFoundException
*/
public static function load(\Monolog\Logger $logger = null)

25
src/FFMpeg/FFMpeg.php
View file

@ -25,7 +25,7 @@ class FFMpeg extends Binary
/**
* Opens a file in order to be processed
*
* @param string $pathfile
* @param string $pathfile
* @return \FFMpeg\FFMpeg
* @throws Exception\InvalidFileArgumentException
*/
@ -58,8 +58,8 @@ class FFMpeg extends Binary
/**
*
* @param int $time The time in second where to take the snapshot
* @param string $output The pathfile where to write
* @param integer $time The time in second where to take the snapshot
* @param string $output The pathfile where to write
* @return \FFMpeg\FFMpeg
* @throws Exception\RuntimeException
* @throws Exception\LogicException
@ -101,9 +101,9 @@ class FFMpeg extends Binary
/**
* Encode the file to the specified format
*
* @param Format\AudioFormat $format The output format
* @param string $outputPathfile The pathfile where to write
* @param int $threads The number of threads to use
* @param Format\AudioFormat $format The output format
* @param string $outputPathfile The pathfile where to write
* @param integer $threads The number of threads to use
* @return \FFMpeg\FFMpeg
* @throws Exception\RuntimeException
* @throws Exception\LogicException
@ -132,9 +132,9 @@ class FFMpeg extends Binary
/**
* Encode to audio
*
* @param Format\AudioFormat $format The output format
* @param string $outputPathfile The pathfile where to write
* @param int $threads The number of threads to use
* @param Format\AudioFormat $format The output format
* @param string $outputPathfile The pathfile where to write
* @param integer $threads The number of threads to use
* @return \FFMpeg\FFMpeg
* @throws Exception\RuntimeException
*/
@ -168,9 +168,9 @@ class FFMpeg extends Binary
/**
* Encode to video
*
* @param Format\VideoFormat $format The output format
* @param string $outputPathfile The pathfile where to write
* @param int $threads The number of threads to use
* @param Format\VideoFormat $format The output format
* @param string $outputPathfile The pathfile where to write
* @param integer $threads The number of threads to use
* @return \FFMpeg\FFMpeg
* @throws Exception\RuntimeException
*/
@ -192,7 +192,6 @@ class FFMpeg extends Binary
. ' -trellis 1 -qscale 1 '
. '-acodec ' . $format->getAudioCodec() . ' -ab 92k ';
$tmpFile = new \SplFileInfo(tempnam(sys_get_temp_dir(), 'temp') . '.' . pathinfo($outputPathfile, PATHINFO_EXTENSION));
$passes = array();

6
src/FFMpeg/FFProbe.php
View file

@ -24,7 +24,7 @@ class FFProbe extends Binary
/**
* Probe the format of a given file
*
* @param string $pathfile
* @param string $pathfile
* @return string
* @throws Exception\InvalidFileArgumentException
* @throws Exception\RuntimeException
@ -43,7 +43,7 @@ class FFProbe extends Binary
/**
* Probe the streams contained in a given file
*
* @param string $pathfile
* @param string $pathfile
* @return string
* @throws Exception\InvalidFileArgumentException
* @throws Exception\RuntimeException
@ -61,7 +61,7 @@ class FFProbe extends Binary
/**
*
* @param string $command
* @param string $command
* @return string
* @throws Exception\RuntimeException
*/

2
src/FFMpeg/Format/Audio/Flac.php
View file

@ -29,4 +29,4 @@ class Flac extends DefaultAudioFormat
{
return array('flac');
}
}
}

2
src/FFMpeg/Format/Audio/Mp3.php
View file

@ -29,4 +29,4 @@ class Mp3 extends DefaultAudioFormat
{
return array('libmp3lame');
}
}
}

2
src/FFMpeg/Format/AudioFormat.php
View file

@ -26,4 +26,4 @@ interface AudioFormat
* @return array
*/
public function getAvailableAudioCodecs();
}
}

6
src/FFMpeg/Format/DefaultAudioFormat.php
View file

@ -46,7 +46,7 @@ abstract class DefaultAudioFormat implements AudioFormat
* Set the audio codec, Should be in the available ones, otherwise an
* exception is thrown
*
* @param string $audioCodec
* @param string $audioCodec
* @throws \InvalidArgumentException
*/
public function setAudioCodec($audioCodec)
@ -74,7 +74,7 @@ abstract class DefaultAudioFormat implements AudioFormat
/**
* Set the audio sample rate
*
* @param int $audioSampleRate
* @param integer $audioSampleRate
* @throws \InvalidArgumentException
*/
public function setAudioSampleRate($audioSampleRate)
@ -99,7 +99,7 @@ abstract class DefaultAudioFormat implements AudioFormat
/**
* Set the kiloBitrate value
*
* @param int $kiloBitrate
* @param int integer $kiloBitrate
* @throws \InvalidArgumentException
*/
public function setKiloBitrate($kiloBitrate)

14
src/FFMpeg/Format/DefaultVideoFormat.php
View file

@ -53,8 +53,8 @@ abstract class DefaultVideoFormat extends DefaultAudioFormat implements VideoFor
/**
* Set the dimensions
*
* @param int $width The heigth
* @param int $height The width
* @param integer $width The heigth
* @param integer $height The width
* @throws \InvalidArgumentException
*/
public function setDimensions($width, $height)
@ -83,7 +83,7 @@ abstract class DefaultVideoFormat extends DefaultAudioFormat implements VideoFor
/**
* Set the framerate
*
* @param int $frameRate
* @param integer $frameRate
* @throws \InvalidArgumentException
*/
public function setFrameRate($frameRate)
@ -109,7 +109,7 @@ abstract class DefaultVideoFormat extends DefaultAudioFormat implements VideoFor
* Set the video codec, Should be in the available ones, otherwise an
* exception is thrown
*
* @param string $videoCodec
* @param string $videoCodec
* @throws \InvalidArgumentException
*/
public function setVideoCodec($videoCodec)
@ -137,7 +137,7 @@ abstract class DefaultVideoFormat extends DefaultAudioFormat implements VideoFor
/**
* Set the GOP size
*
* @param int $GOPsize
* @param integer $GOPsize
* @throws \InvalidArgumentException
*/
public function setGOPsize($GOPsize)
@ -152,8 +152,8 @@ abstract class DefaultVideoFormat extends DefaultAudioFormat implements VideoFor
/**
* Returns the nearest multiple for a value
*
* @param int $value
* @param int $multiple
* @param integer $value
* @param integer $multiple
* @return int
*/
protected function getMultiple($value, $multiple)

2
src/FFMpeg/Format/Video/Ogg.php
View file

@ -38,4 +38,4 @@ class Ogg extends DefaultVideoFormat
{
return array('libtheora');
}
}
}

2
src/FFMpeg/Format/Video/WebM.php
View file

@ -46,4 +46,4 @@ class WebM extends DefaultVideoFormat
{
return array('libvpx');
}
}
}

2
src/FFMpeg/Format/Video/X264.php
View file

@ -38,4 +38,4 @@ class X264 extends DefaultVideoFormat
{
return array('libx264');
}
}
}

2
src/FFMpeg/Format/VideoFormat.php
View file

@ -30,4 +30,4 @@ interface VideoFormat extends AudioFormat
* @return array
*/
public function getAvailableVideoCodecs();
}
}