From f62077ab64262f6c7e1ef15e080db30bf42c7f5e Mon Sep 17 00:00:00 2001 From: Romain Neutron Date: Fri, 30 Jan 2015 20:05:30 +0100 Subject: [PATCH] =?UTF-8?q?gn=C3=A9=C3=A9=C3=A9=C3=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FFMpeg/Tests/Filters/Video/WatermarkFilterTest.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/FFMpeg/Tests/Filters/Video/WatermarkFilterTest.php b/tests/FFMpeg/Tests/Filters/Video/WatermarkFilterTest.php index ea58e44..a63d208 100644 --- a/tests/FFMpeg/Tests/Filters/Video/WatermarkFilterTest.php +++ b/tests/FFMpeg/Tests/Filters/Video/WatermarkFilterTest.php @@ -20,7 +20,7 @@ class WatermarkFilterTest extends TestCase $format = $this->getMock('FFMpeg\Format\VideoInterface'); $filter = new WatermarkFilter(__DIR__ . '/../../../../files/watermark.png'); - $this->assertEquals(array('-vf', 'movie=/Users/romain.viovi/Documents/workspace/PHP-FFMpeg/tests/FFMpeg/Tests/Filters/Video/../../../../files/watermark.png [watermark]; [in][watermark] overlay=0:0 [out]'), $filter->apply($video, $format)); + $this->assertEquals(array('-vf', 'movie='.__DIR__ .'/../../../../files/watermark.png [watermark]; [in][watermark] overlay=0:0 [out]'), $filter->apply($video, $format)); // check size of video is unchanged $this->assertEquals(320, $stream->get('width')); @@ -37,27 +37,27 @@ class WatermarkFilterTest extends TestCase 'position' => 'absolute', 'x' => 10, 'y' => 5 )); - $this->assertEquals(array('-vf', 'movie=/Users/romain.viovi/Documents/workspace/PHP-FFMpeg/tests/FFMpeg/Tests/Filters/Video/../../../../files/watermark.png [watermark]; [in][watermark] overlay=10:5 [out]'), $filter->apply($video, $format)); + $this->assertEquals(array('-vf', 'movie='.__DIR__ .'/../../../../files/watermark.png [watermark]; [in][watermark] overlay=10:5 [out]'), $filter->apply($video, $format)); // test position relative $filter = new WatermarkFilter(__DIR__ . '/../../../../files/watermark.png', array( 'position' => 'relative', 'bottom' => 10, 'left' => 5 )); - $this->assertEquals(array('-vf', 'movie=/Users/romain.viovi/Documents/workspace/PHP-FFMpeg/tests/FFMpeg/Tests/Filters/Video/../../../../files/watermark.png [watermark]; [in][watermark] overlay=5:main_h - 10 - overlay_h [out]'), $filter->apply($video, $format)); + $this->assertEquals(array('-vf', 'movie='.__DIR__ .'/../../../../files/watermark.png [watermark]; [in][watermark] overlay=5:main_h - 10 - overlay_h [out]'), $filter->apply($video, $format)); // test position relative $filter = new WatermarkFilter(__DIR__ . '/../../../../files/watermark.png', array( 'position' => 'relative', 'bottom' => 5, 'right' => 4 )); - $this->assertEquals(array('-vf', 'movie=/Users/romain.viovi/Documents/workspace/PHP-FFMpeg/tests/FFMpeg/Tests/Filters/Video/../../../../files/watermark.png [watermark]; [in][watermark] overlay=main_w - 4 - overlay_w:main_h - 5 - overlay_h [out]'), $filter->apply($video, $format)); + $this->assertEquals(array('-vf', 'movie='.__DIR__ .'/../../../../files/watermark.png [watermark]; [in][watermark] overlay=main_w - 4 - overlay_w:main_h - 5 - overlay_h [out]'), $filter->apply($video, $format)); // test position relative $filter = new WatermarkFilter(__DIR__ . '/../../../../files/watermark.png', array( 'position' => 'relative', 'left' => 5, 'top' => 11 )); - $this->assertEquals(array('-vf', 'movie=/Users/romain.viovi/Documents/workspace/PHP-FFMpeg/tests/FFMpeg/Tests/Filters/Video/../../../../files/watermark.png [watermark]; [in][watermark] overlay=5:11 [out]'), $filter->apply($video, $format)); + $this->assertEquals(array('-vf', 'movie='.__DIR__ .'/../../../../files/watermark.png [watermark]; [in][watermark] overlay=5:11 [out]'), $filter->apply($video, $format)); } }