Merge pull request #196 from pascalbaljetmedia/v7-hls-audio-bugfix

HLS audio bugfix

Author: pascalbaljet

CHANGELOG.md

@@ -2,6 +2,25 @@
 
 All Notable changes to `pbmedia/laravel-ffmpeg` will be documented in this file
 
+## 7.0.2 - 2020-06-01
+
+### Added
+
+-   Nothing
+
+### Deprecated
+
+-   Nothing
+
+### Fixed
+
+-   Audio bugfix for HLS exports with filters
+
+### Removed
+
+-   Nothing
+
+
 ## 7.0.1 - 2020-05-28
 
 ### Added

src/Drivers/PHPFFMpeg.php

@@ -16,6 +16,7 @@
 use Illuminate\Support\Collection;
 use Illuminate\Support\Traits\ForwardsCalls;
 use ProtoneMedia\LaravelFFMpeg\FFMpeg\LegacyFilterMapping;
+use ProtoneMedia\LaravelFFMpeg\Filesystem\Media;
 use ProtoneMedia\LaravelFFMpeg\Filesystem\MediaCollection;
 
 class PHPFFMpeg
@@ -137,7 +138,13 @@ public function openAdvanced(MediaCollection $mediaCollection): self
 
     public function getStreams(): array
     {
-        return iterator_to_array($this->media->getStreams());
+        if (!$this->isAdvancedMedia()) {
+            return iterator_to_array($this->media->getStreams());
+        }
+
+        return $this->mediaCollection->map(function (Media $media) {
+            return $this->fresh()->open(MediaCollection::make([$media]))->getStreams();
+        })->collapse()->all();
     }
 
     public function getFilters(): array
@@ -170,6 +177,16 @@ public function getDurationInMiliseconds(): int
         }
     }
 
+    /**
+     * Gets the first audio streams of the media.
+     */
+    public function getAudioStream(): ?Stream
+    {
+        return Arr::first($this->getStreams(), function (Stream $stream) {
+            return $stream->isAudio();
+        });
+    }
+
     /**
      * Gets the first video streams of the media.
      */

src/Exporters/HLSExporter.php

@@ -194,7 +194,11 @@ public function save(string $path = null): MediaOpener
                 }
             }
 
