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

Fix dimensions
PHP-FFMpeg · Dec 17, 2013 · 8dfaf18 · 8dfaf18
2 parents 197b534 + 9dd5dec
commit 8dfaf18
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -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)

diff --git a/src/FFMpeg/FFProbe/DataMapping/Stream.php b/src/FFMpeg/FFProbe/DataMapping/Stream.php
@@ -71,7 +71,9 @@ public function getDimensions()
         }
 
         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);

diff --git a/tests/FFMpeg/Tests/FFProbe/DataMapping/StreamTest.php b/tests/FFMpeg/Tests/FFProbe/DataMapping/StreamTest.php
@@ -83,6 +83,12 @@ public function testGetDimensionsFromVideoWithDisplayRatio()
         $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 @@ public function testGetDimensionsFromVideoWithInvalidDisplayRatio($invalidRatio)
         $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'));