feat: Extract input and output specifier into their own method

This allows classes extending AbstractFFmpegStreamBuilder to overwrite only how input/output specifiers are generated without duplicating flags

Author: Euklios

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

@@ -48,19 +48,6 @@ public EncodingOptions buildOptions() {
         return null;
     }
 
-    @Override
-    protected List<String> build(FFmpegBuilder parent, int pass) {
-        ImmutableList.Builder<String> args = new ImmutableList.Builder<>();
-
-        addGlobalFlags(parent, args);
-
-        // TODO: Handle input options
-
-        args.addAll(buildInputString());
-
-        return args.build();
-    }
-
     @Override
     protected void addGlobalFlags(FFmpegBuilder parent, ImmutableList.Builder<String> args) {
         if (this.readAtNativeFrameRate) {
@@ -69,6 +56,4 @@ protected void addGlobalFlags(FFmpegBuilder parent, ImmutableList.Builder<String
 
         super.addGlobalFlags(parent, args);
     }
-
-    protected abstract List<String> buildInputString();
 }

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

@@ -397,6 +397,24 @@ protected void addAudioFlags(ImmutableList.Builder<String> args) {
     }
   }
 
+  @Override
+  protected void addSourceTarget(int pass, ImmutableList.Builder<String> args) {
+    if (filename != null && uri != null) {
+      throw new IllegalStateException("Only one of filename and uri can be set");
+    }
+
+    // Output
+    if (pass == 1) {
+      args.add(DEVNULL);
+    } else if (filename != null) {
+      args.add(filename);
+    } else if (uri != null) {
+      args.add(uri.toString());
+    } else {
+      assert false;
+    }
+  }
+
   @CheckReturnValue
   @Override
   protected T getThis() {

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

@@ -584,24 +584,13 @@ protected List<String> build(FFmpegBuilder parent, int pass) {
 
     args.addAll(extra_args);
 
-    if (filename != null && uri != null) {
-      throw new IllegalStateException("Only one of filename and uri can be set");
-    }
-
-    // Output
-    if (pass == 1) {
-      args.add(DEVNULL);
-    } else if (filename != null) {
-      args.add(filename);
-    } else if (uri != null) {
-      args.add(uri.toString());
-    } else {
-      assert false;
-    }
+    addSourceTarget(pass, args);
 
     return args.build();
   }
 
+  protected abstract void addSourceTarget(int pass, ImmutableList.Builder<String> args);
+
   protected void addGlobalFlags(FFmpegBuilder parent, ImmutableList.Builder<String> args) {
     if (strict != FFmpegBuilder.Strict.NORMAL) {
       args.add("-strict", strict.toString());

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

@@ -1,12 +1,8 @@
 package net.bramp.ffmpeg.builder;
 
-import net.bramp.ffmpeg.options.EncodingOptions;
+import com.google.common.collect.ImmutableList;
 import net.bramp.ffmpeg.probe.FFmpegProbeResult;
 
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
 public class FFmpegFileInputBuilder extends AbstractFFmpegInputBuilder<FFmpegFileInputBuilder> {
     private final String filename;
 
@@ -26,7 +22,18 @@ public FFmpegFileInputBuilder(FFmpegBuilder parent, String filename, FFmpegProbe
     }
 
     @Override
-    protected List<String> buildInputString() {
-        return Arrays.asList("-i", filename);
+    protected void addSourceTarget(int pass, ImmutableList.Builder<String> args) {
+        if (filename != null && uri != null) {
+            throw new IllegalStateException("Only one of filename and uri can be set");
+        }
+
+        // Input
+        if (filename != null) {
+            args.add("-i", filename);
+        } else if (uri != null) {
+            args.add("-i", uri.toString());
+        } else {
+            assert false;
+        }
     }
 }

src/test/java/net/bramp/ffmpeg/InputOutputTest.java

@@ -130,4 +130,112 @@ public void readAtNativeFrameRateMultiple() {
 
         assertThat(command, is(ImmutableList.of("-y", "-v", "error", "-re", "-i", "input.mp4", "-re", "-i", "input.mkv", "output.mp4")));
     }
+
+    @Test
+    public void outputCodec() {
+        List<String> command = new FFmpegBuilder()
+                .addInput("input.mp4")
+                .done()
+                .addOutput("output.mp4")
+                .setVideoCodec("libx264")
+                .setAudioCodec("aac")
+                .setSubtitleCodec("vtt")
+                .done()
+                .build();
+
+        assertThat(command, is(ImmutableList.of("-y", "-v", "error", "-i", "input.mp4", "-vcodec", "libx264", "-acodec", "aac", "-scodec", "vtt", "output.mp4")));
+    }
+
+    @Test
+    public void inputCodec() {
+        List<String> command = new FFmpegBuilder()
+                .addInput("input.mp4")
+                .setVideoCodec("libx264")
+                .setAudioCodec("aac")
+                .setSubtitleCodec("vtt")
+                .done()
+                .addOutput("output.mp4")
+                .done()
+                .build();
+
+        assertThat(command, is(ImmutableList.of("-y", "-v", "error", "-vcodec", "libx264", "-acodec", "aac", "-scodec", "vtt", "-i", "input.mp4", "output.mp4")));
+    }
+
+    @Test
+    public void inputVideoDisabled() {
+        List<String> command = new FFmpegBuilder()
+                .addInput("input.mp4")
+                .disableVideo()
+                .done()
+                .addOutput("output.mp4")
+                .done()
+                .build();
+
+        assertThat(command, is(ImmutableList.of("-y", "-v", "error", "-vn", "-i", "input.mp4", "output.mp4")));
+    }
+
+    @Test
+    public void outputVideoDisabled() {
+        List<String> command = new FFmpegBuilder()
+                .addInput("input.mp4")
+                .done()
+                .addOutput("output.mp4")
+                .disableVideo()
+                .done()
+                .build();
+
+        assertThat(command, is(ImmutableList.of("-y", "-v", "error", "-i", "input.mp4", "-vn", "output.mp4")));
+    }
+
+    @Test
+    public void inputAudioDisabled() {
+        List<String> command = new FFmpegBuilder()
+                .addInput("input.mp4")
+                .disableAudio()
+                .done()
+                .addOutput("output.mp4")
+                .done()
+                .build();
+
+        assertThat(command, is(ImmutableList.of("-y", "-v", "error", "-an", "-i", "input.mp4", "output.mp4")));
+    }
+
+    @Test
+    public void outputAudioDisabled() {
+        List<String> command = new FFmpegBuilder()
+                .addInput("input.mp4")
+                .done()
+                .addOutput("output.mp4")
+                .disableAudio()
+                .done()
+                .build();
+
+        assertThat(command, is(ImmutableList.of("-y", "-v", "error", "-i", "input.mp4", "-an", "output.mp4")));
+    }
+
+    @Test
+    public void inputSubtitleDisabled() {
+        List<String> command = new FFmpegBuilder()
+                .addInput("input.mp4")
+                .disableSubtitle()
+                .done()
+                .addOutput("output.mp4")
+                .done()
+                .build();
+
+        assertThat(command, is(ImmutableList.of("-y", "-v", "error", "-sn", "-i", "input.mp4", "output.mp4")));
+    }
+
+    @Test
+    public void outputSubtitleDisabled() {
+        List<String> command = new FFmpegBuilder()
+                .addInput("input.mp4")
+                .done()
+                .addOutput("output.mp4")
+                .disableSubtitle()
+                .done()
+                .build();
+
+        assertThat(command, is(ImmutableList.of("-y", "-v", "error", "-i", "input.mp4", "-sn", "output.mp4")));
+    }
 }