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

Fix width / height detection

Browse source
This commit is contained in:
Romain Neutron 2013-12-17 17:38:12 +01:00
commit c4fcee4517
2 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

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

8
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
*/
@ -91,7 +97,7 @@ class StreamTest extends TestCase
$stream = new Stream(array('codec_type' => 'video', 'width' => 960, 'height' => 720, 'sample_aspect_ratio' => $invalidRatio, 'display_aspect_ratio' => '16:9'));
$this->assertEquals(new Dimension(960, 720), $stream->getDimensions());
}
public function provideInvalidRatios()
{
return array(array('0:1'), array('2:1:3'));