diff --git a/src/FFMpeg/Helper/ProgressHelper.php b/src/FFMpeg/Helper/ProgressHelper.php index 85e47e6..bf4fa1f 100644 --- a/src/FFMpeg/Helper/ProgressHelper.php +++ b/src/FFMpeg/Helper/ProgressHelper.php @@ -150,7 +150,7 @@ abstract class ProgressHelper implements HelperInterface } $currentDuration = $this->convertDuration($matches[2]); - $currentTime = $this->microtimeFloat(); + $currentTime = microtime(true); $currentSize = trim(str_replace('kb', '', strtolower(($matches[1])))); $percent = max(0, min(1, $currentDuration / $this->duration)); @@ -211,18 +211,8 @@ abstract class ProgressHelper implements HelperInterface ); } - /** - * @return number - */ - protected function microtimeFloat() - { - list($usec, $sec) = explode(" ", microtime()); - return ((float)$usec + (float)$sec); - } - /** * Get the regex pattern to match a ffmpeg stderr status line */ abstract function getPattern(); - } diff --git a/tests/src/FFMpeg/Progress/ProgressTest.php b/tests/src/FFMpeg/Progress/ProgressTest.php index bd20f2f..17b6425 100644 --- a/tests/src/FFMpeg/Progress/ProgressTest.php +++ b/tests/src/FFMpeg/Progress/ProgressTest.php @@ -10,7 +10,6 @@ class ProgressTest extends FFMpegTest * @covers FFMpeg\Helper\ProgressHelper::parseProgress * @covers FFMpeg\Helper\ProgressHelper::convertDuration * @covers FFMpeg\Helper\ProgressHelper::getProgressInfo - * @covers FFMpeg\Helper\ProgressHelper::microtimeFloat * @covers FFMpeg\Helper\AudioProgressHelper::getPattern */ public function testProgressHelper()