diff --git a/src/functions/other/BlackDetection.java b/src/functions/other/BlackDetection.java index 30bc1b7e..a375b32e 100644 --- a/src/functions/other/BlackDetection.java +++ b/src/functions/other/BlackDetection.java @@ -117,13 +117,19 @@ else if (Settings.btnWaitFileComplete.isSelected()) //InOut FFMPEG.fonctionInOut(); + + System.out.println(comboFilter.getSelectedIndex()); + + String levels = "0.1"; + if (comboFilter.getSelectedIndex() == 1) + levels = "0.0"; //Envoi de la commande String cmd; if (System.getProperty("os.name").contains("Mac") || System.getProperty("os.name").contains("Linux")) - cmd = " -an -vf blackdetect=d=0.0:pix_th=.1 -f null -"; + cmd = " -an -vf blackdetect=d=0.0:pix_th=" + levels + " -f null -"; else - cmd = " -an -vf blackdetect=d=0.0:pix_th=.1 -f null -" + '"'; + cmd = " -an -vf blackdetect=d=0.0:pix_th=" + levels + " -f null -" + '"'; FFMPEG.run(FFMPEG.inPoint + " -i " + '"' + file.toString() + '"' + FFMPEG.postInPoint + FFMPEG.outPoint + cmd); diff --git a/src/functions/other/Conform.java b/src/functions/other/Conform.java index 756ce5fc..47756360 100644 --- a/src/functions/other/Conform.java +++ b/src/functions/other/Conform.java @@ -144,7 +144,7 @@ else if (Settings.btnWaitFileComplete.isSelected()) //Envoi de la commande File tempMKV = new File(sortie + "/" + fichier.replace(extension, "_Conform.mkv")); - String cmd = " --default-duration 0:" + comboFilter.getSelectedItem().toString().replace(" i/s", "").replace(",", ".") + "fps -A -S -T -M -B --fix-bitstream-timing-information 0 "; + String cmd = " --default-duration 0:" + comboFilter.getSelectedItem().toString().replace(" " + Shutter.language.getProperty("fps"), "").replace(",", ".") + "fps -A -S -T -M -B --fix-bitstream-timing-information 0 "; MKVMERGE.run(cmd + '"' + file.toString() + '"' + " -o " + '"' + tempMKV + '"'); //Attente de la fin de FFMPEG @@ -189,7 +189,7 @@ else if (tempMKV.exists() == false) private static String setAudio() { float AudioFPSIn = FFPROBE.currentFPS; - float AudioFPSOut = Float.parseFloat((comboFilter.getSelectedItem().toString().replace(" i/s", "").replace(",", "."))); + float AudioFPSOut = Float.parseFloat((comboFilter.getSelectedItem().toString().replace(" " + Shutter.language.getProperty("fps"), "").replace(",", "."))); float value = (float) (AudioFPSOut / AudioFPSIn); if (value < 0.5f || value > 2.0f) return " -an"; diff --git a/src/functions/other/Merge.java b/src/functions/other/Merge.java index 6a41f03a..b821be2c 100644 --- a/src/functions/other/Merge.java +++ b/src/functions/other/Merge.java @@ -140,7 +140,7 @@ public void run() { File fileOut = new File(sortieFichier); String openGOP = ""; - if (Settings.btnOpenGOP.isSelected()) + if (Shutter.caseOpenGop.isSelected()) openGOP = " -copyinkf"; //Envoi de la commande diff --git a/src/functions/video/AVC.java b/src/functions/video/AVC.java index 262782ac..cfe9ec9b 100644 --- a/src/functions/video/AVC.java +++ b/src/functions/video/AVC.java @@ -1184,13 +1184,13 @@ protected static String setLimiter(String filterComplex) { if (filterComplex != "") filterComplex += ","; if (FFPROBE.imageDepth == 8) - filterComplex = "limiter=16:235"; + filterComplex += "limiter=16:235"; else if (FFPROBE.imageDepth == 10) - filterComplex = "limiter=64:940"; + filterComplex += "limiter=64:940"; else if (FFPROBE.imageDepth == 12) - filterComplex = "limiter=256:3760"; + filterComplex += "limiter=256:3760"; else if (FFPROBE.imageDepth == 16) - filterComplex = "limiter=4096:60160"; + filterComplex += "limiter=4096:60160"; } return filterComplex; } diff --git a/src/functions/video/AppleProRes.java b/src/functions/video/AppleProRes.java index c1f720ea..57ee8aeb 100644 --- a/src/functions/video/AppleProRes.java +++ b/src/functions/video/AppleProRes.java @@ -1271,13 +1271,13 @@ protected static String setLimiter(String filterComplex) { if (filterComplex != "") filterComplex += ","; if (FFPROBE.imageDepth == 8) - filterComplex = "limiter=16:235"; + filterComplex += "limiter=16:235"; else if (FFPROBE.imageDepth == 10) - filterComplex = "limiter=64:940"; + filterComplex += "limiter=64:940"; else if (FFPROBE.imageDepth == 12) - filterComplex = "limiter=256:3760"; + filterComplex += "limiter=256:3760"; else if (FFPROBE.imageDepth == 16) - filterComplex = "limiter=4096:60160"; + filterComplex += "limiter=4096:60160"; } return filterComplex; } diff --git a/src/functions/video/CineForm.java b/src/functions/video/CineForm.java index c38c275b..4924b8a8 100644 --- a/src/functions/video/CineForm.java +++ b/src/functions/video/CineForm.java @@ -883,6 +883,8 @@ protected static String setCodec() { return " -c:v cfhd -quality film2 -pix_fmt " + yuv; case "Film Scan 3" : return " -c:v cfhd -quality film3 -pix_fmt " + yuv; + case "Film Scan 3+" : + return " -c:v cfhd -quality film3+ -pix_fmt " + yuv; } return " -c:v cfhd -quality film1 -pix_fmt " + yuv; @@ -1246,13 +1248,13 @@ protected static String setLimiter(String filterComplex) { if (filterComplex != "") filterComplex += ","; if (FFPROBE.imageDepth == 8) - filterComplex = "limiter=16:235"; + filterComplex += "limiter=16:235"; else if (FFPROBE.imageDepth == 10) - filterComplex = "limiter=64:940"; + filterComplex += "limiter=64:940"; else if (FFPROBE.imageDepth == 12) - filterComplex = "limiter=256:3760"; + filterComplex += "limiter=256:3760"; else if (FFPROBE.imageDepth == 16) - filterComplex = "limiter=4096:60160"; + filterComplex += "limiter=4096:60160"; } return filterComplex; } diff --git a/src/functions/video/DNxHD.java b/src/functions/video/DNxHD.java index 268d16fd..2929c8d3 100644 --- a/src/functions/video/DNxHD.java +++ b/src/functions/video/DNxHD.java @@ -1333,13 +1333,13 @@ protected static String setLimiter(String filterComplex) { if (filterComplex != "") filterComplex += ","; if (FFPROBE.imageDepth == 8) - filterComplex = "limiter=16:235"; + filterComplex += "limiter=16:235"; else if (FFPROBE.imageDepth == 10) - filterComplex = "limiter=64:940"; + filterComplex += "limiter=64:940"; else if (FFPROBE.imageDepth == 12) - filterComplex = "limiter=256:3760"; + filterComplex += "limiter=256:3760"; else if (FFPROBE.imageDepth == 16) - filterComplex = "limiter=4096:60160"; + filterComplex += "limiter=4096:60160"; } return filterComplex; } diff --git a/src/functions/video/DNxHR.java b/src/functions/video/DNxHR.java index b145e833..1cdd2839 100644 --- a/src/functions/video/DNxHR.java +++ b/src/functions/video/DNxHR.java @@ -1218,13 +1218,13 @@ protected static String setLimiter(String filterComplex) { if (filterComplex != "") filterComplex += ","; if (FFPROBE.imageDepth == 8) - filterComplex = "limiter=16:235"; + filterComplex += "limiter=16:235"; else if (FFPROBE.imageDepth == 10) - filterComplex = "limiter=64:940"; + filterComplex += "limiter=64:940"; else if (FFPROBE.imageDepth == 12) - filterComplex = "limiter=256:3760"; + filterComplex += "limiter=256:3760"; else if (FFPROBE.imageDepth == 16) - filterComplex = "limiter=4096:60160"; + filterComplex += "limiter=4096:60160"; } return filterComplex; } diff --git a/src/functions/video/FFV1.java b/src/functions/video/FFV1.java index b4a8cfc8..b7fad4c1 100644 --- a/src/functions/video/FFV1.java +++ b/src/functions/video/FFV1.java @@ -1135,13 +1135,13 @@ protected static String setLimiter(String filterComplex) { if (filterComplex != "") filterComplex += ","; if (FFPROBE.imageDepth == 8) - filterComplex = "limiter=16:235"; + filterComplex += "limiter=16:235"; else if (FFPROBE.imageDepth == 10) - filterComplex = "limiter=64:940"; + filterComplex += "limiter=64:940"; else if (FFPROBE.imageDepth == 12) - filterComplex = "limiter=256:3760"; + filterComplex += "limiter=256:3760"; else if (FFPROBE.imageDepth == 16) - filterComplex = "limiter=4096:60160"; + filterComplex += "limiter=4096:60160"; } return filterComplex; } diff --git a/src/functions/video/HAP.java b/src/functions/video/HAP.java index 9619b688..b9bf536e 100644 --- a/src/functions/video/HAP.java +++ b/src/functions/video/HAP.java @@ -1151,13 +1151,13 @@ protected static String setLimiter(String filterComplex) { if (filterComplex != "") filterComplex += ","; if (FFPROBE.imageDepth == 8) - filterComplex = "limiter=16:235"; + filterComplex += "limiter=16:235"; else if (FFPROBE.imageDepth == 10) - filterComplex = "limiter=64:940"; + filterComplex += "limiter=64:940"; else if (FFPROBE.imageDepth == 12) - filterComplex = "limiter=256:3760"; + filterComplex += "limiter=256:3760"; else if (FFPROBE.imageDepth == 16) - filterComplex = "limiter=4096:60160"; + filterComplex += "limiter=4096:60160"; } return filterComplex; } diff --git a/src/functions/video/QTAnimation.java b/src/functions/video/QTAnimation.java index e14575f1..d10c2f2a 100644 --- a/src/functions/video/QTAnimation.java +++ b/src/functions/video/QTAnimation.java @@ -1219,13 +1219,13 @@ protected static String setLimiter(String filterComplex) { if (filterComplex != "") filterComplex += ","; if (FFPROBE.imageDepth == 8) - filterComplex = "limiter=16:235"; + filterComplex += "limiter=16:235"; else if (FFPROBE.imageDepth == 10) - filterComplex = "limiter=64:940"; + filterComplex += "limiter=64:940"; else if (FFPROBE.imageDepth == 12) - filterComplex = "limiter=256:3760"; + filterComplex += "limiter=256:3760"; else if (FFPROBE.imageDepth == 16) - filterComplex = "limiter=4096:60160"; + filterComplex += "limiter=4096:60160"; } return filterComplex; } diff --git a/src/functions/video/UncompressedYUV.java b/src/functions/video/UncompressedYUV.java index 98551229..a0867b78 100644 --- a/src/functions/video/UncompressedYUV.java +++ b/src/functions/video/UncompressedYUV.java @@ -1235,13 +1235,13 @@ protected static String setLimiter(String filterComplex) { if (filterComplex != "") filterComplex += ","; if (FFPROBE.imageDepth == 8) - filterComplex = "limiter=16:235"; + filterComplex += "limiter=16:235"; else if (FFPROBE.imageDepth == 10) - filterComplex = "limiter=64:940"; + filterComplex += "limiter=64:940"; else if (FFPROBE.imageDepth == 12) - filterComplex = "limiter=256:3760"; + filterComplex += "limiter=256:3760"; else if (FFPROBE.imageDepth == 16) - filterComplex = "limiter=4096:60160"; + filterComplex += "limiter=4096:60160"; } return filterComplex; } diff --git a/src/functions/video/XAVC.java b/src/functions/video/XAVC.java index a116cd49..4ade232c 100644 --- a/src/functions/video/XAVC.java +++ b/src/functions/video/XAVC.java @@ -1179,13 +1179,13 @@ protected static String setLimiter(String filterComplex) { if (filterComplex != "") filterComplex += ","; if (FFPROBE.imageDepth == 8) - filterComplex = "limiter=16:235"; + filterComplex += "limiter=16:235"; else if (FFPROBE.imageDepth == 10) - filterComplex = "limiter=64:940"; + filterComplex += "limiter=64:940"; else if (FFPROBE.imageDepth == 12) - filterComplex = "limiter=256:3760"; + filterComplex += "limiter=256:3760"; else if (FFPROBE.imageDepth == 16) - filterComplex = "limiter=4096:60160"; + filterComplex += "limiter=4096:60160"; } return filterComplex; } diff --git a/src/functions/video/XDCAM.java b/src/functions/video/XDCAM.java index fc59146e..87e005f7 100644 --- a/src/functions/video/XDCAM.java +++ b/src/functions/video/XDCAM.java @@ -1185,13 +1185,13 @@ protected static String setLimiter(String filterComplex) { if (filterComplex != "") filterComplex += ","; if (FFPROBE.imageDepth == 8) - filterComplex = "limiter=16:235"; + filterComplex += "limiter=16:235"; else if (FFPROBE.imageDepth == 10) - filterComplex = "limiter=64:940"; + filterComplex += "limiter=64:940"; else if (FFPROBE.imageDepth == 12) - filterComplex = "limiter=256:3760"; + filterComplex += "limiter=256:3760"; else if (FFPROBE.imageDepth == 16) - filterComplex = "limiter=4096:60160"; + filterComplex += "limiter=4096:60160"; } return filterComplex; }