Add files via upload

paulpacifico · Mar 18, 2024 · e4b6187 · e4b6187
1 parent 866b25c
commit e4b6187
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 6 deletions.
diff --git a/src/application/Shutter.java b/src/application/Shutter.java
@@ -15906,10 +15906,14 @@ public void actionPerformed(ActionEvent arg0) {
 
 			@Override
 			public void actionPerformed(ActionEvent arg0) {
-				if (caseForceLevel.isSelected()) {
+
+				if (caseForceLevel.isSelected())
+				{
 					comboForceProfile.setEnabled(true);
 					comboForceLevel.setEnabled(true);
-				} else {
+				}
+				else
+				{
 					comboForceProfile.setEnabled(false);
 					comboForceLevel.setEnabled(false);
 				}
@@ -17885,7 +17889,7 @@ public void actionPerformed(ActionEvent e) {
 
 			@Override
 			public void actionPerformed(ActionEvent arg0) {
-									
+
 				if (comboAccel.getSelectedItem().equals(language.getProperty("aucune").toLowerCase()) == false)
 				{
 					if ("H.264".equals(comboFonctions.getSelectedItem().toString()))
@@ -17897,6 +17901,11 @@ public void actionPerformed(ActionEvent arg0) {
 					{
 						comboForceProfile.setModel(new DefaultComboBoxModel<String>(new String[] {"main"}));
 						comboForceProfile.setSelectedIndex(0);
+
+						if (comboFonctions.getSelectedItem().equals("H.265") && comboAccel.getSelectedItem().equals("Intel Quick Sync"))
+						{
+							comboForceLevel.setVisible(false);
+						}
 					}
 
 					if (comboAccel.getSelectedItem().equals("Nvidia NVENC") || comboAccel.getSelectedItem().equals("Intel Quick Sync"))
@@ -17947,6 +17956,8 @@ else if (comboAccel.getSelectedItem().equals("AMD AMF Encoder") || comboAccel.ge
 				} 
 				else
 				{
+					comboForceLevel.setVisible(true);
+
 					if ("H.264".equals(comboFonctions.getSelectedItem().toString()))
 					{
 						comboForceProfile.setModel(new DefaultComboBoxModel<String>(new String[] { "base", "main", "high", "high422", "high444"}));
@@ -18527,7 +18538,8 @@ else if (RenderQueue.frame != null)
 			caseForcerEntrelacement.setEnabled(true);
 		}
 
-		if (caseForceLevel.isSelected() && (comboFonctions.getSelectedItem().toString().contains("H.26") || comboFonctions.getSelectedItem().toString().equals("AV1"))) {
+		if (caseForceLevel.isSelected() && (comboFonctions.getSelectedItem().toString().contains("H.26") || comboFonctions.getSelectedItem().toString().equals("AV1")))
+		{
 			caseForceLevel.setEnabled(true);
 			comboForceProfile.setEnabled(true);
 			comboForceLevel.setEnabled(true);

diff --git a/src/settings/AdvancedFeatures.java b/src/settings/AdvancedFeatures.java
@@ -294,7 +294,12 @@ else if ( profile.equals("main444"))
 		    				profile = "main444-10";    
 		    		}
 
-		            return " -profile:v " + profile + " -level " + Shutter.comboForceLevel.getSelectedItem().toString();
+		    		if (comboAccel.getSelectedItem().equals(language.getProperty("aucune").toLowerCase()) == false && comboAccel.getSelectedItem().equals("Intel Quick Sync"))
+		    		{
+		    			return " -profile:v " + profile;
+		    		}
+		    		else		    			
+		    			return " -profile:v " + profile + " -level " + Shutter.comboForceLevel.getSelectedItem().toString();
 		        }
 		        else
 		        {
@@ -367,11 +372,22 @@ else if (comboResolution.getSelectedItem().toString().contains(":"))
 		            	{
 		            		return " -profile:v " + profile + " -level 6.1";
 		            	}
+		            	else if (comboAccel.getSelectedItem().equals(language.getProperty("aucune").toLowerCase()) == false && comboAccel.getSelectedItem().equals("Intel Quick Sync"))
+			    		{
+		            		return " -profile:v " + profile;
+			    		}
 		            	else
 		            		return " -profile:v " + profile + " -level 5.2";
 		            }
 		            else
-		            	return " -profile:v " + profile + " -level 5.1";
+		            {
+		            	if (comboAccel.getSelectedItem().equals(language.getProperty("aucune").toLowerCase()) == false && comboAccel.getSelectedItem().equals("Intel Quick Sync"))
+			    		{
+		            		return " -profile:v " + profile;
+			    		}
+		            	else
+		            		return " -profile:v " + profile + " -level 5.1";
+		            }
 		        }
 
 		}