From 53a978e0215d1f7314b2a2e75a8025f4324c3967 Mon Sep 17 00:00:00 2001 From: Igor Kosteski Date: Sun, 18 Feb 2018 13:57:06 +0100 Subject: [PATCH] Fix Clipping video transcoding progress not correct --- src/FFMpeg/Format/Audio/DefaultAudio.php | 2 +- .../AbstractProgressListener.php | 5 +++-- src/FFMpeg/Format/ProgressableInterface.php | 3 ++- src/FFMpeg/Format/Video/DefaultVideo.php | 2 +- src/FFMpeg/Media/Audio.php | 2 +- src/FFMpeg/Media/Video.php | 19 +++++++++++++++++-- 6 files changed, 25 insertions(+), 8 deletions(-) diff --git a/src/FFMpeg/Format/Audio/DefaultAudio.php b/src/FFMpeg/Format/Audio/DefaultAudio.php index 4226bff..4207911 100644 --- a/src/FFMpeg/Format/Audio/DefaultAudio.php +++ b/src/FFMpeg/Format/Audio/DefaultAudio.php @@ -121,7 +121,7 @@ abstract class DefaultAudio extends EventEmitter implements AudioInterface, Prog /** * {@inheritdoc} */ - public function createProgressListener(MediaTypeInterface $media, FFProbe $ffprobe, $pass, $total) + public function createProgressListener(MediaTypeInterface $media, FFProbe $ffprobe, $pass, $total, $duration = 0) { $format = $this; $listener = new AudioProgressListener($ffprobe, $media->getPathfile(), $pass, $total); diff --git a/src/FFMpeg/Format/ProgressListener/AbstractProgressListener.php b/src/FFMpeg/Format/ProgressListener/AbstractProgressListener.php index 3311266..169b41b 100644 --- a/src/FFMpeg/Format/ProgressListener/AbstractProgressListener.php +++ b/src/FFMpeg/Format/ProgressListener/AbstractProgressListener.php @@ -80,12 +80,13 @@ abstract class AbstractProgressListener extends EventEmitter implements Listener * * @throws RuntimeException */ - public function __construct(FFProbe $ffprobe, $pathfile, $currentPass, $totalPass) + public function __construct(FFProbe $ffprobe, $pathfile, $currentPass, $totalPass, $duration = 0) { $this->ffprobe = $ffprobe; $this->pathfile = $pathfile; $this->currentPass = $currentPass; $this->totalPass = $totalPass; + $this->duration = $duration; } /** @@ -255,7 +256,7 @@ abstract class AbstractProgressListener extends EventEmitter implements Listener } $this->totalSize = $format->get('size') / 1024; - $this->duration = $format->get('duration'); + $this->duration = (int) $this->duration > 0 ? (int) $this->duration : $format->get('duration'); $this->initialized = true; } diff --git a/src/FFMpeg/Format/ProgressableInterface.php b/src/FFMpeg/Format/ProgressableInterface.php index 4cd417d..497849c 100644 --- a/src/FFMpeg/Format/ProgressableInterface.php +++ b/src/FFMpeg/Format/ProgressableInterface.php @@ -24,8 +24,9 @@ interface ProgressableInterface extends EventEmitterInterface * @param FFProbe $ffprobe * @param Integer $pass The current pas snumber * @param Integer $total The total pass number + * @param Integer $duration The new video duration * * @return array An array of listeners */ - public function createProgressListener(MediaTypeInterface $media, FFProbe $ffprobe, $pass, $total); + public function createProgressListener(MediaTypeInterface $media, FFProbe $ffprobe, $pass, $total, $duration = 0); } diff --git a/src/FFMpeg/Format/Video/DefaultVideo.php b/src/FFMpeg/Format/Video/DefaultVideo.php index 1abfa67..0e7675c 100644 --- a/src/FFMpeg/Format/Video/DefaultVideo.php +++ b/src/FFMpeg/Format/Video/DefaultVideo.php @@ -125,7 +125,7 @@ abstract class DefaultVideo extends DefaultAudio implements VideoInterface /** * {@inheritdoc} */ - public function createProgressListener(MediaTypeInterface $media, FFProbe $ffprobe, $pass, $total) + public function createProgressListener(MediaTypeInterface $media, FFProbe $ffprobe, $pass, $total, $duration = 0) { $format = $this; $listeners = array(new VideoProgressListener($ffprobe, $media->getPathfile(), $pass, $total)); diff --git a/src/FFMpeg/Media/Audio.php b/src/FFMpeg/Media/Audio.php index c8fddb4..8a74962 100644 --- a/src/FFMpeg/Media/Audio.php +++ b/src/FFMpeg/Media/Audio.php @@ -62,7 +62,7 @@ class Audio extends AbstractStreamableMedia $listeners = null; if ($format instanceof ProgressableInterface) { - $listeners = $format->createProgressListener($this, $this->ffprobe, 1, 1); + $listeners = $format->createProgressListener($this, $this->ffprobe, 1, 1, 0); } $commands = $this->buildCommand($format, $outputPathfile); diff --git a/src/FFMpeg/Media/Video.php b/src/FFMpeg/Media/Video.php index 3d469ec..6fb75eb 100644 --- a/src/FFMpeg/Media/Video.php +++ b/src/FFMpeg/Media/Video.php @@ -24,6 +24,7 @@ use FFMpeg\Format\ProgressableInterface; use FFMpeg\Format\AudioInterface; use FFMpeg\Format\VideoInterface; use Neutron\TemporaryFilesystem\Manager as FsManager; +use FFMpeg\Filters\Video\ClipFilter; class Video extends Audio { @@ -78,9 +79,23 @@ class Video extends Audio try { /** add listeners here */ $listeners = null; - + if ($format instanceof ProgressableInterface) { - $listeners = $format->createProgressListener($this, $this->ffprobe, $pass + 1, $totalPasses); + $filters = clone $this->filters; + $duration = 0; + /* + check the filters of the video, + and if the video has the ClipFilter than: + take the new video duration and send to the + FFMpeg\Format\ProgressListener\AbstractProgressListener class + */ + foreach ($filters as $filter) { + if($filter instanceof ClipFilter){ + $duration = $filter->getDuration()->toSeconds(); + break; + } + } + $listeners = $format->createProgressListener($this, $this->ffprobe, $pass + 1, $totalPasses, $duration); } $this->driver->command($passCommands, false, $listeners);