chore: Move setFormat and setComplexFilter to the corresponding stream builders

Author: Euklios

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

@@ -67,6 +67,8 @@ public abstract class AbstractFFmpegOutputBuilder<T extends AbstractFFmpegOutput
   @Deprecated
   public String video_bit_stream_filter;
 
+  protected String  complexFilter;
+
   public AbstractFFmpegOutputBuilder() {
     super();
   }
@@ -194,6 +196,12 @@ public T setAudioBitStreamFilter(String filter) {
     return (T) this;
   }
 
+  public T setComplexFilter(String filter) {
+    this.complexFilter = checkNotEmpty(filter, "filter must not be empty");
+
+    return (T) this;
+  }
+
   /**
    * Sets Audio Filter
    *
@@ -316,6 +324,10 @@ protected void addGlobalFlags(FFmpegBuilder parent, ImmutableList.Builder<String
     if (constantRateFactor != null) {
       args.add("-crf", formatDecimalInteger(constantRateFactor));
     }
+
+    if (complexFilter != null) {
+      args.add("-filter_complex", complexFilter);
+    }
   }
 
   @Override
@@ -431,4 +443,8 @@ public String getVideoFilter() {
   public String getVideoBitStreamFilter() {
     return video_bit_stream_filter;
   }
+
+  public String getComplexFilter() {
+    return complexFilter;
+  }
 }

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

@@ -17,6 +17,8 @@
 import javax.annotation.CheckReturnValue;
 import net.bramp.ffmpeg.FFmpegUtils;
 import net.bramp.ffmpeg.probe.FFmpegProbeResult;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Builds a ffmpeg command line
@@ -25,6 +27,8 @@
  */
 public class FFmpegBuilder {
 
+  private static final Logger log = LoggerFactory.getLogger(FFmpegBuilder.class);
+
   public enum Strict {
     VERY, // strictly conform to an older more strict version of the specifications or reference
     // software
@@ -180,6 +184,7 @@ public FFmpegBuilder setThreads(int threads) {
     return this;
   }
 
+  @Deprecated
   public FFmpegBuilder setFormat(String format) {
     this.format = checkNotNull(format);
     return this;
@@ -204,6 +209,7 @@ public FFmpegBuilder addProgress(URI uri) {
    * @param filter the complex filter string
    * @return this
    */
+  @Deprecated
   public FFmpegBuilder setComplexFilter(String filter) {
     this.complexFilter = checkNotEmpty(filter, "filter must not be empty");
     return this;
@@ -355,6 +361,7 @@ public List<String> build() {
     }
 
     if (format != null) {
+      log.warn("Using FFmpegBuilder#setFormat is deprecated. Specify it on the inputStream or outputStream instead");
       args.add("-f", format);
     }
 
@@ -389,6 +396,7 @@ public List<String> build() {
     }
 
     if (!Strings.isNullOrEmpty(complexFilter)) {
+      log.warn("Using FFmpegBuilder#setComplexFilter is deprecated. Specify it on the outputStream instead");
       args.add("-filter_complex", complexFilter);
     }
 

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

@@ -189,10 +189,10 @@ public void testExample7() throws IOException {
             .done()
             .addInput("spot.mp4")
             .done()
-            .setComplexFilter(
-                "[1:v]scale=368:207,setpts=PTS-STARTPTS+5/TB [ov]; "
-                    + "[0:v][ov] overlay=x=(main_w-overlay_w)/2:y=(main_h-overlay_h)/2:enable='between(t,5,15)' [v]")
             .addOutput("with-video.mp4")
+            .setComplexFilter(
+                    "[1:v]scale=368:207,setpts=PTS-STARTPTS+5/TB [ov]; "
+                            + "[0:v][ov] overlay=x=(main_w-overlay_w)/2:y=(main_h-overlay_h)/2:enable='between(t,5,15)' [v]")
             .addExtraArgs("-map", "[v]")
             .addExtraArgs("-map", "0:a")
             .setVideoCodec("libx264")
@@ -206,9 +206,9 @@ public void testExample7() throws IOException {
         "ffmpeg -y -v error"
             + " -i original.mp4"
             + " -i spot.mp4"
-            + " -filter_complex [1:v]scale=368:207,setpts=PTS-STARTPTS+5/TB [ov]; [0:v][ov] overlay=x=(main_w-overlay_w)/2:y=(main_h-overlay_h)/2:enable='between(t,5,15)' [v]"
             + " -preset ultrafast"
             + " -crf 20"
+            + " -filter_complex [1:v]scale=368:207,setpts=PTS-STARTPTS+5/TB [ov]; [0:v][ov] overlay=x=(main_w-overlay_w)/2:y=(main_h-overlay_h)/2:enable='between(t,5,15)' [v]"
             + " -vcodec libx264"
             + " -acodec copy"
             + " -map [v]"