From 305d591def7d9bb32f3dd3020c511970f3363960 Mon Sep 17 00:00:00 2001
From: John Stebbins <jstebbins.hb@gmail.com>
Date: Mon, 5 Oct 2015 08:53:19 -0700
Subject: Make deinterlace/decomb behave similar to nlmeans/hqdn3d

I.e. use a dropdown to select between the filters instead of a radio
button.
---
 test/test.c | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

(limited to 'test')

diff --git a/test/test.c b/test/test.c
index 27690cfc1..789b5aae0 100644
--- a/test/test.c
+++ b/test/test.c
@@ -3429,41 +3429,42 @@ static hb_dict_t * PreparePreset(const char *preset_name)
     {
         hb_dict_set(preset, "VideoGrayScale", hb_value_bool(grayscale));
     }
-    if (deinterlace_disable)
+    if (decomb_disable || deinterlace_disable)
     {
-        hb_dict_set(preset, "PictureDeinterlace", hb_value_string("off"));
+        hb_dict_set(preset, "PictureDeinterlaceFilter", hb_value_string("off"));
     }
     if (deinterlace != NULL)
     {
-        hb_dict_set(preset, "PictureDecombDeinterlace", hb_value_int(0));
+        hb_dict_set(preset, "PictureDeinterlaceFilter",
+                    hb_value_string("deinterlace"));
         if (!deinterlace_custom)
         {
-            hb_dict_set(preset, "PictureDeinterlace",
+            hb_dict_set(preset, "PictureDeinterlacePreset",
                         hb_value_string(deinterlace));
         }
         else
         {
-            hb_dict_set(preset, "PictureDeinterlace",
+            hb_dict_set(preset, "PictureDeinterlacePreset",
                         hb_value_string("custom"));
             hb_dict_set(preset, "PictureDeinterlaceCustom",
                         hb_value_string(deinterlace));
         }
     }
-    if (decomb_disable)
-    {
-        hb_dict_set(preset, "PictureDecomb", hb_value_string("off"));
-    }
     if (decomb != NULL)
     {
-        hb_dict_set(preset, "PictureDecombDeinterlace", hb_value_int(1));
+        hb_dict_set(preset, "PictureDeinterlaceFilter",
+                    hb_value_string("decomb"));
         if (!decomb_custom)
         {
-            hb_dict_set(preset, "PictureDecomb", hb_value_string(decomb));
+            hb_dict_set(preset, "PictureDeinterlacePreset",
+                        hb_value_string(decomb));
         }
         else
         {
-            hb_dict_set(preset, "PictureDecomb", hb_value_string("custom"));
-            hb_dict_set(preset, "PictureDecombCustom", hb_value_string(decomb));
+            hb_dict_set(preset, "PictureDeinterlacePreset",
+                        hb_value_string("custom"));
+            hb_dict_set(preset, "PictureDeinterlaceCustom",
+                        hb_value_string(decomb));
         }
     }
     if (detelecine_disable)
-- 
cgit v1.2.3