-            $this->addFormatOutputMapping($format, $disk->makeMedia($formatPlaylistPath), [$keysWithFilters[$key] ?? '0']);
+            $outs = array_key_exists($key, $keysWithFilters)
+                ? array_filter([$keysWithFilters[$key], $this->getAudioStream() ? "0:a" : null])
+                : ['0'];
+
+            $this->addFormatOutputMapping($format, $disk->makeMedia($formatPlaylistPath), $outs);
 
             return $this->getDisk()->makeMedia($formatPlaylistPath);
         })->pipe(function ($playlistMedia) use ($path) {

tests/AddFilterTest.php

@@ -6,7 +6,6 @@
 use FFMpeg\Filters\Audio\SimpleFilter;
 use FFMpeg\Filters\Video\VideoFilters;
 use FFMpeg\Format\AudioInterface;
-use FFMpeg\Format\Video\X264;
 use FFMpeg\Media\Audio;
 use Illuminate\Support\Arr;
 use ProtoneMedia\LaravelFFMpeg\FFMpeg\LegacyFilterMapping;
@@ -130,7 +129,7 @@ public function it_can_add_a_complex_filter_object_with_a_input_and_output()
             ->open(['video.mp4', 'video2.mp4'])
             ->addFilter('[0:v][1:v]', 'hstack', '[v]')
             ->export()
-            ->addFormatOutputMapping(new X264, Media::make('local', 'output.mp4'), ['0:a', '[v]'])
+            ->addFormatOutputMapping($this->x264(), Media::make('local', 'output.mp4'), ['0:a', '[v]'])
             ->getCommand();
 
         $this->assertStringContainsString('-filter_complex [0:v][1:v]hstack[v] -map 0:a -map [v]', $command);
@@ -149,7 +148,7 @@ public function it_can_add_a_basic_filter_to_an_advanced_media_object_using_a_fi
             ->open(['video.mp4', 'video2.mp4'])
             ->addFilterAsComplexFilter('[0]', '[v0]', $resizeFilter)
             ->export()
-            ->addFormatOutputMapping(new X264, Media::make('local', 'output.mp4'), ['[v0]'])
+            ->addFormatOutputMapping($this->x264(), Media::make('local', 'output.mp4'), ['[v0]'])
             ->save();
 
         $this->assertEquals(
@@ -169,7 +168,7 @@ public function it_can_add_a_basic_filter_to_an_advanced_media_object_using_a_cl
                 $filters->resize(new \FFMpeg\Coordinate\Dimension(1280, 960));
             })
             ->export()
-            ->addFormatOutputMapping(new X264, Media::make('local', 'output.mp4'), ['[v0]'])
+            ->addFormatOutputMapping($this->x264(), Media::make('local', 'output.mp4'), ['[v0]'])
             ->save();
 
         $this->assertEquals(

tests/ExportTest.php

@@ -6,7 +6,6 @@
 use FFMpeg\Filters\Video\ClipFilter;
 use FFMpeg\Format\Audio\Mp3;
 use FFMpeg\Format\Video\WMV;
-use FFMpeg\Format\Video\X264;
 use Illuminate\Support\Facades\Storage;
 use ProtoneMedia\LaravelFFMpeg\FFMpeg\ProgressListenerDecorator;
 use ProtoneMedia\LaravelFFMpeg\Filesystem\Media;
@@ -23,7 +22,7 @@ public function it_can_export_a_single_video_file()
         (new MediaOpener)
             ->open('video.mp4')
             ->export()
-            ->inFormat(new X264)
+            ->inFormat($this->x264())
             ->save('new_video.mp4');
 
         $this->assertTrue(Storage::disk('local')->has('new_video.mp4'));
@@ -49,7 +48,7 @@ public function it_can_bind_a_progress_listener_to_the_format()
 
         $percentages = [];
 
-        $format = new X264;
+        $format = $this->x264();
         $format->on('progress', function ($video, $format, $percentage) use (&$percentages) {
             $percentages[] = $percentage;
         });
@@ -70,7 +69,7 @@ public function it_can_decorate_the_format_to_get_access_to_the_progress_listene
 
         $times = [];
 
-        $decoratedFormat = ProgressListenerDecorator::decorate(new X264);
+        $decoratedFormat = ProgressListenerDecorator::decorate($this->x264());
 
         (new MediaOpener)
             ->open('video.mp4')
@@ -102,7 +101,7 @@ public function it_can_bind_a_dedicated_progress_listener_to_the_exporter()
                 $remainings[] = $remaining;
                 $rates[] = $rate;
             })
-            ->inFormat(new X264)
+            ->inFormat($this->x264())
             ->save('new_video.mp4');
 
         $this->assertNotEmpty($percentages);
@@ -118,10 +117,10 @@ public function it_can_chain_multiple_exports()
         (new MediaOpener)
             ->open('video.mp4')
             ->export()
-            ->inFormat(new X264)
+            ->inFormat($this->x264())
             ->save('new_video1.mp4')
             ->export()
-            ->inFormat(new X264)
+            ->inFormat($this->x264())
             ->save('new_video2.mp4');
 
         $this->assertTrue(Storage::disk('local')->has('new_video1.mp4'));
@@ -137,7 +136,7 @@ public function it_can_export_a_with_a_single_filter()
             ->open('video.mp4')
             ->addFilter(new ClipFilter(TimeCode::fromSeconds(1), TimeCode::fromSeconds(2)))
             ->export()
-            ->inFormat(new X264)
+            ->inFormat($this->x264())
             ->save('new_video.mp4');
 
         $this->assertTrue(Storage::disk('local')->has('new_video.mp4'));
@@ -153,7 +152,7 @@ public function it_can_add_the_filter_after_calling_the_export_method()
             ->open('video.mp4')
             ->export()
             ->addFilter(new ClipFilter(TimeCode::fromSeconds(1), TimeCode::fromSeconds(2)))
-            ->inFormat(new X264)
+            ->inFormat($this->x264())
             ->save('new_video.mp4');
 
         $this->assertTrue(Storage::disk('local')->has('new_video.mp4'));
