bug fixes #27

aminyazdanpanah · aminyazdanpanah · commit c3717066ef2f · 2019-11-16T17:12:47.000+03:30
diff --git a/README.md b/README.md
@@ -106,19 +106,12 @@ $rep_360p  = (new Representation)->setKiloBitrate(276)->setResize(640, 360);
 $rep_480p  = (new Representation)->setKiloBitrate(750)->setResize(854, 480);
 $rep_720p  = (new Representation)->setKiloBitrate(2048)->setResize(1280, 720);
 $rep_1080p = (new Representation)->setKiloBitrate(4096)->setResize(1920, 1080);
-$rep_2k    = (new Representation)->setKiloBitrate(6144‬)->setResize(2560, 1440);
-$rep_4k    = (new Representation)->setKiloBitrate(17408‬)->setResize(3840, 2160);
+$rep_2k    = (new Representation)->setKiloBitrate(6144)->setResize(2560, 1440);
+$rep_4k    = (new Representation)->setKiloBitrate(17408)->setResize(3840, 2160);
 
 $video->DASH()
     ->HEVC()
-    ->addRepresentation($rep_144p)// add a representation
-    ->addRepresentation($rep_240p)
-    ->addRepresentation($rep_360p)
-    ->addRepresentation($rep_480p)
-    ->addRepresentation($rep_720p)
-    ->addRepresentation($rep_1080p)
-    ->addRepresentation($rep_2k)
-    ->addRepresentation($rep_4k)
+    ->addRepresentations($rep_144p, $rep_240p, $rep_360p, $rep_480p, $rep_720p, $rep_1080p, $rep_2k, $rep_4k)// add representations
     ->setAdaption('id=0,streams=v id=1,streams=a') // Set a adaption.
     ->save('/var/www/media/videos/dash-stream.mpd');
 ```
@@ -144,9 +137,7 @@ $rep_720p  = (new Representation)->setKiloBitrate(2048)->setResize(1280, 720);
 $video->HLS()
     ->X264()
     ->setHlsBaseUrl('https://bucket.s3-us-west-1.amazonaws.com/videos') // Add a base URL
-    ->addRepresentation($rep_360p)
-    ->addRepresentation($rep_480p)
-    ->addRepresentation($rep_720p)
+    ->addRepresentations($rep_360p, $rep_480p, $rep_720p)// add representations
     ->setHlsTime(5) // Set Hls Time. Default value is 10 
     ->setHlsAllowCache(false) // Default value is true 
     ->save();
@@ -167,7 +158,7 @@ $url = 'https://www.aminyazdanpanah.com/PATH_TO_KEY_DIRECTORY/random_key.key';//
 $video->HLS()
     ->X264()
     ->setTsSubDirectory('ts_files')// put all ts files in a subdirectory
-    ->generateRandomKeyInfo($url, $save_to)
+    ->encryption($save_to, $url)
     ->autoGenerateRepresentations([1080, 480, 240])
     ->save('/var/www/media/videos/hls-stream.m3u8');
 ```
