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

Revert "Audio Params" (#377)

Browse source 
* Revert "Correct  type in VideoFilters->framerate (#372)"

This reverts commit cedcd37bd2.

* Revert "fix sources parameter type (array) in concat function (#363)"

This reverts commit af00b9d6a3.

* Revert "Audio Params (#344)"

This reverts commit cb7d850338.
This commit is contained in:
Romain Biard 2017-06-30 21:27:10 +02:00 • committed by GitHub
commit 96225b2dff
8 changed files with 88 additions and 199 deletions
Download patch file Download diff file Expand all files Collapse all files

125
tests/Unit/Media/VideoTest.php
View file

@ -449,81 +449,60 @@ class VideoTest extends AbstractStreamableTestCase
return array(
array(false, array(array(
'-y',
'-i', __FILE__,
'-b:v', '663k',
'-refs', '6',
'-coder', '1',
'-sc_threshold', '40',
'-flags', '+loop',
'-me_range', '16',
'-subq', '7',
'-i_qfactor', '0.71',
'-qcomp', '0.6',
'-qdiff', '4',
'-trellis', '1',
'-b:a', '92k',
'-ac', 2,
'foo', 'bar',
'-pass', 1,
'-passlogfile', '/target/file',
), array(
'-y',
'-i', __FILE__,
'-b:v', '663k',
'-refs', '6',
'-coder', '1',
'-sc_threshold', '40',
'-flags', '+loop',
'-me_range', '16',
'-subq', '7',
'-i_qfactor', '0.71',
'-qcomp', '0.6',
'-qdiff', '4',
'-trellis', '1',
'-b:a', '92k',
'-ac', 2,
'foo', 'bar',
'-pass', 2,
'-passlogfile', '/target/file'
)), null, $format),
array(false, array(array(
'-y',
'-i', __FILE__,
'extra', 'param',
'-b:v', '665k',
'-refs', '6',
'-coder', '1',
'-sc_threshold', '40',
'-flags', '+loop',
'-me_range', '16',
'-subq', '7',
'-i_qfactor', '0.71',
'-qcomp', '0.6',
'-qdiff', '4',
'-trellis', '1',
'-b:a', '92k',
'-ac', '2',
'-pass', '1',
'-passlogfile', '/target/file',
'-y', '-i', __FILE__, '-b:v', '663k',
'-refs', '6', '-coder', '1', '-sc_threshold', '40', '-flags', '+loop',
'-me_range', '16', '-subq', '7', '-i_qfactor', '0.71', '-qcomp', '0.6',
'-qdiff', '4', '-trellis', '1', '-b:a', '92k', '-ac', 2, 'foo', 'bar', '-pass', 1, '-passlogfile',
'/target/file',
), array(
'-y', '-i', __FILE__,
'extra', 'param',
'-b:v', '665k',
'-refs', '6',
'-coder', '1',
'-sc_threshold', '40',
'-flags', '+loop',
'-me_range', '16',
'-subq', '7',
'-i_qfactor', '0.71',
'-qcomp', '0.6',
'-qdiff', '4',
'-trellis', '1',
'-b:a', '92k',
'-ac', '2',
'-pass', '2',
'-passlogfile', '/target/file',
'-b:v', '663k',
'-refs', '6', '-coder', '1', '-sc_threshold', '40', '-flags', '+loop',
'-me_range', '16', '-subq', '7', '-i_qfactor', '0.71', '-qcomp', '0.6',
'-qdiff', '4', '-trellis', '1', '-b:a', '92k', '-ac', 2, 'foo', 'bar', '-pass', 2, '-passlogfile',
'/target/file',
)), null, $format),
array(false, array(array(
'-y', '-i', __FILE__,
'-vcodec', 'gloubi-boulga-video',
'-acodec', 'patati-patata-audio', '-b:v', '664k',
'-refs', '6', '-coder', '1', '-sc_threshold', '40', '-flags', '+loop',
'-me_range', '16', '-subq', '7', '-i_qfactor', '0.71', '-qcomp', '0.6',
'-qdiff', '4', '-trellis', '1', '-b:a', '92k', '-ac', '2', '-pass', '1', '-passlogfile',
'/target/file',
), array(
'-y', '-i', __FILE__,
'-vcodec', 'gloubi-boulga-video',
'-acodec', 'patati-patata-audio',
'-b:v', '664k',
'-refs', '6', '-coder', '1', '-sc_threshold', '40', '-flags', '+loop',
'-me_range', '16', '-subq', '7', '-i_qfactor', '0.71', '-qcomp', '0.6',
'-qdiff', '4', '-trellis', '1', '-b:a', '92k', '-ac', '2', '-pass', '2', '-passlogfile',
'/target/file',
)), null, $audioVideoFormat),
array(false, array(array(
'-y', '-i', __FILE__,
'-vcodec', 'gloubi-boulga-video',
'-acodec', 'patati-patata-audio', '-b:v', '664k',
'-refs', '6', '-coder', '1', '-sc_threshold', '40', '-flags', '+loop',
'-me_range', '16', '-subq', '7', '-i_qfactor', '0.71', '-qcomp', '0.6',
'-qdiff', '4', '-trellis', '1', '-b:a', '92k', '-ac', '2',
'/target/file',
)), null, $audioVideoFormatSinglePass),
array(false, array(array(
'-y', '-i', __FILE__,
'extra', 'param','-b:v', '665k',
'-refs', '6', '-coder', '1', '-sc_threshold', '40', '-flags', '+loop',
'-me_range', '16', '-subq', '7', '-i_qfactor', '0.71', '-qcomp', '0.6',
'-qdiff', '4', '-trellis', '1', '-b:a', '92k', '-ac', '2', '-pass', '1', '-passlogfile',
'/target/file',
), array(
'-y', '-i', __FILE__,
'extra', 'param', '-b:v', '665k',
'-refs', '6', '-coder', '1', '-sc_threshold', '40', '-flags', '+loop',
'-me_range', '16', '-subq', '7', '-i_qfactor', '0.71', '-qcomp', '0.6',
'-qdiff', '4', '-trellis', '1', '-b:a', '92k', '-ac', '2', '-pass', '2', '-passlogfile',
'/target/file',
)), null, $formatExtra),
array(true, array(array(
'-y', '-i', __FILE__,