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

Merge branch '0.4'

Browse source
This commit is contained in:
Romain Neutron 2013-12-17 17:55:39 +01:00
commit 580421ab5f
13 changed files with 29 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGELOG.md
View file

@ -1,6 +1,10 @@
CHANGELOG
---------
* 0.4.4 (12-17-2013)
* Fix width / height dimensions extraction.
* 0.4.3 (12-02-2013)
* Fix using rotate and resize filters at the same time (#78)

4
src/FFMpeg/FFMpegServiceProvider.php
View file

@ -35,7 +35,7 @@ class FFMpegServiceProvider implements ServiceProviderInterface
return array_replace($app['ffmpeg.default.configuration'], $app['ffmpeg.configuration']);
});
$app['ffmpeg'] = $app['ffmpeg.ffmpeg'] = $app->share(function(Application $app) {
$app['ffmpeg'] = $app['ffmpeg.ffmpeg'] = $app->share(function (Application $app) {
$configuration = $app['ffmpeg.configuration.build'];
if (isset($configuration['ffmpeg.timeout'])) {
@ -49,7 +49,7 @@ class FFMpegServiceProvider implements ServiceProviderInterface
return new ArrayCache();
});
$app['ffmpeg.ffprobe'] = $app->share(function(Application $app) {
$app['ffmpeg.ffprobe'] = $app->share(function (Application $app) {
$configuration = $app['ffmpeg.configuration.build'];
if (isset($configuration['ffmpeg.timeout'])) {

2
src/FFMpeg/FFProbe/DataMapping/Stream.php
View file

@ -71,8 +71,10 @@ class Stream extends AbstractData
}
if (null !== $displayRatio && null !== $sampleRatio) {
if ($sampleRatio[0] !== 1 && $sampleRatio[1] !== 1) {
$width = round($width / $sampleRatio[0] * $sampleRatio[1] * $displayRatio[0] / $displayRatio[1]);
}
}
return new Dimension($width, $height);
}

1
src/FFMpeg/Filters/Video/RotateFilter.php
View file

@ -13,7 +13,6 @@ namespace FFMpeg\Filters\Video;
use FFMpeg\Coordinate\Dimension;
use FFMpeg\Exception\InvalidArgumentException;
use FFMpeg\Exception\RuntimeException;
use FFMpeg\Media\Video;
use FFMpeg\Format\VideoInterface;

1
src/FFMpeg/Media/AbstractMediaType.php
View file

@ -12,7 +12,6 @@
namespace FFMpeg\Media;
use FFMpeg\Driver\FFMpegDriver;
use FFMpeg\Exception\InvalidArgumentException;
use FFMpeg\FFProbe;
use FFMpeg\Filters\FiltersCollection;
use FFMpeg\Media\MediaTypeInterface;

6
tests/FFMpeg/Tests/FFProbe/DataMapping/StreamTest.php
View file

@ -83,6 +83,12 @@ class StreamTest extends TestCase
$this->assertEquals(new Dimension(1280, 720), $stream->getDimensions());
}
public function testGetDimensionsFromVideoWith11SampleRatio()
{
$stream = new Stream(array('codec_type' => 'video', 'width' => 1920, 'height' => 1080, 'sample_aspect_ratio' => '1:1', 'display_aspect_ratio' => '16:9'));
$this->assertEquals(new Dimension(1920, 1080), $stream->getDimensions());
}
/**
* @dataProvider provideInvalidRatios
*/

1
tests/FFMpeg/Tests/Media/AudioTest.php
View file

@ -4,7 +4,6 @@ namespace FFMpeg\Tests\Media;
use FFMpeg\Media\Audio;
use Alchemy\BinaryDriver\Exception\ExecutionFailureException;
use FFMpeg\Format\ProgressableInterface;
use FFMpeg\Format\AudioInterface;
class AudioTest extends AbstractStreamableTestCase

1
tests/FFMpeg/Tests/Media/VideoTest.php
View file

@ -4,7 +4,6 @@ namespace FFMpeg\Tests\Media;
use FFMpeg\Media\Video;
use Alchemy\BinaryDriver\Exception\ExecutionFailureException;
use FFMpeg\Format\ProgressableInterface;
use FFMpeg\Format\VideoInterface;
class VideoTest extends AbstractStreamableTestCase