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

9
src/FFMpeg/FFMpeg.php
View file

@ -58,7 +58,7 @@ class FFMpeg extends Binary
/** /**
* *
* @param int $time The time in second where to take the snapshot * @param integer $time The time in second where to take the snapshot
* @param string $output The pathfile where to write * @param string $output The pathfile where to write
* @return \FFMpeg\FFMpeg * @return \FFMpeg\FFMpeg
* @throws Exception\RuntimeException * @throws Exception\RuntimeException
@ -103,7 +103,7 @@ class FFMpeg extends Binary
* *
* @param Format\AudioFormat $format The output format * @param Format\AudioFormat $format The output format
* @param string $outputPathfile The pathfile where to write * @param string $outputPathfile The pathfile where to write
* @param int $threads The number of threads to use * @param integer $threads The number of threads to use
* @return \FFMpeg\FFMpeg * @return \FFMpeg\FFMpeg
* @throws Exception\RuntimeException * @throws Exception\RuntimeException
* @throws Exception\LogicException * @throws Exception\LogicException
@ -134,7 +134,7 @@ class FFMpeg extends Binary
* *
* @param Format\AudioFormat $format The output format * @param Format\AudioFormat $format The output format
* @param string $outputPathfile The pathfile where to write * @param string $outputPathfile The pathfile where to write
* @param int $threads The number of threads to use * @param integer $threads The number of threads to use
* @return \FFMpeg\FFMpeg * @return \FFMpeg\FFMpeg
* @throws Exception\RuntimeException * @throws Exception\RuntimeException
*/ */
@ -170,7 +170,7 @@ class FFMpeg extends Binary
* *
* @param Format\VideoFormat $format The output format * @param Format\VideoFormat $format The output format
* @param string $outputPathfile The pathfile where to write * @param string $outputPathfile The pathfile where to write
* @param int $threads The number of threads to use * @param integer $threads The number of threads to use
* @return \FFMpeg\FFMpeg * @return \FFMpeg\FFMpeg
* @throws Exception\RuntimeException * @throws Exception\RuntimeException
*/ */
@ -192,7 +192,6 @@ class FFMpeg extends Binary
. ' -trellis 1 -qscale 1 ' . ' -trellis 1 -qscale 1 '
. '-acodec ' . $format->getAudioCodec() . ' -ab 92k '; . '-acodec ' . $format->getAudioCodec() . ' -ab 92k ';
$tmpFile = new \SplFileInfo(tempnam(sys_get_temp_dir(), 'temp') . '.' . pathinfo($outputPathfile, PATHINFO_EXTENSION)); $tmpFile = new \SplFileInfo(tempnam(sys_get_temp_dir(), 'temp') . '.' . pathinfo($outputPathfile, PATHINFO_EXTENSION));
$passes = array(); $passes = array();

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

@ -74,7 +74,7 @@ abstract class DefaultAudioFormat implements AudioFormat
/** /**
* Set the audio sample rate * Set the audio sample rate
* *
* @param int $audioSampleRate * @param integer $audioSampleRate
* @throws \InvalidArgumentException * @throws \InvalidArgumentException
*/ */
public function setAudioSampleRate($audioSampleRate) public function setAudioSampleRate($audioSampleRate)
@ -99,7 +99,7 @@ abstract class DefaultAudioFormat implements AudioFormat
/** /**
* Set the kiloBitrate value * Set the kiloBitrate value
* *
* @param int $kiloBitrate * @param int integer $kiloBitrate
* @throws \InvalidArgumentException * @throws \InvalidArgumentException
*/ */
public function setKiloBitrate($kiloBitrate) public function setKiloBitrate($kiloBitrate)

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

@ -53,8 +53,8 @@ abstract class DefaultVideoFormat extends DefaultAudioFormat implements VideoFor
/** /**
* Set the dimensions * Set the dimensions
* *
* @param int $width The heigth * @param integer $width The heigth
* @param int $height The width * @param integer $height The width
* @throws \InvalidArgumentException * @throws \InvalidArgumentException
*/ */
public function setDimensions($width, $height) public function setDimensions($width, $height)
@ -83,7 +83,7 @@ abstract class DefaultVideoFormat extends DefaultAudioFormat implements VideoFor
/** /**
* Set the framerate * Set the framerate
* *
* @param int $frameRate * @param integer $frameRate
* @throws \InvalidArgumentException * @throws \InvalidArgumentException
*/ */
public function setFrameRate($frameRate) public function setFrameRate($frameRate)
@ -137,7 +137,7 @@ abstract class DefaultVideoFormat extends DefaultAudioFormat implements VideoFor
/** /**
* Set the GOP size * Set the GOP size
* *
* @param int $GOPsize * @param integer $GOPsize
* @throws \InvalidArgumentException * @throws \InvalidArgumentException
*/ */
public function setGOPsize($GOPsize) public function setGOPsize($GOPsize)
@ -152,8 +152,8 @@ abstract class DefaultVideoFormat extends DefaultAudioFormat implements VideoFor
/** /**
* Returns the nearest multiple for a value * Returns the nearest multiple for a value
* *
* @param int $value * @param integer $value
* @param int $multiple * @param integer $multiple
* @return int * @return int
*/ */
protected function getMultiple($value, $multiple) protected function getMultiple($value, $multiple)