リサイズに関するコンフィグ読み書き

[coroid/inqubus.git] / frontend / src / saccubus / properties / MovieSetting.java

diff --git a/frontend/src/saccubus/properties/MovieSetting.java b/frontend/src/saccubus/properties/MovieSetting.java
index 0b2f529..e58bd36 100644 (file)
--- a/frontend/src/saccubus/properties/MovieSetting.java
+++ b/frontend/src/saccubus/properties/MovieSetting.java
@@ -6,7 +6,7 @@ import java.util.Properties;
 import saccubus.converter.profile.FfmpegOption;
 
 /**
- * \93®\89æ\90Ý\92è.
+ * 動画設定.
  * @author yuki
  */
 public class MovieSetting {
@@ -18,6 +18,12 @@ public class MovieSetting {
     private static final String PROP_CMDLINE_MAIN = "CMD_MAIN";
     private static final String PROP_CMDLINE_IN = "CMD_IN";
     private static final String PROP_CMDLINE_OUT = "CMD_OUT";
+    private static final String PROP_CMDLINE_AVFILTER = "CMD_AVFILTER";
+    private static final String PROP_RESIZE = "CMD_RESIZE";
+    private static final String PROP_RESIZE_WIDTH = "CMD_RESIZE_WIDTH";
+    private static final String PROP_RESIZE_HEIGHT = "CMD_RESIZE_HEIGHT";
+    private static final String PROP_ADJUST_RATIO = "CMD_ADJUST_RATIO";
+    private static final String PROP_PADDING ="CMD_PADDING";
     private final File ffmpeg;
     private final File vhook;
     private final File optionFile;
@@ -53,6 +59,12 @@ public class MovieSetting {
         prop.setProperty(PROP_CMDLINE_MAIN, getFfmpegOption().getMainOption());
         prop.setProperty(PROP_CMDLINE_IN, getFfmpegOption().getInOption());
         prop.setProperty(PROP_CMDLINE_OUT, getFfmpegOption().getOutOption());
+        prop.setProperty(PROP_CMDLINE_AVFILTER, getFfmpegOption().getAvfilterOption());
+        prop.setProperty(PROP_RESIZE, Boolean.toString(getFfmpegOption().isResize()));
+        prop.setProperty(PROP_RESIZE_WIDTH, Integer.toString(getFfmpegOption().getResizeWidth()));
+        prop.setProperty(PROP_RESIZE_HEIGHT, Integer.toString(getFfmpegOption().getResizeHeight()));
+        prop.setProperty(PROP_ADJUST_RATIO, Boolean.toString(getFfmpegOption().isAdjustRatio()));
+        prop.setProperty(PROP_PADDING, Boolean.toString(getFfmpegOption().isPadding()));
         if (getOptionFile() != null) {
             prop.setProperty(PROP_OPTION_FILE, getOptionFile().getPath());
         } else {
@@ -67,13 +79,20 @@ public class MovieSetting {
             optionFile = new File(name);
         }
 
-        String ffmpeg = prop.getProperty(PROP_FFMPEG_PATH, ".\\bin\\ffmpeg.exe");
-        String vhook = prop.getProperty(PROP_VHOOK_PATH, ".\\bin\\nicovideo.dll");
+        String ffmpeg = prop.getProperty(PROP_FFMPEG_PATH, new File("bin", "ffmpeg.exe").getPath());
+        String vhook = prop.getProperty(PROP_VHOOK_PATH, new File("bin", "nicovideo.dll").getPath());
         String ext = prop.getProperty(PROP_CMDLINE_EXT, ".m4v");
         String main = prop.getProperty(PROP_CMDLINE_MAIN, "");
         String in = prop.getProperty(PROP_CMDLINE_IN, "");
-        String out = prop.getProperty(PROP_CMDLINE_OUT, "-f ipod");
-        FfmpegOption opt = new FfmpegOption(ext, main, in, out);
+        String out = prop.getProperty(PROP_CMDLINE_OUT,
+                "-f ipod -g 150 -qcomp 0.7 -qmin 20 -qmax 30 -qdiff 4 -subq 6 -me_range 16 -i_qfactor 0.714286");
+        String avfilter = prop.getProperty(PROP_CMDLINE_AVFILTER, "");
+        boolean resize = Boolean.getBoolean(prop.getProperty(PROP_RESIZE,"false"));
+        String width = prop.getProperty(PROP_RESIZE_WIDTH, "512");
+        String height = prop.getProperty(PROP_RESIZE_HEIGHT, "384");
+        boolean adjust = Boolean.getBoolean(prop.getProperty(PROP_ADJUST_RATIO,"false"));
+        boolean pad = Boolean.getBoolean(prop.getProperty(PROP_PADDING, "false"));
+        FfmpegOption opt = new FfmpegOption(ext, main, in, out, avfilter, resize, width, height, adjust, pad);
 
         return new MovieSetting(new File(ffmpeg), new File(vhook), optionFile, opt);
     }