- some minor improvements

Author: aminyazdanpanah

README.md

@@ -216,7 +216,8 @@ $rep_2 = (new Representation())->setKiloBitrate(500)->setResize(640 , 360);
 $rep_3 = (new Representation())->setKiloBitrate(200)->setResize(480 , 270);
 
 $video->HLS()
-    ->X264() 
+    ->X264()
+    ->setHlsBaseUrl("https://bucket.s3-us-west-1.amazonaws.com/videos") // Add a base URL
     ->addRepresentation($rep_1)
     ->addRepresentation($rep_2)
     ->addRepresentation($rep_3)
@@ -251,6 +252,7 @@ $url = "https://www.aminyazdanpanah.com/keys/enc.key";// or "/keys/enc.key";
 
 $video->HLS()
     ->X264()
+    ->setTsSubDirectory("ts_files")// put all ts files in subdirectory
     ->generateRandomKeyInfo($url, $save_to)
     ->autoGenerateRepresentations([1080, 480, 240])
     ->save('/var/www/media/videos/hls/test.m3u8');
@@ -290,6 +292,8 @@ $format->on('progress', function ($video, $format, $percentage) {
 
 $video->HLS()
     ->setFormat($format)
+    ->setTsSubDirectory("ts_files")
+    ->setHlsBaseUrl("https://bucket.s3-us-west-1.amazonaws.com/videos")
     ->autoGenerateRepresentations()
     ->save('/var/www/media/videos/dash/test.m3u8');
 ```

src/Filters/HLSFilter.php

@@ -12,6 +12,7 @@
 namespace Streaming\Filters;
 
 use Streaming\FileManager;
+use Streaming\Helper;
 use Streaming\HLS;
 use Streaming\Representation;
 
@@ -40,8 +41,8 @@ private function HLSFilter(HLS $media)
         $path_parts = $media->getPathInfo();
         $dirname = str_replace("\\", "/", $path_parts["dirname"]);
         $filename = substr($path_parts["filename"], -50);
-        $ts_sub_dir = ($media->getTsSubDirectory() && substr($media->getTsSubDirectory(), -1) !== "/") ? $media->getTsSubDirectory() . "/" : $media->getTsSubDirectory();
-        $base_url = ($media->getHlsBaseUrl() && substr($media->getHlsBaseUrl(), -1) !== "/") ? $media->getHlsBaseUrl() . "/" : $media->getHlsBaseUrl();
+        $ts_sub_dir = Helper::appendSlash($media->getTsSubDirectory());
+        $base_url = Helper::appendSlash($media->getHlsBaseUrl());
 
         if ($ts_sub_dir) {
             FileManager::makeDir($dirname . DIRECTORY_SEPARATOR . $ts_sub_dir);

src/Helper.php

@@ -26,7 +26,6 @@ public static function roundToEven(float $number): int
         return (($number = intval($number)) % 2 == 0) ? $number : $number + 1;
     }
 
-
     /**
      * @param int $length
      * @return bool|string
@@ -35,6 +34,17 @@ public static function randomString($length = 10)
     {
         $chars = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
         return substr(str_shuffle(str_repeat($chars, ceil($length / strlen($chars)))), 1, $length);
+    }
 
+    /**
+     * @param $word
+     * @return bool|string
+     */
+    public static function appendSlash($word)
+    {
+        if($word){
+            return rtrim($word, '/') . '/';
+        }
+        return $word;
     }
 }