Commit graph

139 commits

Author SHA1 Message Date
Ilya Chekalsky
afffd627ff
Add ability to disable -b:v (#767)
* adds ability to disable -b:v

* Fixed a bug in the way the paths to the test files were defined in the AudioConcatenationTest.php file

* Added a test to make sure that a negative kilobit rate returns an exception

* Added a test to check that the -b:v options are not set if the kilo bitrate is set to 0

* Disable 2pass when -b:v is disabled

Co-Authored-By: Philipp Doblhofer <6283313+philipp-doblhofer@users.noreply.github.com>

* Changed the way we call the class FFMpeg\Exception\InvalidArgumentException in tests

* Changed the way we call the class FFMpeg\Exception\InvalidArgumentException in tests

* Updated the README to include this new option

Co-authored-by: Romain Biard <romain.biard@gmail.com>
Co-authored-by: Philipp Doblhofer <6283313+philipp-doblhofer@users.noreply.github.com>
2021-03-04 19:17:34 +01:00
Boris Momčilović
a1a3281dbf
PHP 8 Support (#782)
Thanks @kornrunner for these changes:
* Test against PHP 8
* U-Tests: FFProbe: OptionsTester: handle phpunit deprecation of at
* FiltersCollection: tweak for call_user_func_array and PHP 8 named arguments
2020-12-18 15:27:38 +01:00
CaliforniaMountainSnake
5b85b6b84d Merge remote-tracking branch 'upstream/master' 2020-03-23 18:04:18 +03:00
CaliforniaMountainSnake
0d3bed21a7 ComplexMedia has been renamed to the AdvancedMedia. 2020-03-23 17:47:36 +03:00
CaliforniaMountainSnake
4469847d46 Minor improvements of the ComplexMedia 2020-03-02 14:50:42 +03:00
CaliforniaMountainSnake
71766fed47 Added the BC Layer alias for some phpunit methods to fix build at php <= 5.5. 2020-02-27 20:59:26 +03:00
CaliforniaMountainSnake
d6f95508a9 Added runtime check of the ffmpeg version before starting the command in the ComplexMedia. Added the FFMpegDriver::getVersion() method. 2020-02-26 12:33:45 +03:00
CaliforniaMountainSnake
580fb21d5a Merge remote-tracking branch 'upstream/master' 2020-02-26 09:43:23 +03:00
Ilja Lukin
73fdec8290 Added initial parameters 2020-02-24 21:42:38 +01:00
CaliforniaMountainSnake
6dc260fd3d Added ffmpeg version checking in the ComplexMediaTest::testXStackFilter(). 2020-02-20 14:34:21 +03:00
Alexander Schranz
7474bf936f Add bc layer for older php and phpunit versions 2020-02-19 21:52:13 +01:00
CaliforniaMountainSnake
f20ad8a82e Added the ComplexMedia type and the possibility to use -filter_complex and -map features. Added some built-in complex filters. Added the unit and functional tests of the new features. README.md has been updated. 2020-02-18 13:49:32 +03:00
Alexander Schranz
8837f4b115 Set PhpUnit version for older php 2020-02-14 09:08:50 +01:00
Alexander Schranz
14dc6a8b1b Fix PhpUnit tests for newer php version 2020-02-13 00:39:31 +01:00
Alexander Schranz
537f61095f Fix mocking of objects for newer phpunit version 2020-02-13 00:23:11 +01:00
Jens Hausdorf
fab3638caf
Merge branch 'master' into master 2018-11-24 08:32:18 +01:00
Jens Hausdorf
bf19f705a8
Fix formatting 2018-11-23 21:36:39 +01:00
Ilja Lukin
fa2f89a0cf
fixed formatting 2018-11-23 21:27:28 +01:00
Ilja Lukin
7b98238fa2 added unit test for custom frame filter 2018-11-23 20:14:26 +01:00
Jon Hassall
fa37258502 Added custom filters for Audio, in the same way as custom filters are available for Video 2018-10-20 14:36:10 +01:00
Jens Hausdorf
279227ab2a
Merge branch 'master' into master 2018-09-05 09:27:36 +02:00
Miroslav Nový
0b871e59e7 Clip using input seek (#543)
Making video clip by input seeking
2018-07-06 18:51:09 +02:00
Lasse Lehtinen
4f40ba9d96 Merge remote-tracking branch 'upstream/master' 2018-05-30 15:02:09 +03:00
qcjackman
1711c66aad fix the test expectations 2018-05-28 14:00:32 +08:00
Lasse Lehtinen
687a266ce0 Adjusted tests 2018-03-26 19:03:38 +03:00
Lasse Lehtinen
7e8dd72052 Adjusted tests based on code review 2018-03-26 18:25:50 +03:00
Lasse Lehtinen
633bb60dc6 Added tests for audio concatenation 2018-03-23 17:37:29 +02:00
Shaked Klein Orbach
afc236985e fix identation 2018-03-08 10:53:38 -06:00
Shaked Klein Orbach
fcd494f723 improve tests, validate frame file type 2018-03-07 14:27:27 -06:00
Shaked Klein Orbach
9fe417745e add phpdoc & test png files 2018-03-06 17:16:37 -06:00
Shaked Klein Orbach
ae92dd5887 allow to set frame file type instead of hardcoded jpg 2018-03-05 18:59:57 -06:00
Igor Kosteski
368c65a7d5 Comment fix, Video size calculation base on the new video duration and added case on the VideoProgressListenerTest test class. 2018-02-19 10:59:58 +01:00
Gabriel Caruso
ee4edc8b02 Use PHPUnit\Framework\TestCase instead of PHPUnit_Framework_TestCase 2017-11-08 18:38:32 -02:00
Ivan Ganev
8950598211 addressing author requested fixes/changes 2017-11-05 16:28:24 +02:00
Ivan Ganev
60534a1dbb added waveform color option 2017-11-02 17:33:41 +02:00
Ivan Ganev
9314f64f54 added waveform color option 2017-11-02 17:28:12 +02:00
jens1o
74a1d6539c
Add FFProbe#isValid
fixes #394
2017-09-19 19:28:34 +02:00
Le_Tung
47b8d84979 add dynamic point Unit Test 2017-09-19 10:44:11 +09:00
Romain Biard
96225b2dff Revert "Audio Params" (#377)
* 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.
2017-06-30 21:27:10 +02:00
Jens Hausdorf
cb7d850338 Audio Params (#344)
* 🚀 video profile and level
* add missing getter
* add missing use statement
* add missing return $this
* 1 test fixed
* fix other tests and clean up
We MUST rewrite them. They are too complex when it comes to new features
* trim trailing whitespaces
* fix typo
* 🚀 support for additional params in audio
2017-06-27 23:44:26 +02:00
Kyle Tse
4cfcabd7b5 Support resize and watermark in ordering. (#343)
* Support multiple -vf commands

Marge Filters into one command

* Ordering Scale

Using -vf to scale instead of -s to have ordering

* Correct the ResizeFilterTest

* Remove useless comments

* Fixed filter bug

Add checking on filters if only one process.

* Fixed typo error
2017-06-27 23:18:22 +02:00
Sébastien Nikolaou
e8b247891b Fix missing audio artwork metadata on multiple exports (#340)
When the metadata filter is applied on an `Audio` media, the `artwork`
parameter was being unset from the metadata array.

Saving the same `Audio` instance into multiple formats generated the
correct commands for the first export, but the subsequent commands were
missing the `artwork` parameter.

This commit fixes this issue by copying (by value) the `metaArr`
property to a local variable each time the filter is applied.
2017-04-12 14:40:31 -03:00
Jens Hausdorf
ecd50cd5f1 Audio Clip (#314)
* add missing headers
* add audio clip filter and improve timecode
* php 5.4 :(
* prevent audio from being reencoded
* php 5.x: Really?
* fix tests... I need to concentrate...
2017-03-06 10:17:12 -03:00
GuillaumeVerdon
fe47ab74ef Added a getAsBase64() method to Frame object (#292)
* Added a getAsBase64() method to Frame object
* Merged the getBase64 method in save method
* Differentiate the two possible return
* Corrected typo (Edited from github)
2017-02-14 14:21:07 -03:00
Romain Biard
21c28dea25 Concatenation feature (#287)
* Creation of a feature to concatenate files into a new one.

* Update of the README
* Creation of the tests for the concatenation
* We use an array of videos instead of a path to a text files
* We use the bundle Temporary File System instead of getcwd
2017-02-14 13:55:07 -03:00
Romain Biard
6ba011de3a Methods getAdditionalParams & setAdditionalParams which allow the user to pass additional parameters to the encoding request (#284)
* Modification of the format Video to add additional parameters based on user's desire
* Update of the README
* Working version of this feature. Still needs tests
* Fixing the tests of FFMPeg\Media\Video
* Setting up tests for the additionalParams feature
* Correction des tests
* Modifying tests. They work locally but not on Travis.
* Still trying to understand why Travis is throwing errors when PHPUnit is not.
* Add the additional params at the end of the command
* Fixed the tests and the way we add the parameters
* We remove log files
2017-01-24 15:19:32 -03:00
Romain Biard
2b5d18f510 Creation of a Gif Media to be able to extract gif animation based on video sequences (#285)
* Creation of a media to extract video sequences into gif files
* We add a gif method to the class Video to be able to use the Gif Media.
* Parameters where missing in the declaration of the gif function
* One parameter was badly defined in the gif method
* We use the proper media in the method gif
* We add a missing declaration in the Video class
* Update of the README file
* Modification of the README file
* We remove an empty class
2017-01-24 15:03:51 -03:00
Romain Biard
7adc8c73c0 Merge branch 'master' into multipleframes 2017-01-13 12:28:36 -03:00
Romain Biard
31629f7162 Merge branch 'master' into addAudioMetadata 2017-01-13 12:12:26 -03:00
Romain Biard
c90f26724c Creation of the tests for the ExtractMultipleFramesFilter class 2017-01-11 12:03:54 -03:00