diff --git a/README.md b/README.md index edbee3f..87050cb 100644 --- a/README.md +++ b/README.md @@ -625,3 +625,11 @@ $app->register(new FFMpeg\FFMpegServiceProvider(), array( ## License This project is licensed under the [MIT license](http://opensource.org/licenses/MIT). + +Music: "Favorite Secrets" by Waylon Thornton +From the Free Music Archive +[CC BY NC SA](http://creativecommons.org/licenses/by-nc-sa/3.0/us/) + +Music: "Siesta" by Jahzzar +From the Free Music Archive +[CC BY SA](https://creativecommons.org/licenses/by-sa/3.0/) diff --git a/tests/Functional/AudioConcatenationTest.php b/tests/Functional/AudioConcatenationTest.php new file mode 100644 index 0000000..7e2027b --- /dev/null +++ b/tests/Functional/AudioConcatenationTest.php @@ -0,0 +1,34 @@ +getFFMpeg(); + + $files = [ + __DIR__ . '/../files/Jahzzar_-_05_-_Siesta.mp3', + __DIR__ . '/../files/02_-_Favorite_Secrets.mp3', + ]; + + $audio = $ffmpeg->open(current($files)); + + $this->assertInstanceOf('FFMpeg\Media\Audio', $audio); + + $filename = __DIR__ . '/output/concat-output.mp3'; + + if (is_file($filename)) { + unlink($filename); + } + + $audio->concat($files)->saveFromSameCodecs($filename, TRUE); + + $this->assertFileExists($filename); + unlink($filename); + } +} \ No newline at end of file diff --git a/tests/files/02_-_Favorite_Secrets.mp3 b/tests/files/02_-_Favorite_Secrets.mp3 new file mode 100644 index 0000000..3f6ef4e Binary files /dev/null and b/tests/files/02_-_Favorite_Secrets.mp3 differ diff --git a/tests/files/Jahzzar_-_05_-_Siesta.mp3 b/tests/files/Jahzzar_-_05_-_Siesta.mp3 new file mode 100644 index 0000000..1db27d7 Binary files /dev/null and b/tests/files/Jahzzar_-_05_-_Siesta.mp3 differ