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

Fix getBinary

Browse source
This commit is contained in:
Romain Neutron 2012-05-11 00:34:19 +02:00
commit f567f31602
3 changed files with 5 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/FFMpeg/Binary.php
View file

@ -59,7 +59,7 @@ abstract class Binary implements AdapterInterface
$binary = null;
foreach (static::getBinaryName() as $candidate) {
if (null !== $binary = $finder->find(static::getBinaryName())) {
if (null !== $binary = $finder->find($candidate)) {
break;
}
}

11
src/FFMpeg/FFMpeg.php
View file

@ -174,7 +174,7 @@ class FFMpeg extends Binary
* @return \FFMpeg\FFMpeg
* @throws Exception\RuntimeException
*/
protected function encodeVideo(Format\VideoFormat $format, $outputPathfile, $threads, $control)
protected function encodeVideo(Format\VideoFormat $format, $outputPathfile, $threads)
{
$cmd_part1 = $this->binary
. ' -y -i '
@ -209,14 +209,7 @@ class FFMpeg extends Binary
$process = new Process($pass);
try {
// $process->run();
$process->run(function($data, $dodo) {
// echo $data.$dodo."\nend chunk\n";
$matches = array();
preg_match('/time=([0-9:\.]+)/', $dodo, $matches);
if ($matches[1])
var_dump($matches);
});
$process->run();
} catch (\RuntimeException $e) {
break;
}

4
tests/src/FFMpeg/BinaryTest.php
View file

@ -43,7 +43,7 @@ class BinaryTester extends Binary
protected static function getBinaryName()
{
return 'php';
return array('php');
}
}
@ -53,7 +53,7 @@ class BinaryTesterWrongBinary extends Binary
protected static function getBinaryName()
{
return '';
return array('');
}
}