Add files via upload

paulpacifico · Sep 16, 2024 · 6b06f5b · 6b06f5b
1 parent d0d6b6f
commit 6b06f5b
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 6 deletions.
diff --git a/src/application/Settings.java b/src/application/Settings.java
@@ -174,7 +174,7 @@ public Settings() {
 		txtImageDuration.setName("txtImageDuration");
 		comboLanguage.setName("comboLanguage");
 
-		frame.setSize(370, 740);
+		frame.setSize(370, 750);
 		if (Shutter.getLanguage.equals(Locale.of("ru").getDisplayLanguage()) || Shutter.getLanguage.equals(Locale.of("uk").getDisplayLanguage()))
 		{
 			frame.setSize(frame.getWidth() + 30, frame.getHeight());
@@ -679,7 +679,7 @@ public void mouseExited(MouseEvent e) {
 		//Set comboItem
 		comboLanguage.setSelectedItem(Shutter.getLanguage);
 		comboLanguage.setBounds(btnEndingAction.getX() + lblLanguage.getWidth() + 6, lblLanguage.getLocation().y - 4, comboLanguage.getPreferredSize().width, 22);
-		comboLanguage.setMaximumRowCount(20);
+		comboLanguage.setMaximumRowCount(30);
 		frame.getContentPane().add(comboLanguage);
 
 		comboLanguage.addActionListener(new ActionListener() {

diff --git a/src/application/Shutter.java b/src/application/Shutter.java
@@ -184,7 +184,7 @@ public class Shutter {
 	/*
 	 * Initialisation
 	 */
-	public static String actualVersion = "18.4";
+	public static String actualVersion = "18.5";
 	public static String getLanguage = "";
 	public static String arch = "x86_64";
 	public static long availableMemory;

diff --git a/src/application/VideoPlayer.java b/src/application/VideoPlayer.java
@@ -2005,6 +2005,8 @@ else if (System.getProperty("os.name").contains("Mac"))
 			else
 				freezeFrame = "";
 
+			String cmd = gpuDecoding + Colorimetry.setInputCodec(extension) + " -strict -2 -v quiet -hide_banner -ss " + (long) (inputTime * inputFramerateMS) + "ms" + concat + " -i " + '"' + video + '"' + setFilter(yadif, speed, false) + " -r " + FFPROBE.currentFPS + freezeFrame + " -c:v bmp -an -f image2pipe -";
+
 			String codec = "";
 			if (Settings.btnPreviewOutput.isSelected() && VideoEncoders.setCodec() != ""
 			&& Shutter.comboFonctions.getSelectedItem().toString().equals("DNxHD") == false
@@ -2020,10 +2022,21 @@ else if (System.getProperty("os.name").contains("Mac"))
 					format = "mxf";
 				}	
 
-				codec = VideoEncoders.setCodec() + VideoEncoders.setBitrate() + AdvancedFeatures.setPreset() + freezeFrame + " -an -f " + format + " pipe:1 | " + PathToFFMPEG + " -v quiet -hide_banner -i pipe:0";			
+				//Deinterlacer
+				if (yadif != "")
+				{
+					yadif = " -vf " + yadif;
+				}
+
+				if (System.getProperty("os.name").contains("Windows"))
+				{	
+					codec = VideoEncoders.setCodec() + VideoEncoders.setBitrate() + AdvancedFeatures.setPreset() + yadif + freezeFrame + " -an -f " + format + " pipe:1 | " + '"' + PathToFFMPEG + '"' + " -v quiet -hide_banner -i pipe:0" + setFilter("", speed, false);
+				}
+				else
+					codec = VideoEncoders.setCodec() + VideoEncoders.setBitrate() + AdvancedFeatures.setPreset() + yadif + freezeFrame + " -an -f " + format + " pipe:1 | " + PathToFFMPEG + " -v quiet -hide_banner -i pipe:0" + setFilter("", speed, false);	
+
+				cmd = gpuDecoding + Colorimetry.setInputCodec(extension) + " -strict -2 -v quiet -hide_banner -ss " + (long) (inputTime * inputFramerateMS) + "ms" + concat + " -i " + '"' + video + '"' + " -r " + FFPROBE.currentFPS + codec + freezeFrame + " -c:v bmp -an -f image2pipe -";
 			}
-
-			String cmd = gpuDecoding + Colorimetry.setInputCodec(extension) + " -strict -2 -v quiet -hide_banner -ss " + (long) (inputTime * inputFramerateMS) + "ms" + concat + " -i " + '"' + video + '"' + setFilter(yadif, speed, false) + " -r " + FFPROBE.currentFPS + codec + freezeFrame + " -c:v bmp -an -f image2pipe -";
 
 			if (Shutter.inputDeviceIsRunning)
 			{