WinGui: Don't set -U or -P when QSV is enabled.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6090 b64f7644-9d1e-0410-96f1-a4d463321fa5

1 files changed, 9 insertions, 4 deletions

diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs b/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs
index 8b246b58c..a6567d308 100644
--- a/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs
+++ b/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs
@@ -143,7 +143,7 @@ namespace HandBrake.ApplicationServices.Utilities
             query += AdvancedQuery(task);

 

             // Extra Settings

-            query += ExtraSettings(verbosity, disableLibDvdNav, disableQsvDecode, enableHwd, enableOpenCL);

+            query += ExtraSettings(verbosity, disableLibDvdNav, disableQsvDecode, enableHwd, enableOpenCL, task.VideoEncoder == VideoEncoder.QuickSync);

 

             return query;

         }

@@ -1025,10 +1025,13 @@ namespace HandBrake.ApplicationServices.Utilities
         /// <param name="enableOpenCL">

         /// The enable Open CL.

         /// </param>

+        /// <param name="isQsv">

+        /// The is Qsv.

+        /// </param>

         /// <returns>

         /// A Cli Query as a string

         /// </returns>

-        private static string ExtraSettings(int verbosity, bool disableLibdvdNav, bool disableQsvDecode, bool enableHwd, bool enableOpenCL)

+        private static string ExtraSettings(int verbosity, bool disableLibdvdNav, bool disableQsvDecode, bool enableHwd, bool enableOpenCL, bool isQsv)

         {

             string query = string.Empty;

 

@@ -1042,11 +1045,13 @@ namespace HandBrake.ApplicationServices.Utilities
             if (disableQsvDecode)

                 query += " --disable-qsv-decoding";

 

-            if (enableOpenCL)

+            if (enableOpenCL && !isQsv)

                 query += " -P ";

 

-            if (enableHwd)

+            if (enableHwd && !isQsv)

+            {

                 query += " -U ";

+            }

 

             return query;

         }