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

Added a getAsBase64() method to Frame object (#292)

Browse source 
* Added a getAsBase64() method to Frame object
* Merged the getBase64 method in save method
* Differentiate the two possible return
* Corrected typo (Edited from github)
This commit is contained in:
GuillaumeVerdon 2017-02-14 18:21:07 +01:00 • committed by Romain Biard
commit fe47ab74ef
2 changed files with 40 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

33
tests/Unit/Media/FrameTest.php
View file

@ -50,7 +50,7 @@ class FrameTest extends AbstractMediaTestCase
/**
* @dataProvider provideSaveOptions
*/
public function testSave($accurate, $commands)
public function testSave($accurate, $base64, $commands)
{
$driver = $this->getFFMpegDriverMock();
$ffprobe = $this->getFFProbeMock();
@ -67,24 +67,41 @@ class FrameTest extends AbstractMediaTestCase
->method('command')
->with($commands);
$frame = new Frame($this->getVideoMock(__FILE__), $driver, $ffprobe, $timecode);
$this->assertSame($frame, $frame->save($pathfile, $accurate));
if(!$base64) {
$frame = new Frame($this->getVideoMock(__FILE__), $driver, $ffprobe, $timecode);
$this->assertSame($frame, $frame->save($pathfile, $accurate, $base64));
}
else {
$frame = new Frame($this->getVideoMock(__FILE__), $driver, $ffprobe, $timecode);
$frame->save($pathfile, $accurate, $base64);
}
}
public function provideSaveOptions()
{
return array(
array(false, array(
array(false, false, array(
'-y', '-ss', 'timecode',
'-i', __FILE__,
'-vframes', '1',
'-f', 'image2')
),
array(true, array(
array(true, false, array(
'-y', '-i', __FILE__,
'-vframes', '1', '-ss', 'timecode',
'-f', 'image2'
)),
'-f', 'image2')
),
array(false, true, array(
'-y', '-ss', 'timecode',
'-i', __FILE__,
'-vframes', '1',
'-f', 'image2pipe', '-')
),
array(true, true, array(
'-y', '-i', __FILE__,
'-vframes', '1', '-ss', 'timecode',
'-f', 'image2pipe', '-')
)
);
}
}