More Audio HLS fixes + tests

src/Drivers/InteractsWithFilters.php

@@ -84,7 +84,7 @@ public function addFilter(): self
     public function addWatermark(callable $withWatermarkFactory): self
     {
         $withWatermarkFactory(
-            $watermarkFactory = new WatermarkFactory
+            $watermarkFactory = new WatermarkFactory()
         );
 
         return $this->addFilter($watermarkFactory->get());

src/Drivers/PHPFFMpeg.php

@@ -62,7 +62,7 @@ class PHPFFMpeg
     public function __construct(FFMpeg $ffmpeg)
     {
         $this->ffmpeg                = $ffmpeg;
-        $this->pendingComplexFilters = new Collection;
+        $this->pendingComplexFilters = new Collection();
     }
 
     /**

src/Exporters/EncryptsHLSSegments.php

@@ -293,7 +293,7 @@ private function replaceAbsolutePathsHLSEncryption(Collection $playlistMedia): s
     private function cleanupHLSEncryption(): self
     {
         if ($this->encryptionSecretsRoot) {
-            (new Filesystem)->deleteDirectory($this->encryptionSecretsRoot);
+            (new Filesystem())->deleteDirectory($this->encryptionSecretsRoot);
         }
 
         return $this;

src/Exporters/HLSExporter.php

@@ -3,8 +3,11 @@
 namespace ProtoneMedia\LaravelFFMpeg\Exporters;
 
 use Closure;
+use FFMpeg\Format\Audio\DefaultAudio;
+use FFMpeg\Format\AudioInterface;
 use FFMpeg\Format\FormatInterface;
 use FFMpeg\Format\Video\DefaultVideo;
+use FFMpeg\Format\Video\X264;
 use FFMpeg\Format\VideoInterface;
 use Illuminate\Support\Collection;
 use ProtoneMedia\LaravelFFMpeg\Filesystem\Disk;
@@ -15,8 +18,8 @@ class HLSExporter extends MediaExporter
 {
     use EncryptsHLSSegments;
 
-    const HLS_KEY_INFO_FILENAME = 'hls_encryption.keyinfo';
-    const ENCRYPTION_LISTENER   = "listen-encryption-key";
+    public const HLS_KEY_INFO_FILENAME = 'hls_encryption.keyinfo';
+    public const ENCRYPTION_LISTENER   = "listen-encryption-key";
 
     /**
      * @var integer
@@ -85,7 +88,7 @@ public function withPlaylistGenerator(PlaylistGenerator $playlistGenerator): sel
 
     private function getPlaylistGenerator(): PlaylistGenerator
     {
-        return $this->playlistGenerator ?: new HLSPlaylistGenerator;
+        return $this->playlistGenerator ?: new HLSPlaylistGenerator();
     }
 
     /**
@@ -122,11 +125,11 @@ private function getSegmentFilenameGenerator(): callable
      * Calls the generator with the path (without extension), format and key.
      *
      * @param string $baseName
-     * @param \FFMpeg\Format\VideoInterface $format
+     * @param \FFMpeg\Format\AudioInterface $format
      * @param integer $key
      * @return array
      */
-    private function getSegmentPatternAndFormatPlaylistPath(string $baseName, VideoInterface $format, int $key): array
+    private function getSegmentPatternAndFormatPlaylistPath(string $baseName, AudioInterface $format, int $key): array
     {
         $segmentsPattern    = null;
         $formatPlaylistPath = null;
@@ -150,13 +153,13 @@ function ($path) use (&$formatPlaylistPath) {
     /**
      * Merges the HLS parameters to the given format.
      *
-     * @param \FFMpeg\Format\Video\DefaultVideo $format
+     * @param \FFMpeg\Format\Video\DefaultAudio $format
      * @param string $segmentsPattern
      * @param \ProtoneMedia\LaravelFFMpeg\Filesystem\Disk $disk
      * @param integer $key
      * @return array
      */
-    private function addHLSParametersToFormat(DefaultVideo $format, string $segmentsPattern, Disk $disk, int $key): array
+    private function addHLSParametersToFormat(DefaultAudio $format, string $segmentsPattern, Disk $disk, int $key): array
     {
         $format->setAdditionalParameters(array_merge(
             $format->getAdditionalParameters() ?: [],
@@ -177,6 +180,7 @@ private function addHLSParametersToFormat(DefaultVideo $format, string $segments
             $this->getEncrypedHLSParameters()
         ));
 
+
         return $hlsParameters;
     }
 
@@ -251,7 +255,7 @@ private function cleanupSegmentPlaylistGuides(Media $media): self
     private function prepareSaving(string $path = null): Collection
     {
         if (!$this->pendingFormats) {
-            throw new NoFormatException;
+            throw new NoFormatException();
         }
 
         $media = $this->getDisk()->makeMedia($path);
@@ -267,6 +271,7 @@ private function prepareSaving(string $path = null): Collection
                 $key
             );
 
+
             $disk = $this->getDisk()->clone();
 
             $this->addHLSParametersToFormat($format, $segmentsPattern, $disk, $key);
@@ -335,9 +340,46 @@ public function save(string $mainPlaylistPath = null): MediaOpener
     public function addFormat(FormatInterface $format, callable $filtersCallback = null): self
     {
         if (!$this->pendingFormats) {
-            $this->pendingFormats = new Collection;
+            $this->pendingFormats = new Collection();
         }
 
+        if (!$format instanceof DefaultVideo && $format instanceof DefaultAudio) {
+            $originalFormat = clone $format;
+
+            $format = new class () extends DefaultVideo {
+                private array $audioCodecs = [];
+
+                public function setAvailableAudioCodecs(array $audioCodecs)
+                {
+                    $this->audioCodecs = $audioCodecs;
+                }
+
+                public function getAvailableAudioCodecs(): array
+                {
+                    return $this->audioCodecs;
+                }
+
+                public function supportBFrames()
+                {
+                    return false;
+                }
+
+                public function getAvailableVideoCodecs()
+                {
+                    return [];
+                }
+            };
+
+            $format->setAvailableAudioCodecs($originalFormat->getAvailableAudioCodecs());
+            $format->setAudioCodec($originalFormat->getAudioCodec());
+            $format->setAudioKiloBitrate($originalFormat->getAudioKiloBitrate());
+
+            if ($originalFormat->getAudioChannels()) {
+                $format->setAudioChannels($originalFormat->getAudioChannels());
+            }
+        }
+
+
         $this->pendingFormats->push([$format, $filtersCallback]);
 
         return $this;

src/Exporters/HLSPlaylistGenerator.php

@@ -11,8 +11,8 @@
 
 class HLSPlaylistGenerator implements PlaylistGenerator
 {
-    const PLAYLIST_START = '#EXTM3U';
-    const PLAYLIST_END   = '#EXT-X-ENDLIST';
+    public const PLAYLIST_START = '#EXTM3U';
+    public const PLAYLIST_END   = '#EXT-X-ENDLIST';
 
     /**
      * Return the line from the master playlist that references the given segment playlist.

src/Exporters/HLSVideoFilters.php

@@ -11,7 +11,7 @@
 
 class HLSVideoFilters
 {
-    const MAPPING_GLUE = "_hls_";
+    public const MAPPING_GLUE = "_hls_";
 
     /**
      * @var \ProtoneMedia\LaravelFFMpeg\Drivers\PHPFFMpeg
@@ -106,7 +106,7 @@ public function resize($width, $height, $mode = ResizeFilter::RESIZEMODE_FIT, $f
      */
     public function addWatermark(callable $withWatermarkFactory): self
     {
-        $withWatermarkFactory($watermarkFactory = new WatermarkFactory);
+        $withWatermarkFactory($watermarkFactory = new WatermarkFactory());
 
         return $this->addLegacyFilter($watermarkFactory->get());
     }

src/Exporters/MediaExporter.php

@@ -20,12 +20,12 @@
  */
 class MediaExporter
 {
-    use ForwardsCalls,
-        HandlesAdvancedMedia,
-        HandlesConcatenation,
-        HandlesFrames,
-        HandlesTimelapse,
-        HasProgressListener;
+    use ForwardsCalls;
+    use HandlesAdvancedMedia;
+    use HandlesConcatenation;
+    use HandlesFrames;
+    use HandlesTimelapse;
+    use HasProgressListener;
 
     /**
      * @var \ProtoneMedia\LaravelFFMpeg\Drivers\PHPFFMpeg
@@ -59,7 +59,7 @@ public function __construct(PHPFFMpeg $driver)
     {
         $this->driver = $driver;
 
-        $this->maps = new Collection;
+        $this->maps = new Collection();
     }
 
     protected function getDisk(): Disk
@@ -107,7 +107,7 @@ public function withVisibility(string $visibility)
     public function addTileFilter(callable $withTileFactory): self
     {
         $withTileFactory(
-            $tileFactory = new TileFactory
+            $tileFactory = new TileFactory()
         );
 
         $this->addFilter($filter = $tileFactory->get());
@@ -138,7 +138,7 @@ public function getCommand(string $path = null)
         $media = $this->prepareSaving($path);
 
         return $this->driver->getFinalCommand(
-            $this->format ?: new NullFormat,
+            $this->format ?: new NullFormat(),
             optional($media)->getLocalPath() ?: '/dev/null'
         );
     }
@@ -229,7 +229,7 @@ public function save(string $path = null)
                 }
             } else {
                 $this->driver->save(
-                    $this->format ?: new NullFormat,
+                    $this->format ?: new NullFormat(),
                     optional($outputMedia)->getLocalPath() ?: '/dev/null'
                 );
             }
@@ -253,7 +253,7 @@ public function save(string $path = null)
 
     public function getProcessOutput(): ProcessOutput
     {
-        return tap(new StdListener, function (StdListener $listener) {
+        return tap(new StdListener(), function (StdListener $listener) {
             $this->addListener($listener)->save();
             $listener->removeAllListeners();
             $this->removeListener($listener);

src/FFMpeg/StdListener.php

@@ -9,7 +9,7 @@
 
 class StdListener extends EventEmitter implements ListenerInterface
 {
-    const TYPE_ALL = 'all';
+    public const TYPE_ALL = 'all';
 
     /**
      * Name of the emitted event.

src/Filesystem/MediaOnNetwork.php

@@ -77,7 +77,7 @@ public function toMedia(callable $withCurl = null): Media
         curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
 
         if (!empty($this->headers)) {
-            $headers = Collection::make($this->headers)->map(function($value, $header) {
+            $headers = Collection::make($this->headers)->map(function ($value, $header) {
                 return "{$header}: {$value}";
             })->all();
 

src/Filesystem/TemporaryDirectories.php

@@ -49,7 +49,7 @@ public function create(): string
      */
     public function deleteAll(): void
     {
-        $filesystem = new Filesystem;
+        $filesystem = new Filesystem();
 
         foreach ($this->directories as $directory) {
             $filesystem->deleteDirectory($directory);

src/Filters/TileFactory.php

@@ -22,7 +22,7 @@ class TileFactory
 
     public static function make(): TileFactory
     {
-        return new static;
+        return new static();
     }
 
     /**

src/Filters/WatermarkFactory.php

@@ -17,11 +17,11 @@ class WatermarkFactory
     use ForwardsCalls;
 
     /** position constants */
-    const LEFT   = 'left';
-    const RIGHT  = 'right';
-    const CENTER = 'center';
-    const TOP    = 'top';
-    const BOTTOM = 'bottom';
+    public const LEFT   = 'left';
+    public const RIGHT  = 'right';
+    public const CENTER = 'center';
+    public const TOP    = 'top';
+    public const BOTTOM = 'bottom';
 
     /**
      * @var \ProtoneMedia\LaravelFFMpeg\Filesystem\Disk

src/MediaOpener.php

@@ -59,7 +59,7 @@ public function __construct($disk = null, PHPFFMpeg $driver = null, MediaCollect
 
         $this->driver = ($driver ?: app(PHPFFMpeg::class))->fresh();
 
-        $this->collection = $mediaCollection ?: new MediaCollection;
+        $this->collection = $mediaCollection ?: new MediaCollection();
     }
 
     public function clone(): self
@@ -214,7 +214,7 @@ public function exportTile(callable $withTileFactory): MediaExporter
     {
         return $this->export()
             ->addTileFilter($withTileFactory)
-            ->inFormat(new ImageFormat);
+            ->inFormat(new ImageFormat());
     }
 
     public function exportFramesByAmount(int $amount, int $width = null, int $height = null, int $quality = null): MediaExporter