Mis-spellings:: onProgress miss to onPregress

BPing · Jun 28, 2017 · 7dbc2e4 · 7dbc2e4
1 parent 81b0e33
commit 7dbc2e4
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 6 deletions.
diff --git a/src/FFMpegPush/Example/example.php b/src/FFMpegPush/Example/example.php
@@ -15,7 +15,7 @@
 
 $pushCmd = PushVideo::create();
 
-$pushCmd->onPregress(function ($percent,$remaining,$rate) {
+$pushCmd->onProgress(function ($percent,$remaining,$rate) {
 //    var_dump(func_get_args());
     echo "progress:$percent% remaining:$remaining(s) rate:$rate(kb/s)\n";
 });

diff --git a/src/FFMpegPush/PushInput.php b/src/FFMpegPush/PushInput.php
@@ -16,6 +16,7 @@
  *       -re -ss -i inputpath
  *
  * Class PushInput
+ *
  * @package FFMpegPush
  */
 class PushInput
@@ -58,7 +59,7 @@ public function setInputVideo($inputVideo)
      */
     public function setStartTime($startTime)
     {
-        $this->$startTime = $startTime;
+        $this->startTime = $startTime;
         return $this;
     }
 
@@ -81,7 +82,7 @@ public function getInputs()
             'info',
             '-re',
             '-ss',
-            '' . $this->time,
+            '' . $this->startTime,
             '-i',
             $this->inputVideo,
         );

diff --git a/src/FFMpegPush/PushVideo.php b/src/FFMpegPush/PushVideo.php
@@ -9,6 +9,7 @@
  * 推流命令
  *
  * Class PushVideo
+ *
  * @package FFMpegPush
  */
 class PushVideo extends FFMpegCommand
@@ -58,7 +59,8 @@ public function setOutput(PushOutput $output)
 
     /**
      * PushVideo constructor.
-     * @param array $configuration
+     *
+     * @param array                $configuration
      * @param LoggerInterface|null $logger
      */
     public function __construct($configuration = array(), LoggerInterface $logger = null)
@@ -95,7 +97,7 @@ public static function create($configuration = array(), LoggerInterface $logger
      *
      * @param callable $listener
      */
-    public function onPregress(callable $listener)
+    public function onProgress(callable $listener)
     {
         $this->progressListener->on('progress', $listener);
     }

diff --git a/tests/PushVideoTest.php b/tests/PushVideoTest.php
@@ -18,7 +18,7 @@ public function testPush()
         $pushCmd = PushVideo::create();
 
         $debugListener = new LineListener();
-        $pushCmd->addListerner($debugListener);
+        $pushCmd->addListener($debugListener);
         $lastStr = LastMsg::create();
         $debugListener->on('debug', function ($line) use ($lastStr) {
             if (is_string($line) && '' !== $line && "" !== $line) {
@@ -27,6 +27,10 @@ public function testPush()
             return;
         });
 
+        $pushCmd->onProgress(function ($percent,$remaining,$rate) {
+            echo "progress:$percent% remaining:$remaining(s) rate:$rate(kb/s)\n";
+        });
+
         $pushCmd->setInput(PushInput::create()->setInputVideo('res/test.mp4'))
             ->setFormat(PushFormat::create())
             ->setOutput(PushOutput::create()->setPushUrl($pushUrl))