Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

additionalParameters capability in audio formats #753

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/FFMpeg/Format/Audio/Aac.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ public function __construct()
*/
public function getAvailableAudioCodecs()
{
return ['libfdk_aac'];

return array('aac','copy','libfdk_aac');

}
}
28 changes: 28 additions & 0 deletions src/FFMpeg/Format/Audio/DefaultAudio.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ abstract class DefaultAudio extends EventEmitter implements AudioInterface, Prog
/** @var int */
protected $audioChannels = null;

/** @var Array */
protected $additionalParamaters;

/**
* {@inheritdoc}
*/
Expand Down Expand Up @@ -138,4 +141,29 @@ public function getPasses()
{
return 1;
}

/**
* {@inheritdoc}
*/
public function getAdditionalParameters()
{
return $this->additionalParamaters;
}

/**
* Sets additional parameters.
*
* @param array $additionalParamaters
* @throws InvalidArgumentException
*/
public function setAdditionalParameters($additionalParamaters)
{
if (!is_array($additionalParamaters)) {
throw new InvalidArgumentException('Wrong additionalParamaters value. Must be an array.');
}

$this->additionalParamaters = $additionalParamaters;

return $this;
}
}
4 changes: 3 additions & 1 deletion src/FFMpeg/Format/Audio/Mp3.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ public function __construct()
*/
public function getAvailableAudioCodecs()
{
return ['libmp3lame'];

return array('copy','libmp3lame');

}
}
7 changes: 7 additions & 0 deletions src/FFMpeg/Format/AudioInterface.php
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,11 @@ public function getAudioCodec();
* @return array
*/
public function getAvailableAudioCodecs();

/**
* Returns the list of additional parameters for this format.
*
* @return array
*/
public function getAdditionalParameters();
}
5 changes: 5 additions & 0 deletions src/FFMpeg/Media/AbstractVideo.php
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,11 @@ protected function buildCommand(FormatInterface $format, $outputPathfile)
$commands[] = '-ac';
$commands[] = $format->getAudioChannels();
}
if (null !== $format->getAdditionalParameters()) {
foreach ($format->getAdditionalParameters() as $additionalParameter) {
$commands[] = $additionalParameter;
}
}
}

// If the user passed some additional parameters
Expand Down
8 changes: 8 additions & 0 deletions src/FFMpeg/Media/Audio.php
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,14 @@ protected function buildCommand(FormatInterface $format, $outputPathfile)
$commands[] = '-ac';
$commands[] = $format->getAudioChannels();
}

// If the user passed some additional parameters
if (null !== $format->getAdditionalParameters()) {
foreach ($format->getAdditionalParameters() as $additionalParameter) {
$commands[] = $additionalParameter;
}
}

$commands[] = $outputPathfile;

return $commands;
Expand Down