]> granicus.if.org Git - handbrake/commitdiff
WinGui: draft set of options handling for QuickSyncH265, AVC replica for now
authorMax Dmytrychenko <maxim.d33@gmail.com>
Wed, 30 Sep 2015 15:51:15 +0000 (17:51 +0200)
committerMax Dmytrychenko <maxim.d33@gmail.com>
Wed, 30 Sep 2015 16:10:15 +0000 (18:10 +0200)
win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs

index eb3ee984e9e2b82e25457f7cf567aa20293dfd8f..c8910b770a1dbda9f61936753a152c4b3e00ca64 100644 (file)
@@ -350,6 +350,7 @@ namespace HandBrakeWPF.ViewModels
                         this.Task.Quality = rfValue;\r
                         break;           \r
                     case VideoEncoder.QuickSync:\r
+                    case VideoEncoder.QuickSyncH265:\r
                         rfValue = 51.0 - value;\r
                         rfValue = Math.Round(rfValue, 0);\r
                         this.Task.Quality = rfValue;\r
@@ -900,7 +901,7 @@ namespace HandBrakeWPF.ViewModels
                 HBVideoEncoder encoder = HandBrakeEncoderHelpers.VideoEncoders.FirstOrDefault(s => s.ShortName == EnumHelper<VideoEncoder>.GetShortName(preset.Task.VideoEncoder));\r
                 if (encoder != null)\r
                 {\r
-                    if (preset.Task.VideoEncoder == VideoEncoder.X264 || preset.Task.VideoEncoder == VideoEncoder.X265 || preset.Task.VideoEncoder == VideoEncoder.QuickSync)\r
+                    if (preset.Task.VideoEncoder == VideoEncoder.X264 || preset.Task.VideoEncoder == VideoEncoder.X265 || preset.Task.VideoEncoder == VideoEncoder.QuickSync || preset.Task.VideoEncoder == VideoEncoder.QuickSyncH265)\r
                     {\r
                         this.VideoLevel = preset.Task.VideoLevel != null ? preset.Task.VideoLevel.Clone() : this.VideoLevels.FirstOrDefault();\r
                         this.VideoProfile = preset.Task.VideoProfile != null ? preset.Task.VideoProfile.Clone() : this.VideoProfiles.FirstOrDefault();\r
@@ -1006,6 +1007,7 @@ namespace HandBrakeWPF.ViewModels
                     this.QualityMax = 31;\r
                     break;\r
                 case VideoEncoder.QuickSync:\r
+                case VideoEncoder.QuickSyncH265:\r
                     this.QualityMin = 0;\r
                     this.QualityMax = 51;\r
                     break;\r
@@ -1135,8 +1137,8 @@ namespace HandBrakeWPF.ViewModels
                 case VideoEncoder.X265:\r
                 case VideoEncoder.X264:\r
                 case VideoEncoder.QuickSync:\r
-\r
-                    if (this.SelectedVideoEncoder == VideoEncoder.QuickSync)\r
+                case VideoEncoder.QuickSyncH265:\r
+                    if (this.SelectedVideoEncoder == VideoEncoder.QuickSync || this.SelectedVideoEncoder == VideoEncoder.QuickSyncH265)\r
                     {\r
                         cqStep = 1;\r
                     }\r
@@ -1255,9 +1257,9 @@ namespace HandBrakeWPF.ViewModels
             this.SetQualitySliderBounds();\r
 \r
             // Update control display\r
-            this.UseAdvancedTab = selectedEncoder != VideoEncoder.QuickSync && this.UseAdvancedTab;\r
-            this.DisplayOptimiseOptions = this.SelectedVideoEncoder == VideoEncoder.X264 || this.SelectedVideoEncoder == VideoEncoder.X265 || this.SelectedVideoEncoder == VideoEncoder.QuickSync;\r
-            this.DisplayNonQSVControls = this.SelectedVideoEncoder != VideoEncoder.QuickSync;\r
+            this.UseAdvancedTab = selectedEncoder != VideoEncoder.QuickSync && selectedEncoder != VideoEncoder.QuickSyncH265 && this.UseAdvancedTab;\r
+            this.DisplayOptimiseOptions = this.SelectedVideoEncoder == VideoEncoder.X264 || this.SelectedVideoEncoder == VideoEncoder.X265 || this.SelectedVideoEncoder == VideoEncoder.QuickSync || this.SelectedVideoEncoder == VideoEncoder.QuickSyncH265;\r
+            this.DisplayNonQSVControls = this.SelectedVideoEncoder != VideoEncoder.QuickSync && this.SelectedVideoEncoder != VideoEncoder.QuickSyncH265;\r
             this.DisplayTurboFirstPass = selectedEncoder == VideoEncoder.X264;\r
             this.DisplayTuneControls = SelectedVideoEncoder == VideoEncoder.X264 || SelectedVideoEncoder == VideoEncoder.X265;\r
             this.DisplayLevelControl = SelectedVideoEncoder == VideoEncoder.X264;\r
@@ -1268,7 +1270,7 @@ namespace HandBrakeWPF.ViewModels
             this.NotifyOfPropertyChange(() => this.HighQualityLabel);\r
 \r
             // Handle some quicksync specific options.\r
-            if (selectedEncoder == VideoEncoder.QuickSync)\r
+            if (selectedEncoder == VideoEncoder.QuickSync || selectedEncoder == VideoEncoder.QuickSyncH265)\r
             {\r
                 this.IsConstantFramerate = true;\r
                 this.TwoPass = false;\r