Fix using rotate and resize filters at the same time (#78)

tests/FFMpeg/Functional/VideoTranscodeTest.php

@@ -2,6 +2,9 @@
 
 namespace FFMpeg\Functional;
 
+use FFMpeg\Coordinate\Dimension;
+use FFMpeg\Filters\Video\ResizeFilter;
+use FFMpeg\Filters\Video\RotateFilter;
 use FFMpeg\Format\Video\X264;
 use FFMpeg\Media\Video;
 
@@ -54,4 +57,32 @@ class VideoTranscodeTest extends FunctionalTestCase
         $this->setExpectedException('FFMpeg\Exception\RuntimeException');
         $video->save(new X264('libvo_aacenc'), __DIR__ . '/output/output-x264.mp4');
     }
+
+    public function testTranscodePortraitVideo()
+    {
+        $filename = __DIR__ . '/output/output-x264.mp4';
+        if (is_file($filename)) {
+            unlink(__DIR__ . '/output/output-x264.mp4');
+        }
+
+        $ffmpeg = $this->getFFMpeg();
+        $video = $ffmpeg->open(__DIR__ . '/../../files/portrait.MOV');
+
+        $video->filters()
+            ->resize(new Dimension(320, 240), ResizeFilter::RESIZEMODE_INSET)
+            ->rotate(RotateFilter::ROTATE_90);
+        $video->save(new X264('libvo_aacenc'), $filename);
+
+        $dimension = $ffmpeg->getFFProbe()
+            ->streams($filename)
+            ->videos()
+            ->first()
+            ->getDimensions();
+
+        $this->assertLessThan(1, $dimension->getRatio(false)->getValue());
+        $this->assertEquals(240, $dimension->getHeight());
+
+        $this->assertFileExists($filename);
+        unlink($filename);
+    }
 }

tests/FFMpeg/Tests/Filters/Video/RotateFilterTest.php

@@ -2,18 +2,63 @@
 
 namespace FFMpeg\Tests\Filters\Video;
 
+use FFMpeg\FFProbe\DataMapping\Stream;
+use FFMpeg\FFProbe\DataMapping\StreamCollection;
 use FFMpeg\Filters\Video\RotateFilter;
 use FFMpeg\Tests\TestCase;
 
 class RotateFilterTest extends TestCase
 {
-    public function testApply()
+    /**
+     * @dataProvider provide90degresTranspositions
+     */
+    public function testApplyWithSizeTransformation($value)
     {
+        $stream = new Stream(array('width' => 320, 'height' => 240, 'codec_type' => 'video'));
+        $streams = new StreamCollection(array($stream));
+
         $video = $this->getVideoMock();
+        $video->expects($this->once())
+            ->method('getStreams')
+            ->will($this->returnValue($streams));
+
         $format = $this->getMock('FFMpeg\Format\VideoInterface');
 
-        $filter = new RotateFilter(RotateFilter::ROTATE_90);
-        $this->assertEquals(array('-vf', RotateFilter::ROTATE_90, '-metadata:s:v:0', 'rotate=0'), $filter->apply($video, $format));
+        $filter = new RotateFilter($value);
+        $this->assertEquals(array('-vf', $value, '-metadata:s:v:0', 'rotate=0'), $filter->apply($video, $format));
+
+        $this->assertEquals(240, $stream->get('width'));
+        $this->assertEquals(320, $stream->get('height'));
+    }
+
+    public function provide90degresTranspositions()
+    {
+        return array(
+            array(RotateFilter::ROTATE_90),
+            array(RotateFilter::ROTATE_270),
+        );
+    }
+
+    /**
+     * @dataProvider provideDegresWithoutTranspositions
+     */
+    public function testApplyWithoutSizeTransformation($value)
+    {
+        $video = $this->getVideoMock();
+        $video->expects($this->never())
+            ->method('getStreams');
+
+        $format = $this->getMock('FFMpeg\Format\VideoInterface');
+
+        $filter = new RotateFilter($value);
+        $this->assertEquals(array('-vf', $value, '-metadata:s:v:0', 'rotate=0'), $filter->apply($video, $format));
+    }
+
+    public function provideDegresWithoutTranspositions()
+    {
+        return array(
+            array(RotateFilter::ROTATE_180),
+        );
     }
 
     /**