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

Merge branch 'master' into spectrumpic

Browse source
This commit is contained in:
Marcus Bointon 2021-06-18 19:09:36 +02:00 • committed by GitHub
commit 839207457f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 62 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/FFMpeg/Format/Video/DefaultVideo.php
View file

@ -54,7 +54,7 @@ abstract class DefaultVideo extends DefaultAudio implements VideoInterface
*/
public function setKiloBitrate($kiloBitrate)
{
if ($kiloBitrate < 1) {
if ($kiloBitrate < 0) {
throw new InvalidArgumentException('Wrong kiloBitrate value');
}

4
src/FFMpeg/Format/Video/X264.php
View file

@ -22,7 +22,7 @@ class X264 extends DefaultVideo
/** @var int */
private $passes = 2;
public function __construct($audioCodec = 'libfaac', $videoCodec = 'libx264')
public function __construct($audioCodec = 'aac', $videoCodec = 'libx264')
{
$this
->setAudioCodec($audioCodec)
@ -81,7 +81,7 @@ class X264 extends DefaultVideo
*/
public function getPasses()
{
return $this->passes;
return $this->getKiloBitrate() === 0 ? 1 : $this->passes;
}
/**

11
src/FFMpeg/Media/AbstractVideo.php
View file

@ -86,6 +86,10 @@ abstract class AbstractVideo extends Audio
// FFMpeg\Format\ProgressListener\AbstractProgressListener class
foreach ($filters as $filter) {
if ($filter instanceof ClipFilter) {
if ($filter->getDuration() === NULL) {
continue;
}
$duration = $filter->getDuration()->toSeconds();
break;
}
@ -158,8 +162,11 @@ abstract class AbstractVideo extends Audio
}
if ($format instanceof VideoInterface) {
$commands[] = '-b:v';
$commands[] = $format->getKiloBitrate() . 'k';
if ($format->getKiloBitrate() !== 0) {
$commands[] = '-b:v';
$commands[] = $format->getKiloBitrate() . 'k';
}
$commands[] = '-refs';
$commands[] = '6';
$commands[] = '-coder';