Skip to content

Commit

Permalink
Add files via upload
Browse files Browse the repository at this point in the history
  • Loading branch information
@paulpacifico
paulpacifico authored Mar 3, 2021
1 parent e027bb2 commit f2336c4
Show file tree
Hide file tree
Showing 14 changed files with 57 additions and 49 deletions.
10 changes: 8 additions & 2 deletions src/functions/other/BlackDetection.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
4 changes: 2 additions & 2 deletions src/functions/other/Conform.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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";
Expand Down
2 changes: 1 addition & 1 deletion src/functions/other/Merge.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions src/functions/video/AVC.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
8 changes: 4 additions & 4 deletions src/functions/video/AppleProRes.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
10 changes: 6 additions & 4 deletions src/functions/video/CineForm.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}
Expand Down
8 changes: 4 additions & 4 deletions src/functions/video/DNxHD.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
8 changes: 4 additions & 4 deletions src/functions/video/DNxHR.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
8 changes: 4 additions & 4 deletions src/functions/video/FFV1.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
8 changes: 4 additions & 4 deletions src/functions/video/HAP.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
8 changes: 4 additions & 4 deletions src/functions/video/QTAnimation.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
8 changes: 4 additions & 4 deletions src/functions/video/UncompressedYUV.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
8 changes: 4 additions & 4 deletions src/functions/video/XAVC.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
8 changes: 4 additions & 4 deletions src/functions/video/XDCAM.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down

0 comments on commit f2336c4

Please sign in to comment.