WinGui: Support for bob deinterlacing/ decomb.

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

6 files changed, 65 insertions, 23 deletions

diff --git a/win/CS/Controls/Filters.Designer.cs b/win/CS/Controls/Filters.Designer.cs
index 63223a8db..6b415f3b9 100644
--- a/win/CS/Controls/Filters.Designer.cs
+++ b/win/CS/Controls/Filters.Designer.cs
@@ -52,8 +52,8 @@
             // 

             // text_customDT

             // 

-            this.text_customDT.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 

-            | System.Windows.Forms.AnchorStyles.Right)));

+            this.text_customDT.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)

+                        | System.Windows.Forms.AnchorStyles.Right)));

             this.text_customDT.Location = new System.Drawing.Point(251, 3);

             this.text_customDT.Name = "text_customDT";

             this.text_customDT.Size = new System.Drawing.Size(115, 21);

@@ -74,8 +74,8 @@
             // 

             // drop_detelecine

             // 

-            this.drop_detelecine.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 

-            | System.Windows.Forms.AnchorStyles.Right)));

+            this.drop_detelecine.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)

+                        | System.Windows.Forms.AnchorStyles.Right)));

             this.drop_detelecine.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;

             this.drop_detelecine.FormattingEnabled = true;

             this.drop_detelecine.Items.AddRange(new object[] {

@@ -90,8 +90,8 @@
             // 

             // text_customDC

             // 

-            this.text_customDC.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 

-            | System.Windows.Forms.AnchorStyles.Right)));

+            this.text_customDC.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)

+                        | System.Windows.Forms.AnchorStyles.Right)));

             this.text_customDC.Location = new System.Drawing.Point(251, 30);

             this.text_customDC.Name = "text_customDC";

             this.text_customDC.Size = new System.Drawing.Size(115, 21);

@@ -112,15 +112,16 @@
             // 

             // drop_decomb

             // 

-            this.drop_decomb.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 

-            | System.Windows.Forms.AnchorStyles.Right)));

+            this.drop_decomb.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)

+                        | System.Windows.Forms.AnchorStyles.Right)));

             this.drop_decomb.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;

             this.drop_decomb.FormattingEnabled = true;

             this.drop_decomb.Items.AddRange(new object[] {

             "Off",

             "Custom",

             "Default",

-            "Fast"});

+            "Fast",

+            "Bob"});

             this.drop_decomb.Location = new System.Drawing.Point(71, 30);

             this.drop_decomb.Name = "drop_decomb";

             this.drop_decomb.Size = new System.Drawing.Size(174, 21);

@@ -129,8 +130,8 @@
             // 

             // text_customDI

             // 

-            this.text_customDI.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 

-            | System.Windows.Forms.AnchorStyles.Right)));

+            this.text_customDI.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)

+                        | System.Windows.Forms.AnchorStyles.Right)));

             this.text_customDI.Location = new System.Drawing.Point(251, 57);

             this.text_customDI.Name = "text_customDI";

             this.text_customDI.Size = new System.Drawing.Size(115, 21);

@@ -151,8 +152,8 @@
             // 

             // drop_deinterlace

             // 

-            this.drop_deinterlace.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 

-            | System.Windows.Forms.AnchorStyles.Right)));

+            this.drop_deinterlace.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)

+                        | System.Windows.Forms.AnchorStyles.Right)));

             this.drop_deinterlace.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;

             this.drop_deinterlace.FormattingEnabled = true;

             this.drop_deinterlace.Items.AddRange(new object[] {

@@ -160,7 +161,8 @@
             "Custom",

             "Fast",

             "Slow",

-            "Slower"});

+            "Slower",

+            "Bob"});

             this.drop_deinterlace.Location = new System.Drawing.Point(71, 57);

             this.drop_deinterlace.Name = "drop_deinterlace";

             this.drop_deinterlace.Size = new System.Drawing.Size(174, 21);

@@ -169,8 +171,8 @@
             // 

             // text_customDN

             // 

-            this.text_customDN.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 

-            | System.Windows.Forms.AnchorStyles.Right)));

+            this.text_customDN.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)

+                        | System.Windows.Forms.AnchorStyles.Right)));

             this.text_customDN.Location = new System.Drawing.Point(251, 84);

             this.text_customDN.Name = "text_customDN";

             this.text_customDN.Size = new System.Drawing.Size(115, 21);

@@ -191,8 +193,8 @@
             // 

             // drop_denoise

             // 

-            this.drop_denoise.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 

-            | System.Windows.Forms.AnchorStyles.Right)));

+            this.drop_denoise.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)

+                        | System.Windows.Forms.AnchorStyles.Right)));

             this.drop_denoise.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;

             this.drop_denoise.FormattingEnabled = true;

             this.drop_denoise.Items.AddRange(new object[] {

@@ -209,8 +211,8 @@
             // 

             // slider_deblock

             // 

-            this.slider_deblock.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 

-            | System.Windows.Forms.AnchorStyles.Right)));

+            this.slider_deblock.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)

+                        | System.Windows.Forms.AnchorStyles.Right)));

             this.slider_deblock.BackColor = System.Drawing.SystemColors.Window;

             this.slider_deblock.Location = new System.Drawing.Point(71, 111);

             this.slider_deblock.Maximum = 15;

