WinGui: QSV Quality = 2 for Quality encoding. Same as Source only for framerate...

git-svn-id: svn://svn.handbrake.fr/HandBrake/branches/qsv@5460 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs b/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs
index 9e17c0e0b5f13fa5a78f9315971f0ea12ad67824..85ce9d40b1b93a31d34667d18ebc10071694039e 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs
+++ b/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs
@@ -954,14 +954,14 @@ namespace HandBrake.ApplicationServices.Utilities
                     string qsvPreset;\r
                     switch (task.QsvPreset)\r
                     {\r
-                        case QsvPreset.Quality:\r
-                            qsvPreset = "1";\r
+                        case QsvPreset.Speed:\r
+                            qsvPreset = "7";\r
                             break;\r
                         case QsvPreset.Balanced:\r
                             qsvPreset = "4";\r
                             break;\r
                         default:\r
-                            qsvPreset = "7";\r
+                            qsvPreset = "2";\r
                             break;\r
                     }\r
 \r

diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInterop.csproj b/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInterop.csproj
index 38cfa49714f6358b4a06739a3a1754014e5e35ef..b1a84f48fd499985a097ef40043683d4de7982fa 100644 (file)
--- a/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInterop.csproj
+++ b/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInterop.csproj
@@ -100,6 +100,14 @@
     <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>\r
     <CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>\r
   </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">\r
+    <PlatformTarget>AnyCPU</PlatformTarget>\r
+    <OutputPath>bin\Debug\</OutputPath>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">\r
+    <PlatformTarget>AnyCPU</PlatformTarget>\r
+    <OutputPath>bin\Release\</OutputPath>\r
+  </PropertyGroup>\r
   <ItemGroup>\r
     <Reference Include="PresentationCore">\r
       <RequiredTargetFramework>3.0</RequiredTargetFramework>\r

diff --git a/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs
index ca4e1ecee2703bdaa98607ed8574ad3378656486..f17bd1f601630985f0f54995bf3a655d27e3664b 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs
@@ -529,6 +529,8 @@ namespace HandBrakeWPF.ViewModels
                     this.IsConstantFramerate = true;\r
                     this.TwoPass = false;\r
                     this.TurboFirstPass = false;\r
+                    this.Task.Framerate = null;\r
+                    this.NotifyOfPropertyChange(() => SelectedFramerate);\r
                 }\r
             }\r
         }\r

diff --git a/win/CS/HandBrakeWPF/Views/VideoView.xaml b/win/CS/HandBrakeWPF/Views/VideoView.xaml
index 651b0ffe44c1200fd61605a6beaefc137cedba89..fd196fb56074183bd8a657de938f4d2fda8c4d3b 100644 (file)
--- a/win/CS/HandBrakeWPF/Views/VideoView.xaml
+++ b/win/CS/HandBrakeWPF/Views/VideoView.xaml
@@ -73,7 +73,10 @@
                 <StackPanel Orientation="Horizontal">\r
                     <TextBlock Text="Framerate (FPS):" VerticalAlignment="Top" Margin="0,5,0,0" Width="100"/>\r
                     <StackPanel Orientation="Vertical">\r
-                        <ComboBox Width="120" ItemsSource="{Binding Framerates}" SelectedItem="{Binding SelectedFramerate}" />\r
+                        <ComboBox Width="120" ItemsSource="{Binding Framerates}" SelectedItem="{Binding SelectedFramerate}"  \r
+                                  Visibility="{Binding DisplayNonQSVControls, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}" />\r
+                        <TextBlock Text="Same as source"  VerticalAlignment="Center" Margin="0,5,0,0"\r
+                                   Visibility="{Binding DisplayNonQSVControls, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}"/>\r
 \r
                         <StackPanel Orientation="Vertical" Visibility="{Binding DisplayNonQSVControls, Converter={StaticResource boolToVisConverter}}">\r
                             <RadioButton Content="Constant Framerate" IsChecked="{Binding IsConstantFramerate}" Margin="0,10,0,0" />\r