deinterlace: use avfilter yadif deinterlacer

Cantar4 · Feb 15, 2016 · 7e5bbec · 7e5bbec
1 parent bced9cf
commit 7e5bbec
Show file tree

Hide file tree

Showing 8 changed files with 216 additions and 682 deletions.
diff --git a/gtk/src/hb-backend.c b/gtk/src/hb-backend.c
@@ -200,7 +200,7 @@ static options_map_t d_deint_opts[] =
 {
     {N_("Off"),         "off",         HB_FILTER_INVALID,     ""},
     {N_("Decomb"),      "decomb",      HB_FILTER_DECOMB,      ""},
-    {N_("Deinterlace"), "deinterlace", HB_FILTER_DEINTERLACE, ""},
+    {N_("Yadif"),       "deinterlace", HB_FILTER_DEINTERLACE, ""},
 };
 combo_opts_t deint_opts =
 {

diff --git a/libhb/avfilter.c b/libhb/avfilter.c
@@ -74,6 +74,18 @@ hb_filter_object_t hb_filter_rotate =
     .info          = avfilter_info,
 };
 
+hb_filter_object_t hb_filter_deinterlace =
+{
+    .id            = HB_FILTER_DEINTERLACE,
+    .enforce_order = 1,
+    .name          = "avfilter",
+    .settings      = NULL,
+    .init          = avfilter_init,
+    .work          = avfilter_work,
+    .close         = avfilter_close,
+    .info          = avfilter_info,
+};
+
 static AVFilterContext * append_filter( hb_filter_private_t * pv,
                                         const char * name, const char * args)
 {
@@ -429,6 +441,7 @@ void hb_avfilter_combine( hb_list_t * list )
         {
             case HB_FILTER_AVFILTER:
             case HB_FILTER_ROTATE:
+            case HB_FILTER_DEINTERLACE:
             case HB_FILTER_PAD:
                 if (avfilter != NULL)
                 {

diff --git a/libhb/builtin_presets.h b/libhb/builtin_presets.h
@@ -858,6 +858,6 @@ const char hb_builtin_presets_json[] =
 "        }, \n"
 "        \"VersionMajor\": 11, \n"
 "        \"VersionMicro\": 0, \n"
-"        \"VersionMinor\": 0\n"
+"        \"VersionMinor\": 1\n"
 "    }\n"
 "}\n";