diff --git a/win/CS/Controls/Filters.cs b/win/CS/Controls/Filters.cs
index b091b65ff..32d7d7b3e 100644
--- a/win/CS/Controls/Filters.cs
+++ b/win/CS/Controls/Filters.cs
@@ -188,6 +188,9 @@ namespace Handbrake.Controls
                     case "Fast":

                         query += " --decomb=\"7:2:6:9:1:80\"";

                         break;

+                    case "Bob":

+                        query += " --decomb=\"bob\"";

+                        break;

                     default:

                         query += string.Empty;

                         break;

@@ -210,6 +213,9 @@ namespace Handbrake.Controls
                     case "Custom":

                         query += " --deinterlace=\"" + text_customDI.Text + "\"";

                         break;

+                    case "Bob":

+                        query += " --deinterlace=\"bob\"";

+                        break;

                     default:

                         query += string.Empty;

                         break;

@@ -337,7 +343,9 @@ namespace Handbrake.Controls
                     break;

                 case Deinterlace.Slower:

                     drop_deinterlace.SelectedIndex = 4;

-

+                    break;

+                case Deinterlace.Bob:

+                    drop_deinterlace.SelectedIndex = 5;

                     break;

                 default:

                     drop_deinterlace.SelectedIndex = 1;

@@ -371,6 +379,9 @@ namespace Handbrake.Controls
                 case Decomb.Fast:

                     drop_decomb.SelectedIndex = 3;

                     break;

+                case Decomb.Bob:

+                    drop_decomb.SelectedIndex = 4;

+                    break;

                 default:

                     drop_decomb.SelectedIndex = 1;

                     text_customDC.Text = custom;

diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs b/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs
index d9f909d78..4e98f2da3 100644
--- a/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs
+++ b/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs
@@ -318,6 +318,12 @@ namespace HandBrake.ApplicationServices.Utilities
                 case Decomb.Custom:

                     query += string.Format(" --decomb=\"{0}\"", task.CustomDecomb);

                     break;

+                case Decomb.Fast:

+                    query += " --decomb=\"fast\"";

+                    break;

+                case Decomb.Bob:

+                    query += " --decomb=\"bob\"";

+                    break;

                 default:

                     query += string.Empty;

                     break;

@@ -337,6 +343,10 @@ namespace HandBrake.ApplicationServices.Utilities
                 case Deinterlace.Custom:

                     query += string.Format(" --deinterlace=\"{0}\"", task.CustomDeinterlace);

                     break;

+

+                case Deinterlace.Bob:

+                    query += " --deinterlace=\"bob\"";

+                    break;

                 default:

                     query += string.Empty;

                     break;

diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/QueryParserUtility.cs b/win/CS/HandBrake.ApplicationServices/Utilities/QueryParserUtility.cs
index 93fbff058..7dc120d7e 100644
--- a/win/CS/HandBrake.ApplicationServices/Utilities/QueryParserUtility.cs
+++ b/win/CS/HandBrake.ApplicationServices/Utilities/QueryParserUtility.cs
@@ -226,8 +226,22 @@ namespace HandBrake.ApplicationServices.Utilities
                     parsed.Decomb = Decomb.Default;

                     if (decombValue.Success)

                     {

-                        parsed.CustomDecomb = decombValue.ToString().Replace("--decomb=", string.Empty).Replace("\"", string.Empty).Trim();

-                        parsed.Decomb = parsed.CustomDecomb == "7:2:6:9:1:80" ? Decomb.Fast : Decomb.Custom;

+                        string value = decombValue.ToString().Replace("--decomb=", string.Empty).Replace("\"", string.Empty).Trim();

+

+                        if (value == "bob")

+                        {

+                            parsed.Decomb = Decomb.Bob;

+                        }

+                        else if (value == "fast")

+                        {

+                            parsed.Decomb = Decomb.Fast;

+                        }

+                        else

+                        {

+                            parsed.CustomDecomb = value;

+                            parsed.Decomb = parsed.CustomDecomb == "7:2:6:9:1:80" ? Decomb.Fast : Decomb.Custom;

+                        }

+

                     }

                 }

 

@@ -245,6 +259,9 @@ namespace HandBrake.ApplicationServices.Utilities
                         case "slower":

                             parsed.Deinterlace = Deinterlace.Slower;

                             break;

+                        case "bob":

+                            parsed.Deinterlace = Deinterlace.Bob;

+                            break;

                         default:

                             parsed.Deinterlace = Deinterlace.Custom;

                             parsed.CustomDeinterlace = deinterlace.ToString().Replace("--deinterlace=", string.Empty).Replace("\"", string.Empty).ToLower();

diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/Decomb.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/Decomb.cs
index c019f00ae..2e98daf4a 100644
--- a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/Decomb.cs
+++ b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/Decomb.cs
@@ -14,6 +14,7 @@ namespace HandBrake.Interop.Model.Encoding
 		Off = 0,

 		Default,

 		Custom,

+        Bob,

         Fast

 	}

 }

diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/Deinterlace.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/Deinterlace.cs
index 45f1f6136..5d51fe6d5 100644
--- a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/Deinterlace.cs
+++ b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/Deinterlace.cs
@@ -15,6 +15,7 @@ namespace HandBrake.Interop.Model.Encoding
 		Fast,

 		Slow,

 		Slower,

+        Bob,

 		Custom

 	}

 }