@@ -169,11 +168,11 @@ public function it_doesnt_migrate_filters_from_a_previous_export()
             ->open('video.mp4')
             ->addFilter(new ClipFilter(TimeCode::fromSeconds(1), TimeCode::fromSeconds(2)))
             ->export()
-            ->inFormat(new X264)
+            ->inFormat($this->x264())
             ->save('short_video.mp4')
 
             ->export()
-            ->inFormat(new X264)
+            ->inFormat($this->x264())
             ->save('long_video.mp4');
 
         $this->assertTrue(Storage::disk('local')->has('short_video.mp4'));
@@ -196,7 +195,7 @@ public function it_can_export_two_files_into_a_two_files_with_filters_and_a_prog
             ->onProgress(function ($percentage) use (&$percentages) {
                 $percentages[] = $percentage;
             })
-            ->addFormatOutputMapping(new X264, Media::make('local', 'new_video1.mp4'), ['0:v', '1:v'])
+            ->addFormatOutputMapping($this->x264(), Media::make('local', 'new_video1.mp4'), ['0:v', '1:v'])
             ->addFormatOutputMapping(new WMV, Media::make('memory', 'new_video2.wmv'), ['0:v', '1:v'])
             ->save();
 
@@ -215,7 +214,7 @@ public function it_can_stack_two_videos_horizontally()
             ->open(['video.mp4', 'video2.mp4'])
             ->export()
             ->addFilter('[0:v][1:v]', 'hstack', '[v]')
-            ->addFormatOutputMapping(new X264, Media::make('local', 'new_video.mp4'), ['[v]'])
+            ->addFormatOutputMapping($this->x264(), Media::make('local', 'new_video.mp4'), ['[v]'])
             ->save();
 
         $this->assertTrue(Storage::disk('local')->has('new_video.mp4'));
@@ -230,12 +229,13 @@ public function it_can_stack_two_videos_horizontally()
     public function it_can_mix_audio_and_video_files()
     {
         $this->fakeLocalVideoFile();
+        $this->addTestFile('video_no_audio.mp4');
         $this->addTestFile('guitar.m4a');
 
         FFMpeg::fromDisk('local')
             ->open(['video.mp4','guitar.m4a'])
             ->export()
-            ->addFormatOutputMapping(new X264('libmp3lame'), Media::make('local', 'new_video.mp4'), ['0:v', '1:a'])
+            ->addFormatOutputMapping($this->x264(), Media::make('local', 'new_video.mp4'), ['0:v', '1:a'])
             ->save();
 
         $this->assertTrue(Storage::disk('local')->has('new_video.mp4'));
@@ -249,7 +249,7 @@ public function it_can_export_a_single_media_file_to_an_external_location()
         (new MediaOpener)
             ->open('video.mp4')
             ->export()
-            ->inFormat(new X264)
+            ->inFormat($this->x264())
             ->toDisk('memory')
             ->save('new_video.mp4');
 
@@ -265,7 +265,7 @@ public function it_can_create_a_timelapse_from_images()
             ->open('feature_%04d.png')
             ->export()
             ->asTimelapseWithFramerate(1)
-            ->inFormat(new X264)
+            ->inFormat($this->x264())
             ->save('timelapse.mp4');
 
         $this->assertTrue(Storage::disk('local')->has('timelapse.mp4'));
@@ -292,7 +292,7 @@ public function it_can_concatenate_two_videos_using_the_concat_method()
         $media = (new MediaOpener)->fromDisk('local')->open('concat.mp4');
 
         $this->assertEquals(
-            7,
+            9,
             $media->getDurationInSeconds()
         );
 
@@ -311,15 +311,15 @@ public function it_can_concatenate_two_videos_using_a_complex_filter()
             ->open(['video.mp4', 'video2.mp4'])
             ->export()
             ->concatWithTranscoding(true, false)
-            ->inFormat(new X264)
+            ->inFormat($this->x264())
             ->save('concat.mp4');
 
         $this->assertTrue(Storage::disk('local')->has('concat.mp4'));
 
         $media = (new MediaOpener)->fromDisk('local')->open('concat.mp4');
 
         $this->assertEquals(
-            7,
+            9,
             $media->getDurationInSeconds()
         );