- Bug fixes(support mkv) #12

- Add MediaInfo class
- Fixes some minor bugs

Author: aminyazdanpanah

.appveyor.yml

@@ -17,6 +17,7 @@ environment:
     ANSICON: 121x90 (121x90) # Console colors
 
   ffmpeg_download: https://ffmpeg.zeranoe.com/builds/win64/static/ffmpeg-20190725-923d5c4-win64-static.zip
+  mediainfo_download: https://mediaarea.net/download/binary/mediainfo/19.07/MediaInfo_CLI_19.07_Windows_x64.zip
 
   matrix:
     - PHP_VERSION: Latest_Version
@@ -28,9 +29,12 @@ install:
   - ps: Set-Service wuauserv -StartupType Manual # Chocolatey will try to install Windows updates when installing PHP.
   - ps: cinst php --params '""/InstallDir:C:\tools\php""' --ignore-checksums
   - ps: Start-FileDownload $env:ffmpeg_download
+  - ps: Start-FileDownload $env:mediainfo_download
 
   - 7z x ffmpeg-20190725-923d5c4-win64-static.zip
   - PATH=%PATH%;%cd%\ffmpeg-20190725-923d5c4-win64-static\bin
+  - 7z x MediaInfo_CLI_19.07_Windows_x64.zip
+  - PATH=%PATH%;%cd%\MediaInfo_CLI_19.07_Windows_x64
   - cd c:\tools\php
   - copy php.ini-production php.ini /Y
   - echo date.timezone="UTC" >> php.ini
@@ -47,4 +51,5 @@ install:
 test_script:
   - cd c:\projects\project-code
   - ffmpeg -version
+  - mediainfo --version
   - vendor\bin\phpunit tests

.travis.yml

@@ -16,6 +16,9 @@ before_install:
 install:
   - travis_retry composer update ${COMPOSER_FLAGS} --no-interaction
   - sudo apt-get install ffmpeg
+  - sudo apt-get install mediainfo
 
 script:
+  - ffmpeg -version
+  - mediainfo --version
   - vendor/bin/phpunit tests

README.md

