gst/deinterlace2/: Add the remaining tvtime deinterlacing methods and fix the deinterlace_frame() implementation of G...

Original commit message from CVS:
* gst/deinterlace2/Makefile.am:
* gst/deinterlace2/gstdeinterlace2.c:
(gst_deinterlace_simple_method_deinterlace_frame),
(gst_deinterlace2_methods_get_type), (gst_deinterlace2_set_method):
* gst/deinterlace2/gstdeinterlace2.h:
* gst/deinterlace2/tvtime/linear.c:
(deinterlace_scanline_linear_c), (deinterlace_scanline_linear_mmx),
(deinterlace_scanline_linear_mmxext),
(gst_deinterlace_method_linear_class_init),
(gst_deinterlace_method_linear_init):
* gst/deinterlace2/tvtime/linearblend.c:
(deinterlace_scanline_linear_blend_c),
(deinterlace_scanline_linear_blend2_c),
(deinterlace_scanline_linear_blend_mmx),
(deinterlace_scanline_linear_blend2_mmx),
(gst_deinterlace_method_linear_blend_class_init),
(gst_deinterlace_method_linear_blend_init):
* gst/deinterlace2/tvtime/plugins.h:
* gst/deinterlace2/tvtime/scalerbob.c:
(deinterlace_scanline_scaler_bob),
(gst_deinterlace_method_scaler_bob_class_init),
(gst_deinterlace_method_scaler_bob_init):
* gst/deinterlace2/tvtime/weave.c: (deinterlace_scanline_weave),
(copy_scanline), (gst_deinterlace_method_weave_class_init),
(gst_deinterlace_method_weave_init):
* gst/deinterlace2/tvtime/weavebff.c: (deinterlace_scanline_weave),
(copy_scanline), (gst_deinterlace_method_weave_bff_class_init),
(gst_deinterlace_method_weave_bff_init):
* gst/deinterlace2/tvtime/weavetff.c: (deinterlace_scanline_weave),
(copy_scanline), (gst_deinterlace_method_weave_tff_class_init),
(gst_deinterlace_method_weave_tff_init):
Add the remaining tvtime deinterlacing methods and fix the
deinterlace_frame() implementation of GstDeinterlaceSimpleMethod.

1 files changed, 33 insertions, 10 deletions

diff --git a/gst/deinterlace2/gstdeinterlace2.c b/gst/deinterlace2/gstdeinterlace2.c
index cf72a8d7..28abdaba 100644
--- a/gst/deinterlace2/gstdeinterlace2.c
+++ b/gst/deinterlace2/gstdeinterlace2.c
@@ -128,14 +128,11 @@ gst_deinterlace_simple_method_deinterlace_frame (GstDeinterlaceMethod * self,
   g_assert (dm_class->fields_required <= 4);
 
   if (dm_class->fields_required >= 2)
-    field1 = field0 =
-        GST_BUFFER_DATA (parent->field_history[cur_field_idx + 1].buf);
+    field1 = GST_BUFFER_DATA (parent->field_history[cur_field_idx + 1].buf);
   if (dm_class->fields_required >= 3)
-    field1 = field0 =
-        GST_BUFFER_DATA (parent->field_history[cur_field_idx + 2].buf);
+    field2 = GST_BUFFER_DATA (parent->field_history[cur_field_idx + 2].buf);
   if (dm_class->fields_required >= 4)
-    field1 = field0 =
-        GST_BUFFER_DATA (parent->field_history[cur_field_idx + 3].buf);
+    field3 = GST_BUFFER_DATA (parent->field_history[cur_field_idx + 3].buf);
 
 
   if (cur_field_flags == PICTURE_INTERLACED_BOTTOM) {
@@ -259,10 +256,18 @@ gst_deinterlace2_methods_get_type (void)
   static GType deinterlace2_methods_type = 0;
 
   static const GEnumValue methods_types[] = {
-    {GST_DEINTERLACE2_TOMSMOCOMP, "Toms Motion Compensation", "tomsmocomp"},
-    {GST_DEINTERLACE2_GREEDY_H, "Greedy High Motion", "greedyh"},
-    {GST_DEINTERLACE2_GREEDY_L, "Greedy Low Motion", "greedyl"},
-    {GST_DEINTERLACE2_VFIR, "Vertical Blur", "vfir"},
+    {GST_DEINTERLACE2_TOMSMOCOMP, "Motion Adaptive: Motion Search",
+        "tomsmocomp"},
+    {GST_DEINTERLACE2_GREEDY_H, "Motion Adaptive: Advanced Detection",
+        "greedyh"},
+    {GST_DEINTERLACE2_GREEDY_L, "Motion Adaptive: Simple Detection", "greedyl"},
+    {GST_DEINTERLACE2_VFIR, "Blur Vertical", "vfir"},
+    {GST_DEINTERLACE2_LINEAR, "Television: Full resolution", "linear"},
+    {GST_DEINTERLACE2_LINEAR_BLEND, "Blur: Temporal", "linearblend"},
+    {GST_DEINTERLACE2_SCALER_BOB, "Double lines", "scalerbob"},
+    {GST_DEINTERLACE2_WEAVE, "Weave", "weave"},
+    {GST_DEINTERLACE2_WEAVE_TFF, "Progressive: Top Field First", "weavetff"},
+    {GST_DEINTERLACE2_WEAVE_BFF, "Progressive: Bottom Field First", "weavebff"},
     {0, NULL, NULL},
   };
 
@@ -389,6 +394,24 @@ gst_deinterlace2_set_method (GstDeinterlace2 * self,
     case GST_DEINTERLACE2_VFIR:
       self->method = g_object_new (GST_TYPE_DEINTERLACE_VFIR, NULL);
       break;
+    case GST_DEINTERLACE2_LINEAR:
+      self->method = g_object_new (GST_TYPE_DEINTERLACE_LINEAR, NULL);
+      break;
+    case GST_DEINTERLACE2_LINEAR_BLEND:
+      self->method = g_object_new (GST_TYPE_DEINTERLACE_LINEAR_BLEND, NULL);
+      break;
+    case GST_DEINTERLACE2_SCALER_BOB:
+      self->method = g_object_new (GST_TYPE_DEINTERLACE_SCALER_BOB, NULL);
+      break;
+    case GST_DEINTERLACE2_WEAVE:
+      self->method = g_object_new (GST_TYPE_DEINTERLACE_WEAVE, NULL);
+      break;
+    case GST_DEINTERLACE2_WEAVE_TFF:
+      self->method = g_object_new (GST_TYPE_DEINTERLACE_WEAVE_TFF, NULL);
+      break;
+    case GST_DEINTERLACE2_WEAVE_BFF:
+      self->method = g_object_new (GST_TYPE_DEINTERLACE_WEAVE_BFF, NULL);
+      break;
     default:
       GST_WARNING ("Invalid Deinterlacer Method");
       return;