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

Merge pull request #81 from alchemy-fr/fix-dimensions

Browse source 
Fix dimensions
This commit is contained in:
Romain Neutron 2013-12-17 08:54:46 -08:00
commit 8dfaf18158
3 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGELOG.md
View file

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

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

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

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()); $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 * @dataProvider provideInvalidRatios
*/ */