@@ -309,7 +300,6 @@ You can use these libraries to play your streams.
         - **[MPEGDASH-iOS-Player](https://github.com/MPEGDASHPlayer/MPEGDASH-iOS-Player)**
     - HLS: 
         - **[Player](https://github.com/piemonte/Player)**
-        - **[Mamba](https://github.com/Comcast/mamba)**
 - **Windows, Linux, and macOS**
     - DASH and HLS:
         - **[FFmpeg(ffplay)](https://github.com/FFmpeg/FFmpeg)**
diff --git a/src/ExportHLSPlaylist.php b/src/ExportHLSPlaylist.php
@@ -35,10 +35,8 @@ private static function generateContents(array $representations, string $basenam
         $content[] = "#EXT-X-VERSION:3";
 
         foreach ($representations as $representation) {
-            if ($representation instanceof Representation) {
-                $content[] = "#EXT-X-STREAM-INF:BANDWIDTH=" . $representation->getKiloBitrate() * 1024 . ",RESOLUTION=" . $representation->getResize();
-                $content[] = $basename . "_" . $representation->getHeight() . "p.m3u8";
-            }
+            $content[] = "#EXT-X-STREAM-INF:BANDWIDTH=" . $representation->getKiloBitrate() * 1024 . ",RESOLUTION=" . $representation->getResize();
+            $content[] = $basename . "_" . $representation->getHeight() . "p.m3u8";
         }
 
         return implode(PHP_EOL, $content);
diff --git a/src/Filters/DASHFilter.php b/src/Filters/DASHFilter.php
@@ -15,7 +15,6 @@
 
 use Streaming\DASH;
 use Streaming\Format\X264;
-use Streaming\Representation;
 
 class DASHFilter extends Filter
 {
@@ -36,16 +35,14 @@ private function DASHFilter(DASH $dash)
         $filter = $this->getAdditionalFilters($dash->getFormat(), count($dash->getRepresentations()));
 
         foreach ($dash->getRepresentations() as $key => $representation) {
-            if ($representation instanceof Representation) {
-                $filter[] = "-map";
-                $filter[] = "0";
-                $filter[] = "-b:v:" . $key;
-                $filter[] = $representation->getKiloBitrate() . "k";
+            $filter[] = "-map";
+            $filter[] = "0";
+            $filter[] = "-b:v:" . $key;
+            $filter[] = $representation->getKiloBitrate() . "k";
 
-                if (null !== $representation->getResize()) {
-                    $filter[] = "-s:v:" . $key;
-                    $filter[] = $representation->getResize();
-                }
+            if (null !== $representation->getResize()) {
+                $filter[] = "-s:v:" . $key;
+                $filter[] = $representation->getResize();
             }
         }
 
diff --git a/src/Filters/HLSFilter.php b/src/Filters/HLSFilter.php
@@ -13,7 +13,6 @@
 
 use Streaming\FileManager;
 use Streaming\HLS;
-use Streaming\Representation;
 use Streaming\Utilities;
 
 class HLSFilter extends Filter
@@ -34,11 +33,58 @@ public function setFilter($media): void
     private function HLSFilter(HLS $hls)
     {
         $filter = [];
-        $total_count = count($representations = $hls->getRepresentations());
-        $counter = 0;
+        $representations = $hls->getRepresentations();
         $path_parts = $hls->getPathInfo();
         $dirname = str_replace("\\", "/", $path_parts["dirname"]);
-        $filename = substr($path_parts["filename"], -100);
+        list($ts_sub_dir, $base_url) = $this->getSubDirectory($hls, $dirname);
+
+        foreach ($representations as $key => $representation) {
+            if ($key) {
+                $filter = array_merge($filter, $this->getFormats($hls));
+            }
+
+            $filter[] = "-s:v";
+            $filter[] = $representation->getResize();
+            $filter[] = "-crf";
+            $filter[] = "20";
+            $filter[] = "-sc_threshold";
+            $filter[] = "0";
+            $filter[] = "-g";
+            $filter[] = "48";
+            $filter[] = "-keyint_min";
+            $filter[] = "48";
+            $filter[] = "-hls_list_size";
+            $filter[] = "0";
+            $filter[] = "-hls_time";
+            $filter[] = $hls->getHlsTime();
+            $filter[] = "-hls_allow_cache";
+            $filter[] = (int)$hls->isHlsAllowCache();
+            $filter[] = "-b:v";
+            $filter[] = $representation->getKiloBitrate() . "k";
+            $filter[] = "-maxrate";
+            $filter[] = intval($representation->getKiloBitrate() * 1.2) . "k";
+            $filter[] = "-hls_segment_filename";
+            $filter[] = $dirname . "/" . $ts_sub_dir . $path_parts["filename"] . "_" . $representation->getHeight() . "p_%04d.ts";
+            $filter = array_merge($filter, $this->getBaseURL($base_url));
+            $filter = array_merge($filter, $this->getKeyInfo($hls));
+            $filter[] = "-strict";
+            $filter[] = $hls->getStrict();
+
+            if (end($representations) !== $representation) {
+                $filter[] = $dirname . "/" . $path_parts["filename"] . "_" . $representation->getHeight() . "p.m3u8";
+            }
+        }
+
+        return $filter;
+    }
+
+    /**
+     * @param HLS $hls
+     * @param $dirname
+     * @return array
+     */
+    private function getSubDirectory(HLS $hls, $dirname)
+    {
         $ts_sub_dir = Utilities::appendSlash($hls->getTsSubDirectory());
         $base_url = Utilities::appendSlash($hls->getHlsBaseUrl());
 
@@ -47,49 +93,42 @@ private function HLSFilter(HLS $hls)
             $base_url = $base_url . $hls->getTsSubDirectory() . "/";
         }
 
-        foreach ($representations as $representation) {
-            if ($representation instanceof Representation) {
-                $filter[] = "-s:v";
-                $filter[] = $representation->getResize();
-                $filter[] = "-crf";
-                $filter[] = "20";
-                $filter[] = "-sc_threshold";
-                $filter[] = "0";
-                $filter[] = "-g";
-                $filter[] = "48";
-                $filter[] = "-keyint_min";
-                $filter[] = "48";
-                $filter[] = "-hls_list_size";
-                $filter[] = "0";
-                $filter[] = "-hls_time";
-                $filter[] = $hls->getHlsTime();
-                $filter[] = "-hls_allow_cache";
-                $filter[] = (int)$hls->isHlsAllowCache();
-                $filter[] = "-b:v";
-                $filter[] = $representation->getKiloBitrate() . "k";
-                $filter[] = "-maxrate";
-                $filter[] = intval($representation->getKiloBitrate() * 1.2) . "k";
-                $filter[] = "-hls_segment_filename";
-                $filter[] = $dirname . "/" . $ts_sub_dir . $filename . "_" . $representation->getHeight() . "p_%04d.ts";
-
-                if ($base_url) {
-                    $filter[] = "-hls_base_url";
-                    $filter[] = $base_url;
-                }
-
-                if ($hls->getHlsKeyInfoFile()) {
-                    $filter[] = "-hls_key_info_file";
-                    $filter[] = $hls->getHlsKeyInfoFile();
-                }
-
-                $filter[] = "-strict";
-                $filter[] = $hls->getStrict();
-
-                if (++$counter !== $total_count) {
-                    $filter[] = $dirname . "/" . $filename . "_" . $representation->getHeight() . "p.m3u8";
-                }
-            }
+        return [$ts_sub_dir, $base_url];
+    }
+
+    private function getFormats(HLS $hls)
+    {
+        $format = ['-c:v', $hls->getFormat()->getVideoCodec()];
+
+        $audio_format = $hls->getFormat()->getAudioCodec();
+        if ($audio_format) {
+            $format = array_merge($format, ['-c:a', $audio_format]);
+        }
+
+        return $format;
+    }
+
+    private function getBaseURL($base_url)
+    {
+        $filter = [];
+
+        if ($base_url) {
+            $filter[] = "-hls_base_url";
+            $filter[] = $base_url;
         }
+
+        return $filter;
+    }
+
+    private function getKeyInfo(HLS $hls)
+    {
+        $filter = [];
+
+        if ($hls->getHlsKeyInfoFile()) {
+            $filter[] = "-hls_key_info_file";
+            $filter[] = $hls->getHlsKeyInfoFile();
+        }
+
         return $filter;
     }
 }
diff --git a/src/HLS.php b/src/HLS.php
@@ -102,19 +102,32 @@ public function setHlsKeyInfoFile(string $hls_key_info_file): HLS
     }
 
     /**
+     * @param string $save_to
      * @param string $url
-     * @param string $path
      * @param int $length
      * @return HLS
      */
-    public function generateRandomKeyInfo(string $url, string $path, int $length = 16): HLS
+    public function encryption(string $save_to, string $url, int $length = 16): HLS
     {
-        $this->setHlsKeyInfoFile(KeyInfo::generate($url, $path, $length));
+        $this->setHlsKeyInfoFile(KeyInfo::generate($url, $save_to, $length));
         $this->tmp_key_info_file = true;
 
         return $this;
     }
 
+    /**
+     * @param string $url
+     * @param string $path
+     * @param int $length
+     * @return HLS
+     * @deprecated Please use encryption instead
+     */
+    public function generateRandomKeyInfo(string $url, string $path, int $length = 16): HLS
+    {
+        @trigger_error('generateRandomKeyInfo method is deprecated and will be removed in a future release. Use encryption instead.', E_USER_DEPRECATED);
+        return $this->encryption($path, $url, $length);
+    }
+
     /**
      * @return string
      */
diff --git a/src/Traits/Representations.php b/src/Traits/Representations.php
@@ -12,7 +12,7 @@
 namespace Streaming\Traits;
 
 use Streaming\AutoRepresentations;
-use Streaming\Exception\Exception;
+use Streaming\Exception\InvalidArgumentException;
 use Streaming\Representation;
 
 trait Representations
@@ -23,15 +23,32 @@ trait Representations
     /**
      * @param Representation $rep
      * @return $this
-     * @throws Exception
+     * @deprecated Please use addRepresentations instead
      */
     public function addRepresentation(Representation $rep)
     {
-        if (!$this->format) {
-            throw new Exception('Format has not been set');
+        @trigger_error('addRepresentation method is deprecated and will be removed in a future release. Use addRepresentations instead.', E_USER_DEPRECATED);
+        $this->checkFormat();
+        $this->representations[] = $rep;
+
+        return $this;
+    }
+
+    /**
+     * @return $this
+     */
+    public function addRepresentations()
+    {
+        $this->checkFormat();
+        $reps = func_get_args();
+
+        foreach ($reps as $rep) {
+            if (!$rep instanceof Representation) {
+                throw new InvalidArgumentException('It must be instance of Representation object');
+            }
         }
 
-        $this->representations[] = $rep;
+        $this->representations = $reps;
         return $this;
     }
 
@@ -47,17 +64,22 @@ public function getRepresentations(): array
      * @param array $side_values
      * @param array|null $k_bitrate_values
      * @return $this
-     * @throws Exception
      */
     public function autoGenerateRepresentations(array $side_values = null, array $k_bitrate_values = null)
     {
-        if (!$this->format) {
-            throw new Exception('Format has not been set');
-        }
-
-        $this->representations = (new AutoRepresentations($this->getMedia()->probe(), $side_values, $k_bitrate_values))
-            ->get();
+        $this->checkFormat();
+        $this->representations = (new AutoRepresentations($this->getMedia()->probe(), $side_values, $k_bitrate_values))->get();
 
         return $this;
     }
+
+    /**
+     * check whether format is set or nor
+     */
+    private function checkFormat()
+    {
+        if (!$this->format) {
+            throw new InvalidArgumentException('First you must set the format of the video');
+        }
+    }
 }
