ComplexMedia has been renamed to the AdvancedMedia.

This commit is contained in:
CaliforniaMountainSnake 2020-03-23 17:47:36 +03:00
commit 0d3bed21a7
19 changed files with 150 additions and 144 deletions

View file

@ -66,7 +66,7 @@ class FFMpegDriver extends AbstractBinary
{
preg_match('#version\s(\S+)#', $this->command('-version'), $version);
if (!isset($version[1])) {
throw new RuntimeException('Cannot to parse the ffmpeg version!');
throw new RuntimeException('Cannot to parse the ffmpeg version!');
}
return $version[1];

View file

@ -16,7 +16,7 @@ use FFMpeg\Driver\FFMpegDriver;
use FFMpeg\Exception\InvalidArgumentException;
use FFMpeg\Exception\RuntimeException;
use FFMpeg\Media\Audio;
use FFMpeg\Media\ComplexMedia;
use FFMpeg\Media\AdvancedMedia;
use FFMpeg\Media\Video;
use Psr\Log\LoggerInterface;
@ -110,11 +110,11 @@ class FFMpeg
*
* @param string[] $inputs Array of files to be opened.
*
* @return ComplexMedia
* @return AdvancedMedia
*/
public function openComplex($inputs)
public function openAdvanced($inputs)
{
return new ComplexMedia($inputs, $this->driver, $this->ffprobe);
return new AdvancedMedia($inputs, $this->driver, $this->ffprobe);
}
/**

View file

@ -1,8 +1,8 @@
<?php
namespace FFMpeg\Filters\ComplexMedia;
namespace FFMpeg\Filters\AdvancedMedia;
use FFMpeg\Media\ComplexMedia;
use FFMpeg\Media\AdvancedMedia;
/**
* @see https://ffmpeg.org/ffmpeg-filters.html#anullsrc
@ -57,7 +57,7 @@ class ANullSrcFilter extends AbstractComplexFilter
/**
* {@inheritdoc}
*/
public function applyComplex(ComplexMedia $media)
public function applyComplex(AdvancedMedia $media)
{
return array(
'-filter_complex',

View file

@ -1,6 +1,6 @@
<?php
namespace FFMpeg\Filters\ComplexMedia;
namespace FFMpeg\Filters\AdvancedMedia;
abstract class AbstractComplexFilter implements ComplexCompatibleFilter
{

View file

@ -1,10 +1,13 @@
<?php
namespace FFMpeg\Filters\ComplexMedia;
namespace FFMpeg\Filters\AdvancedMedia;
use FFMpeg\Filters\FilterInterface;
use FFMpeg\Media\ComplexMedia;
use FFMpeg\Media\AdvancedMedia;
/**
* A filter that can be used inside "-filter_complex" option.
*/
interface ComplexCompatibleFilter extends FilterInterface
{
/**
@ -24,9 +27,9 @@ interface ComplexCompatibleFilter extends FilterInterface
/**
* Apply the complex filter to the given media.
*
* @param ComplexMedia $media
* @param AdvancedMedia $media
*
* @return string[] An array of arguments.
*/
public function applyComplex(ComplexMedia $media);
public function applyComplex(AdvancedMedia $media);
}

View file

@ -1,11 +1,11 @@
<?php
namespace FFMpeg\Filters\ComplexMedia;
namespace FFMpeg\Filters\AdvancedMedia;
use FFMpeg\Media\ComplexMedia;
use FFMpeg\Media\AdvancedMedia;
/**
* Container for the complex filter.
* Container for the complex compatible filter.
*/
class ComplexFilterContainer implements ComplexFilterInterface
{
@ -93,7 +93,7 @@ class ComplexFilterContainer implements ComplexFilterInterface
/**
* {@inheritdoc}
*/
public function applyComplex(ComplexMedia $media)
public function applyComplex(AdvancedMedia $media)
{
return $this->baseFilter->applyComplex($media);
}

View file

@ -1,7 +1,10 @@
<?php
namespace FFMpeg\Filters\ComplexMedia;
namespace FFMpeg\Filters\AdvancedMedia;
/**
* A filter that is completely ready to use inside "-filter_complex" option.
*/
interface ComplexFilterInterface extends ComplexCompatibleFilter
{
/**

View file

@ -1,25 +1,25 @@
<?php
namespace FFMpeg\Filters\ComplexMedia;
namespace FFMpeg\Filters\AdvancedMedia;
use FFMpeg\Coordinate\Dimension;
use FFMpeg\Filters\Video\PadFilter;
use FFMpeg\Filters\Video\WatermarkFilter;
use FFMpeg\Media\ComplexMedia;
use FFMpeg\Media\AdvancedMedia;
class ComplexFilters
{
/**
* @var ComplexMedia
* @var AdvancedMedia
*/
protected $media;
/**
* ComplexFilters constructor.
*
* @param ComplexMedia $media
* @param AdvancedMedia $media
*/
public function __construct(ComplexMedia $media)
public function __construct(AdvancedMedia $media)
{
$this->media = $media;
}

View file

@ -1,8 +1,8 @@
<?php
namespace FFMpeg\Filters\ComplexMedia;
namespace FFMpeg\Filters\AdvancedMedia;
use FFMpeg\Media\ComplexMedia;
use FFMpeg\Media\AdvancedMedia;
class CustomComplexFilter extends AbstractComplexFilter
{
@ -36,7 +36,7 @@ class CustomComplexFilter extends AbstractComplexFilter
/**
* {@inheritdoc}
*/
public function applyComplex(ComplexMedia $media)
public function applyComplex(AdvancedMedia $media)
{
return array('-filter_complex', $this->filter);
}

View file

@ -1,8 +1,8 @@
<?php
namespace FFMpeg\Filters\ComplexMedia;
namespace FFMpeg\Filters\AdvancedMedia;
use FFMpeg\Media\ComplexMedia;
use FFMpeg\Media\AdvancedMedia;
/**
* @see https://ffmpeg.org/ffmpeg-filters.html#sine
@ -77,11 +77,11 @@ class SineFilter extends AbstractComplexFilter
/**
* Apply the complex filter to the given media.
*
* @param ComplexMedia $media
* @param AdvancedMedia $media
*
* @return string[] An array of arguments.
*/
public function applyComplex(ComplexMedia $media)
public function applyComplex(AdvancedMedia $media)
{
return array(
'-filter_complex',

View file

@ -1,8 +1,8 @@
<?php
namespace FFMpeg\Filters\ComplexMedia;
namespace FFMpeg\Filters\AdvancedMedia;
use FFMpeg\Media\ComplexMedia;
use FFMpeg\Media\AdvancedMedia;
/**
* This filter builds various types of computed inputs.
@ -227,7 +227,7 @@ class TestSrcFilter extends AbstractComplexFilter
/**
* {@inheritdoc}
*/
public function applyComplex(ComplexMedia $media)
public function applyComplex(AdvancedMedia $media)
{
return array(
'-filter_complex',

View file

@ -1,8 +1,8 @@
<?php
namespace FFMpeg\Filters\ComplexMedia;
namespace FFMpeg\Filters\AdvancedMedia;
use FFMpeg\Media\ComplexMedia;
use FFMpeg\Media\AdvancedMedia;
/**
* "xstack" filter.
@ -80,7 +80,7 @@ class XStackFilter extends AbstractComplexFilter
/**
* {@inheritdoc}
*/
public function applyComplex(ComplexMedia $media)
public function applyComplex(AdvancedMedia $media)
{
return array(
'-filter_complex',

View file

@ -12,9 +12,9 @@
namespace FFMpeg\Filters\Video;
use FFMpeg\Coordinate\Dimension;
use FFMpeg\Filters\ComplexMedia\ComplexCompatibleFilter;
use FFMpeg\Filters\AdvancedMedia\ComplexCompatibleFilter;
use FFMpeg\Format\VideoInterface;
use FFMpeg\Media\ComplexMedia;
use FFMpeg\Media\AdvancedMedia;
use FFMpeg\Media\Video;
class PadFilter implements VideoFilterInterface, ComplexCompatibleFilter
@ -77,7 +77,7 @@ class PadFilter implements VideoFilterInterface, ComplexCompatibleFilter
/**
* {@inheritdoc}
*/
public function applyComplex(ComplexMedia $media)
public function applyComplex(AdvancedMedia $media)
{
return $this->getCommands();
}

View file

@ -12,9 +12,9 @@
namespace FFMpeg\Filters\Video;
use FFMpeg\Exception\InvalidArgumentException;
use FFMpeg\Filters\ComplexMedia\ComplexCompatibleFilter;
use FFMpeg\Filters\AdvancedMedia\ComplexCompatibleFilter;
use FFMpeg\Format\VideoInterface;
use FFMpeg\Media\ComplexMedia;
use FFMpeg\Media\AdvancedMedia;
use FFMpeg\Media\Video;
class WatermarkFilter implements VideoFilterInterface, ComplexCompatibleFilter
@ -76,7 +76,7 @@ class WatermarkFilter implements VideoFilterInterface, ComplexCompatibleFilter
/**
* {@inheritdoc}
*/
public function applyComplex(ComplexMedia $media)
public function applyComplex(AdvancedMedia $media)
{
return $this->getCommands();
}

View file

@ -6,10 +6,10 @@ use Alchemy\BinaryDriver\Exception\ExecutionFailureException;
use FFMpeg\Driver\FFMpegDriver;
use FFMpeg\Exception\RuntimeException;
use FFMpeg\FFProbe;
use FFMpeg\Filters\ComplexMedia\ComplexCompatibleFilter;
use FFMpeg\Filters\ComplexMedia\ComplexFilterContainer;
use FFMpeg\Filters\ComplexMedia\ComplexFilterInterface;
use FFMpeg\Filters\ComplexMedia\ComplexFilters;
use FFMpeg\Filters\AdvancedMedia\ComplexCompatibleFilter;
use FFMpeg\Filters\AdvancedMedia\ComplexFilterContainer;
use FFMpeg\Filters\AdvancedMedia\ComplexFilterInterface;
use FFMpeg\Filters\AdvancedMedia\ComplexFilters;
use FFMpeg\Filters\FiltersCollection;
use FFMpeg\Format\AudioInterface;
use FFMpeg\Format\FormatInterface;
@ -18,13 +18,13 @@ use FFMpeg\Format\ProgressListener\AbstractProgressListener;
use FFMpeg\Format\VideoInterface;
/**
* Complex media may have multiple inputs and multiple outputs.
* AdvancedMedia may have multiple inputs and multiple outputs.
* This class accepts only filters for -filter_complex option.
* But you can set initial and additional parameters of the ffmpeg command.
*
* @see http://trac.ffmpeg.org/wiki/Creating%20multiple%20outputs
*/
class ComplexMedia extends AbstractMediaType
class AdvancedMedia extends AbstractMediaType
{
/**
* @var string[]
@ -52,7 +52,7 @@ class ComplexMedia extends AbstractMediaType
private $listeners;
/**
* ComplexMedia constructor.
* AdvancedMedia constructor.
*
* @param string[] $inputs Array of files to be opened.
* @param FFMpegDriver $driver
@ -110,7 +110,7 @@ class ComplexMedia extends AbstractMediaType
{
foreach ($filters as $filter) {
if (!($filter instanceof ComplexFilterInterface)) {
throw new RuntimeException ('For ComplexMedia you can set filters collection'
throw new RuntimeException ('For AdvancedMedia you can set filters collection'
. ' contains only objects that implement ComplexFilterInterface!');
}
}
@ -129,7 +129,7 @@ class ComplexMedia extends AbstractMediaType
/**
* @param string[] $initialParameters
*
* @return ComplexMedia
* @return AdvancedMedia
*/
public function setInitialParameters(array $initialParameters)
{
@ -148,7 +148,7 @@ class ComplexMedia extends AbstractMediaType
/**
* @param string[] $additionalParameters
*
* @return ComplexMedia
* @return AdvancedMedia
*/
public function setAdditionalParameters(array $additionalParameters)
{