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

Merge pull request #35 from xammep-ua/timeoute-for-video-process

Browse source 
IMPORTANT If the conversion process (video) takes more time than the default value, the process is fails.
This commit is contained in:
Romain Neutron 2013-05-10 14:25:20 -07:00
commit 418ad8493b
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/FFMpeg/FFMpeg.php
View file

@ -265,6 +265,8 @@ class FFMpeg extends Binary
$process = $builder->getProcess(); $process = $builder->getProcess();
$process->setTimeout($this->timeout);
$this->logger->addInfo(sprintf('FFmpeg executes command %s', $process->getCommandLine())); $this->logger->addInfo(sprintf('FFmpeg executes command %s', $process->getCommandLine()));
try { try {
@ -397,6 +399,8 @@ class FFMpeg extends Binary
foreach ($passes as $process) { foreach ($passes as $process) {
$process->setTimeout($this->timeout);
$this->logger->addInfo(sprintf('FFmpeg executes command %s', $process->getCommandline())); $this->logger->addInfo(sprintf('FFmpeg executes command %s', $process->getCommandline()));
try { try {
@ -457,7 +461,7 @@ class FFMpeg extends Binary
while (0 !== $value % $multiple) { while (0 !== $value % $multiple) {
$value++; $value++;
} }
return $value; return $value;
} }