From 368c65a7d5bd8bc67336b74278ede3abdf5510fb Mon Sep 17 00:00:00 2001
From: Igor Kosteski <igor@groovygecko.com>
Date: Mon, 19 Feb 2018 10:59:58 +0100
Subject: [PATCH] Comment fix, Video size calculation base on the new video
 duration and added case on the VideoProgressListenerTest test class.

---
 .../AbstractProgressListener.php              |  5 ++---
 src/FFMpeg/Media/Video.php                    | 10 ++++-----
 .../VideoProgressListenerTest.php             | 21 +++++++++++++++++--
 3 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/src/FFMpeg/Format/ProgressListener/AbstractProgressListener.php b/src/FFMpeg/Format/ProgressListener/AbstractProgressListener.php
index 169b41b..26eaf55 100644
--- a/src/FFMpeg/Format/ProgressListener/AbstractProgressListener.php
+++ b/src/FFMpeg/Format/ProgressListener/AbstractProgressListener.php
@@ -255,9 +255,8 @@ abstract class AbstractProgressListener extends EventEmitter implements Listener
             return;
         }
 
-        $this->totalSize = $format->get('size') / 1024;
-        $this->duration = (int) $this->duration > 0 ? (int) $this->duration : $format->get('duration');
-
+        $this->duration = (int) $this->duration > 0 ? $this->duration : $format->get('duration');
+        $this->totalSize = $format->get('size') / 1024 * ($this->duration / $format->get('duration'));
         $this->initialized = true;
     }
 }
diff --git a/src/FFMpeg/Media/Video.php b/src/FFMpeg/Media/Video.php
index 6fb75eb..dd3fca1 100644
--- a/src/FFMpeg/Media/Video.php
+++ b/src/FFMpeg/Media/Video.php
@@ -83,12 +83,10 @@ class Video extends Audio
                 if ($format instanceof ProgressableInterface) {
                     $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
-                     */
+                    
+                    // check the filters of the video, and if the video has the ClipFilter then
+                    // 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();
diff --git a/tests/Unit/Format/ProgressListener/VideoProgressListenerTest.php b/tests/Unit/Format/ProgressListener/VideoProgressListenerTest.php
index 5367399..9e0bd28 100644
--- a/tests/Unit/Format/ProgressListener/VideoProgressListenerTest.php
+++ b/tests/Unit/Format/ProgressListener/VideoProgressListenerTest.php
@@ -11,7 +11,7 @@ class VideoProgressListenerTest extends TestCase
     /**
      * @dataProvider provideData
      */
-    public function testHandle($size, $duration,
+    public function testHandle($size, $duration, $newVideoDuration,
         $data, $expectedPercent, $expectedRemaining, $expectedRate,
         $data2, $expectedPercent2, $expectedRemaining2, $expectedRate2,
         $currentPass, $totalPass
@@ -26,7 +26,7 @@ class VideoProgressListenerTest extends TestCase
                 'duration' => $duration,
             ))));
 
-        $listener = new VideoProgressListener($ffprobe, __FILE__, $currentPass, $totalPass);
+        $listener = new VideoProgressListener($ffprobe, __FILE__, $currentPass, $totalPass, $newVideoDuration);
         $phpunit = $this;
         $n = 0;
         $listener->on('progress', function ($percent, $remaining, $rate) use (&$n, $phpunit, $expectedPercent, $expectedRemaining, $expectedRate, $expectedPercent2, $expectedRemaining2, $expectedRate2) {
@@ -57,6 +57,7 @@ class VideoProgressListenerTest extends TestCase
             array(
                 147073958,
                 281.147533,
+                281.147533,
                 'frame=  206 fps=202 q=10.0 size=     571kB time=00:00:07.12 bitrate= 656.8kbits/s dup=9 drop=0',
                 2,
                 0,
@@ -71,6 +72,7 @@ class VideoProgressListenerTest extends TestCase
             array(
                 147073958,
                 281.147533,
+                281.147533,
                 'frame=  206 fps=202 q=10.0 size=     571kB time=00:00:07.12 bitrate= 656.8kbits/s dup=9 drop=0',
                 1,
                 0,
@@ -81,6 +83,21 @@ class VideoProgressListenerTest extends TestCase
                 3868,
                 1,
                 2
+            ),
+            array(
+                147073958,
+                281.147533,
+                35,
+                'frame=  206 fps=202 q=10.0 size=     571kB time=00:00:07.12 bitrate= 656.8kbits/s dup=9 drop=0',
+                60,
+                0,
+                0,
+                'frame=  854 fps=113 q=20.0 size=    4430kB time=00:00:33.04 bitrate=1098.5kbits/s dup=36 drop=0',
+                97,
+                0,
+                3868,
+                2,
+                2
             )
         );
     }