@@ -39,13 +39,22 @@ This package provides an integration with [PHP-FFmpeg](https://github.com/PHP-FF
 
 ### Required Libraries
 
+#### 1. FFMpeg
 This library requires a working FFMpeg. You will need both FFMpeg and FFProbe binaries to use it.
 - Getting FFmpeg: https://ffmpeg.org/download.html
 
-Also, for HLS encryption you will need a working OpenSSL:
+#### 2. MediaInfo
+For auto generating representations and also for digital media analysis, this package needs a working MediaInfo.
+- Getting MediaInfo: https://mediaarea.net/en/MediaInfo
+
+**NOTE:** You must download MediaInfo CLI. If you want this package autodetect the MediaInfo binary, you need to add the path of CLI to your system path. Otherwise, You have to pass the full path of binary to `setMediaInfoBinary` method.
+
+#### 3. OpenSSL
+For HLS encryption you will need a working OpenSSL:
 - Getting OpenSSL: https://www.openssl.org/source/
 - Getting OpenSSL(Windows): https://slproweb.com/products/Win32OpenSSL.html
 
+**NOTE:** Add the path of OpenSSL bin directory to system path to get the benefit of binary autodetect.
 
 ### Installing Package
 This version of the package is only compatible with PHP 7.1.0 and later.
@@ -232,7 +241,7 @@ Getting OpenSSL: https://www.openssl.org/source/
 
 Getting OpenSSL(Windows): https://slproweb.com/products/Win32OpenSSL.html
 
-You need to pass both 'URL to the key' and 'path to save a random key' to `generateRandomKeyInfo` method:
+You need to pass both 'URL to the key' and 'path to save a random key' to the `generateRandomKeyInfo` method:
 ``` php
 //A path you want to save a random key on your server
 $save_to = "/var/www/my_website_project/keys/enc.key";
@@ -346,7 +355,7 @@ $dash->saveToCloud($api, $field_name, null, $method, $headers, $options);
 It can also be passed a path to save a copy files on the local path:
 
 ``` php
-$save_to = '/var/www/media/videos/my_sweetie.mp4';
+$save_to = '/var/www/media/videos/hls/test.m3u8';
 $hls->saveToCloud($api, $field_name, $save_to, $method, $headers, $options);
 ```
 
@@ -373,7 +382,7 @@ $dash->saveToS3($config, $dest);
 A path can also be passed to save a copy files on your local computer/server.
 
 ``` php
-$hls->saveToS3($config, $dest, '/var/www/media/videos/dash/test.m3u8');
+$hls->saveToS3($config, $dest, '/var/www/media/videos/hls/test.m3u8');
 ```
 
 For more information, please read [AWS SDK for PHP](https://aws.amazon.com/sdk-for-php/) document.

src/AutoRepresentations.php

@@ -12,12 +12,16 @@
 namespace Streaming;
 
 use Streaming\Exception\Exception;
-use FFMpeg\FFProbe\DataMapping\Stream;
+use Streaming\MediaInfo\Streams\Stream;
+use Streaming\MediaInfo\Streams\StreamCollection;
 
 class AutoRepresentations
 {
-    /** @var Stream $stream */
-    private $stream;
+    /** @var Stream $video */
+    private $video;
+
+    /** @var Stream $general */
+    private $general;
 
     /** @var array side_values
      * regular video's heights
@@ -26,25 +30,26 @@ class AutoRepresentations
 
     /**
      * AutoRepresentations constructor.
-     * @param Stream $stream
+     * @param StreamCollection $streamCollection
      * @param null | array $side_values
      */
-    public function __construct(Stream $stream, $side_values)
+    public function __construct(StreamCollection $streamCollection, $side_values)
     {
         if (null !== $side_values) {
             $this->side_values = $side_values;
         }
 
-        $this->stream = $stream;
+        $this->video = $streamCollection->videos()->first();
+        $this->general = $streamCollection->general();
     }
 
     /**
      * @return array
      */
     private function getDimensions(): array
     {
-        $width = $this->stream->get('width');
-        $height = $this->stream->get('height');
+        $width = $this->video->get('Width');
+        $height = $this->video->get('Height');
 
         return [$width, $height, $width / $height];
     }
@@ -55,10 +60,14 @@ private function getDimensions(): array
      */
     private function getKiloBitRate(): int
     {
-        if (!$this->stream->has('bit_rate')) {
-            throw new Exception("Invalid stream");
+        if (!$this->video->has('BitRate')) {
+            if (!$this->general->has('OverallBitRate')) {
+                throw new Exception("Invalid stream");
+            }
+
+            return (int)($this->general->get('OverallBitRate') / 1024) * .9;
         }
-        return (int)$this->stream->get('bit_rate') / 1024;
+        return (int)$this->video->get('BitRate') / 1024;
     }
 
     /**

src/Export.php

@@ -28,6 +28,9 @@ abstract class Export
     /** @var array */
     protected $path_info;
 
+    /** @var string */
+    protected $mediaInfoBinary = 'mediainfo';
+
     /**
      * Export constructor.
      * @param Media $media
@@ -59,7 +62,7 @@ public function save(string $path = null, $analyse = true)
             $path
         );
 
-        $response = ($analyse) ? (new StreamingAnalytics($this))->analyse() : $path;
+        $response = ($analyse) ? (new StreamingAnalytics($this, $this->mediaInfoBinary))->analyse() : $this;
 
         if ($this->media->isTmp()) {
             $this->deleteOriginalFile();
@@ -113,10 +116,11 @@ private function getPath($path): string
     /**
      * @param string $url
      * @param string $name
-     * @param array $headers
      * @param string|null $path
      * @param string $method
+     * @param array $headers
      * @param array $options
+     * @param bool $analyse
      * @return mixed
      * @throws Exception
      */
@@ -126,10 +130,11 @@ public function saveToCloud(
         string $path = null,
         string $method = 'GET',
         array $headers = [],
-        array $options = []
+        array $options = [],
+        bool $analyse = true
     )
     {
-        list($results, $tmp_dir) = $this->saveToTemporaryFolder($path);
+        list($results, $tmp_dir) = $this->saveToTemporaryFolder($path, $analyse);
         sleep(1);
 
         $file_manager = new FileManager($url, $method, $options);
@@ -144,12 +149,13 @@ public function saveToCloud(
      * @param array $config
      * @param string $dest
      * @param string|null $path
+     * @param bool $analyse
      * @return mixed
      * @throws Exception
      */
-    public function saveToS3(array $config, string $dest, string $path = null)
+    public function saveToS3(array $config, string $dest, string $path = null, bool $analyse =true)
     {
-        list($results, $tmp_dir) = $this->saveToTemporaryFolder($path);
+        list($results, $tmp_dir) = $this->saveToTemporaryFolder($path, $analyse);
         sleep(1);
 
         $aws = new AWS($config);
@@ -184,10 +190,11 @@ private function deleteOriginalFile()
 
     /**
      * @param $path
+     * @param $analyse
      * @return array
      * @throws Exception
      */
-    private function saveToTemporaryFolder($path)
+    private function saveToTemporaryFolder($path, $analyse)
     {
         $basename = Helper::randomString();
 
@@ -198,7 +205,7 @@ private function saveToTemporaryFolder($path)
         $tmp_dir = Helper::tmpDir();
         $tmp_file = $tmp_dir . $basename;
 
-        return [$this->save($tmp_file), $tmp_dir];
+        return [$this->save($tmp_file, $analyse), $tmp_dir];
     }
 
     /**
@@ -216,4 +223,14 @@ private function moveTmpFolder(?string $path, $tmp_dir)
             Helper::deleteDirectory($tmp_dir);
         }
     }
+
+    /**
+     * @param string $mediaInfoBinary
+     * @return Export
+     */
+    public function setMediaInfoBinary(string $mediaInfoBinary)
+    {
+        $this->mediaInfoBinary = $mediaInfoBinary;
+        return $this;
+    }
 }

src/Media.php

@@ -83,22 +83,6 @@ public function __call($method, $parameters)
         );
     }
 
-    /**
-     * @return mixed
-     */
-    public function getVideoStream(): Stream
-    {
-        return $this->media->getStreams()->videos()->first();
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getAllStreams()
-    {
-        return $this->media->getStreams()->all();
-    }
-
     /**
      * @return string
      */

src/MediaInfo/MediaInfo.php

@@ -0,0 +1,52 @@
+<?php
+
+/**
+ * This file is part of the PHP-FFmpeg-video-streaming package.
+ *
+ * (c) Amin Yazdanpanah <contact@aminyazdanpanah.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+
+namespace Streaming\MediaInfo;
+
+
+use Streaming\MediaInfo\Streams\Stream;
+use Streaming\MediaInfo\Streams\StreamCollection;
+use Streaming\Process\Process;
+
+class MediaInfo
+{
+    /**
+     * @param string|null $binary
+     * @param string $path
+     * @return StreamCollection
+     * @throws \Streaming\Exception\Exception
+     */
+    public static function initialize(string $path, string $binary = 'mediainfo'): StreamCollection
+    {
+        $media_info = json_decode(static::getJsonOutPut(new Process($binary), $path), true);
+
+        $streams = $media_info["media"]["track"];
+        $stream_collection = [];
+
+        foreach ($streams as $stream){
+            $stream_collection[] = new Stream($stream);
+        }
+
+        return new StreamCollection($stream_collection);
+    }
+
+    /**
+     * @param Process $media_info
+     * @param string $path
+     * @return string
+     * @throws \Streaming\Exception\Exception
+     */
+    private static function getJsonOutPut(Process $media_info, string $path): string
+    {
+        return $media_info->addCommand(['--Output=JSON', $path])->run();
+    }
+}