WinGui: Initial commit supporting separated interlace detection. Not tested yet.

4 files changed, 64 insertions, 6 deletions

diff --git a/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj b/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj
index 60f7a7b9d..c6fddcfb7 100644
--- a/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj
+++ b/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj
@@ -137,6 +137,7 @@
     <Compile Include="Interop\Json\Encode\SubtitleTrack.cs" />

     <Compile Include="Interop\Json\Encode\Video.cs" />

     <Compile Include="Interop\Factories\AnamorphicFactory.cs" />

+    <Compile Include="Interop\Model\Encoding\CombDetect.cs" />

     <Compile Include="Interop\Model\Encoding\DeinterlaceFilter.cs" />

     <Compile Include="Interop\Model\Encoding\HBPresetTune.cs" />

     <Compile Include="Properties\AssemblyInfo.cs" />

diff --git a/win/CS/HandBrake.ApplicationServices/Interop/HbLib/hb_filter_ids.cs b/win/CS/HandBrake.ApplicationServices/Interop/HbLib/hb_filter_ids.cs
index d4164ede6..76059fe8b 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/HbLib/hb_filter_ids.cs
+++ b/win/CS/HandBrake.ApplicationServices/Interop/HbLib/hb_filter_ids.cs
@@ -9,23 +9,36 @@ namespace HandBrake.ApplicationServices.Interop.HbLib
 {

     public enum hb_filter_ids

     {

-        HB_FILTER_QSV_PRE = 1, // for QSV - important to have before other filters 

+        HB_FILTER_INVALID = 0,

+        // for QSV - important to have before other filters

+        HB_FILTER_FIRST = 1,

+        HB_FILTER_QSV_PRE = 1,

+

         // First, filters that may change the framerate (drop or dup frames)

         HB_FILTER_DETELECINE,

+        HB_FILTER_COMB_DETECT,

         HB_FILTER_DECOMB,

         HB_FILTER_DEINTERLACE,

         HB_FILTER_VFR,

         // Filters that must operate on the original source image are next

         HB_FILTER_DEBLOCK,

-        HB_FILTER_HQDN3D,

+        HB_FILTER_DENOISE,

+        HB_FILTER_HQDN3D = HB_FILTER_DENOISE,

         HB_FILTER_NLMEANS,

         HB_FILTER_RENDER_SUB,

         HB_FILTER_CROP_SCALE,

-        // Finally filters that don't care what order they are in,

-        // except that they must be after the above filters

         HB_FILTER_ROTATE,

         HB_FILTER_GRAYSCALE,

-        HB_FILTER_QSV_POST, // for QSV - important to have as a last one 

-        HB_FILTER_QSV,  // default MSDK VPP filter 

+        HB_FILTER_PAD,

+

+        // Finally filters that don't care what order they are in,

+        // except that they must be after the above filters

+        HB_FILTER_AVFILTER,

+

+        // for QSV - important to have as a last one

+        HB_FILTER_QSV_POST,

+        // default MSDK VPP filter

+        HB_FILTER_QSV,

+        HB_FILTER_LAST = HB_FILTER_QSV

     }

 }

diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/Presets/HBPreset.cs b/win/CS/HandBrake.ApplicationServices/Interop/Json/Presets/HBPreset.cs
index 260b55960..7e1e94697 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/Json/Presets/HBPreset.cs
+++ b/win/CS/HandBrake.ApplicationServices/Interop/Json/Presets/HBPreset.cs
@@ -127,6 +127,16 @@ namespace HandBrake.ApplicationServices.Interop.Json.Presets
         public string PictureDeinterlaceFilter { get; set; }

 

         /// <summary>

+        /// Gets or sets the picture comb detect preset.

+        /// </summary>

+        public string PictureCombDetectPreset { get; set; }

+

+        /// <summary>

+        /// Gets or sets the picture comb detect custom.

+        /// </summary>

+        public string PictureCombDetectCustom { get; set; }

+

+        /// <summary>

         /// Gets or sets the picture deinterlace preset.

         /// </summary>

         public string PictureDeinterlacePreset { get; set; }

diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Model/Encoding/CombDetect.cs b/win/CS/HandBrake.ApplicationServices/Interop/Model/Encoding/CombDetect.cs
new file mode 100644
index 000000000..d98d0d2ec
--- /dev/null
+++ b/win/CS/HandBrake.ApplicationServices/Interop/Model/Encoding/CombDetect.cs
@@ -0,0 +1,34 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="CombDetect.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   Defines the CombDetect type.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.ApplicationServices.Interop.Model.Encoding
+{
+    using HandBrake.ApplicationServices.Attributes;
+
+    /// <summary>
+    /// The CombDetect Type.
+    /// </summary>
+    public enum CombDetect
+    {
+        [ShortName("off")]
+        Off,
+
+        [ShortName("custom")]
+        Custom,
+
+        [ShortName("default")]
+        Default,
+
+        [ShortName("permissive")]
+        LessSensitive,
+
+        [ShortName("fast")]
+        Fast
+    }
+}