fix(hls): Move setFormat into the OutputBuilder

Author: Euklios

.gitignore

@@ -21,3 +21,4 @@ apidocs
 *.log
 *.log.mbtree
 output.mp4
+tmp/

src/main/java/net/bramp/ffmpeg/builder/FFmpegBuilder.java

@@ -26,7 +26,7 @@
 public class FFmpegBuilder {
 
   public enum Strict {
-    VERY, // strictly conform to a older more strict version of the specifications or reference
+    VERY, // strictly conform to an older more strict version of the specifications or reference
     // software
     STRICT, // strictly conform to all the things in the specificiations no matter what consequences
     NORMAL, // normal
@@ -269,16 +269,14 @@ public FFmpegOutputBuilder addOutput(URI uri) {
    * <pre>
    * <code>List&lt;String&gt; args = new FFmpegBuilder()
    *   .addHlsOutput(&quot;output.m3u8&quot;)
-   *   .build();</code>
+   *   .done().build();</code>
    * </pre>
    *
    * @param filename output file path
    *
    * @return A new {@link FFmpegHlsOutputBuilder}
    */
   public FFmpegHlsOutputBuilder addHlsOutput(String filename) {
-    checkArgument(format == null || format.equals("hls"),"The format is already set to a value other than hls.");
-    if(format == null) setFormat("hls");
     FFmpegHlsOutputBuilder output = new FFmpegHlsOutputBuilder(this, filename);
     outputs.add(output);
     return output;
@@ -316,7 +314,7 @@ public FFmpegOutputBuilder addStdoutOutput() {
 
   @CheckReturnValue
   public List<String> build() {
-    ImmutableList.Builder<String> args = new ImmutableList.Builder<String>();
+    ImmutableList.Builder<String> args = new ImmutableList.Builder<>();
 
     Preconditions.checkArgument(!inputs.isEmpty(), "At least one input must be specified");
     Preconditions.checkArgument(!outputs.isEmpty(), "At least one output must be specified");

src/main/java/net/bramp/ffmpeg/builder/FFmpegHlsOutputBuilder.java

@@ -19,8 +19,18 @@ public class FFmpegHlsOutputBuilder extends AbstractFFmpegOutputBuilder<FFmpegHl
 
     protected FFmpegHlsOutputBuilder(FFmpegBuilder parent, String filename) {
         super(parent, filename);
+        setFormat("hls");
     }
 
+    @Override
+    public FFmpegHlsOutputBuilder setFormat(String format) {
+        if (format == null || !format.equals("hls")) {
+            throw new IllegalArgumentException("Format cannot be set to anything else except 'hls' for FFmpegHlsOutputBuilder");
+        }
+        super.setFormat(format);
+
+        return this;
+    }
 
     /**
      * Set the target segment length. Default value is 2 seconds.

src/test/java/net/bramp/ffmpeg/builder/FFmpegHlsOutputBuilderTest.java

@@ -1,15 +1,22 @@
 package net.bramp.ffmpeg.builder;
 
 import com.google.common.collect.ImmutableList;
+
+import java.nio.file.Files;
+import java.nio.file.Paths;
 import java.util.concurrent.TimeUnit;
+
+import net.bramp.ffmpeg.FFmpeg;
+import net.bramp.ffmpeg.fixtures.Samples;
 import org.junit.Test;
 import java.io.IOException;
 import java.util.List;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 public class FFmpegHlsOutputBuilderTest {
-    public FFmpegHlsOutputBuilderTest() throws IOException {
+    public FFmpegHlsOutputBuilderTest() {
     }
 
     @Test
@@ -25,10 +32,10 @@ public void testAddHlsOutput() {
                         .setHlsSegmentFileName("file%03d.ts")
                         .done()
                         .build();
-        assertEquals(
-                args, ImmutableList.of("-y", "-v", "error", "-f", "hls", "-i", "input", "-hls_time", "00:00:00.005",
+
+        assertEquals(ImmutableList.of("-y", "-v", "error", "-i", "input", "-f", "hls", "-hls_time", "00:00:00.005",
                         "-hls_segment_filename", "file%03d.ts", "-hls_init_time", "00:00:00.003",
-                        "-hls_list_size", "3", "-hls_base_url", "test1234/", "output.m3u8"));
+                        "-hls_list_size", "3", "-hls_base_url", "test1234/", "output.m3u8"), args);
     }
 
     @Test
@@ -46,11 +53,33 @@ public void mixedHlsAndDefault() {
                         .setHlsSegmentFileName("file%03d.ts")
                         .done()
                         .build();
-        assertEquals(
-                args, ImmutableList.of("-y", "-v", "error", "-f","hls", "-i", "input","-b:v","3","-vf","TEST","-hls_time", "00:00:00.005",
+
+        assertEquals(ImmutableList.of("-y", "-v", "error", "-i", "input","-f","hls","-b:v","3","-vf","TEST","-hls_time", "00:00:00.005",
                         "-hls_segment_filename", "file%03d.ts", "-hls_init_time", "00:00:00.003",
-                        "-hls_list_size", "3", "-hls_base_url", "test1234/", "output.m3u8"));
+                        "-hls_list_size", "3", "-hls_base_url", "test1234/", "output.m3u8"), args);
     }
 
+    @Test
+    public void testConvertVideoToHls() throws IOException {
+        Files.createDirectories(Paths.get("tmp/"));
+        Files.deleteIfExists(Paths.get("tmp/output.m3u8"));
+        Files.deleteIfExists(Paths.get("tmp/file000.m3u8"));
+
+        List<String> command = new FFmpegBuilder()
+                .setInput(Samples.TEST_PREFIX + Samples.base_big_buck_bunny_720p_1mb)
+                .addHlsOutput("tmp/output.m3u8")
+                .setHlsTime(5, TimeUnit.SECONDS)
+                .setHlsBaseUrl("test1234/")
+                .setVideoBitRate(1000)
+                .setHlsListSize(3)
+                .setHlsInitTime(3, TimeUnit.MILLISECONDS)
+                .setHlsSegmentFileName("tmp/file%03d.ts")
+                .done()
+                .build();
 
-}
+        new FFmpeg().run(command);
+
+        assertTrue(Files.exists(Paths.get("tmp/output.m3u8")));
+        assertTrue(Files.exists(Paths.get("tmp/file000.ts")));
+    }
+}