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

Add resize mode, move getMultiple method to FFMpeg

Browse source
This commit is contained in:
grosroro 2012-05-28 19:46:49 +02:00
commit fc7529822f
6 changed files with 185 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

24
tests/src/FFMpeg/FFMpegTest.php
View file

@ -25,6 +25,7 @@ class FFMpegTest extends \PHPUnit_Framework_TestCase
$this->object = FFMpeg::load($this->logger);
$this->probe = FFProbe::load($this->logger);
$this->object->setProber($this->probe);
}
/**
@ -119,6 +120,7 @@ class FFMpegTest extends \PHPUnit_Framework_TestCase
$logger->pushHandler(new \Monolog\Handler\NullHandler());
$ffmpeg = new FFMpeg('wrongbinary', $logger);
$ffmpeg->setProber($this->probe);
$ffmpeg->open(__DIR__ . '/../../files/Test.ogv');
$format = new Format\Video\WebM();
@ -215,4 +217,26 @@ class FFMpegTest extends \PHPUnit_Framework_TestCase
unlink($dest);
}
/**
* @covers FFMpeg\FFMpeg::getMultiple
*/
public function testGetMultiple()
{
$object = FFMpegTester::load($this->logger);
$this->assertEquals(320, $object->getMultipleTester(321, 16));
$this->assertEquals(320, $object->getMultipleTester(319, 16));
$this->assertEquals(320, $object->getMultipleTester(313, 16));
$this->assertEquals(304, $object->getMultipleTester(312, 16));
$this->assertEquals(336, $object->getMultipleTester(329, 16));
$this->assertEquals(16, $object->getMultipleTester(8, 16));
}
}
class FFMpegTester extends FFMpeg
{
public function getMultipleTester($value, $multiple)
{
return parent::getMultiple($value, $multiple);
}
}

22
tests/src/FFMpeg/Format/DefaultVideoTest.php
View file

@ -27,8 +27,8 @@ class DefaultVideoTest extends \PHPUnit_Framework_TestCase
$this->assertEquals(640, $this->object->getHeight());
$this->object->setDimensions(242, 638);
$this->assertEquals(240, $this->object->getWidth());
$this->assertEquals(640, $this->object->getHeight());
$this->assertEquals(242, $this->object->getWidth());
$this->assertEquals(638, $this->object->getHeight());
}
/**
@ -155,19 +155,6 @@ class DefaultVideoTest extends \PHPUnit_Framework_TestCase
return array(array(-5), array(0));
}
/**
* @covers FFMpeg\Format\DefaultVideo::getMultiple
*/
public function testGetMultiple()
{
$this->assertEquals(320, $this->object->getMultiple(321, 16));
$this->assertEquals(320, $this->object->getMultiple(319, 16));
$this->assertEquals(320, $this->object->getMultiple(313, 16));
$this->assertEquals(304, $this->object->getMultiple(312, 16));
$this->assertEquals(336, $this->object->getMultiple(329, 16));
$this->assertEquals(16, $this->object->getMultiple(8, 16));
}
/**
* @covers FFMpeg\Format\DefaultVideo::getKiloBitrate
*/
@ -199,9 +186,4 @@ class DefaultVideoTester extends DefaultVideo
return '-f format';
}
public function getMultiple($value, $multiple)
{
return parent::getMultiple($value, $multiple);
}
}