gst/deinterlace2/: Enable tomsmocomp again as the C port will be ready for the next...

Original commit message from CVS:
* gst/deinterlace2/Makefile.am:
* gst/deinterlace2/gstdeinterlace2.c:
(gst_deinterlace2_methods_get_type), (gst_deinterlace2_set_method),
(gst_deinterlace2_class_init):
Enable tomsmocomp again as the C port will be ready for the next
release.

diff --git a/ChangeLog b/ChangeLog
index a47fc10615f138570d567583da4281116b1fef7a..f155c794503c48288c2a9fa57194e32ccdf743d3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-08-02  Sebastian Dröge  <sebastian.droege@collabora.co.uk>
+
+       * gst/deinterlace2/Makefile.am:
+       * gst/deinterlace2/gstdeinterlace2.c:
+       (gst_deinterlace2_methods_get_type), (gst_deinterlace2_set_method),
+       (gst_deinterlace2_class_init):
+       Enable tomsmocomp again as the C port will be ready for the next
+       release.
+
 2008-08-02  Sebastian Dröge  <sebastian.droege@collabora.co.uk>
 
        * gst/deinterlace2/gstdeinterlace2.c: (gst_deinterlace2_init),

diff --git a/gst/deinterlace2/Makefile.am b/gst/deinterlace2/Makefile.am
index fbddf189ffb7f91e8f9deec92962659cc17b4d6f..0359ff81960caf31f0983075e8d0655ae259f71b 100644 (file)
--- a/gst/deinterlace2/Makefile.am
+++ b/gst/deinterlace2/Makefile.am
@@ -4,9 +4,8 @@ libgstdeinterlace2_la_SOURCES = \
        gstdeinterlace2.c \
        tvtime/greedy.c \
        tvtime/greedyh.c \
-       tvtime/vfir.c
-
-#      tvtime/tomsmocomp.c
+       tvtime/vfir.c \
+       tvtime/tomsmocomp.c
 
 libgstdeinterlace2_la_CFLAGS = $(GST_CFLAGS) \
        $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(LIBOIL_CFLAGS)
@@ -14,8 +13,6 @@ libgstdeinterlace2_la_LIBADD = $(GST_LIBS) \
        $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) $(GST_BASE_LIBS) $(LIBOIL_LIBS)
 libgstdeinterlace2_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 
-EXTRA_DIST = tvtime/tomsmocomp.c
-
 noinst_HEADERS = \
        gstdeinterlace2.h \
        tvtime/mmx.h \

diff --git a/gst/deinterlace2/gstdeinterlace2.c b/gst/deinterlace2/gstdeinterlace2.c
index a9809a1701182d9fe62523041b6a9d11fcdf1614..8f3525e1fc29f4f0f79dbe41022560bbf82c7ee1 100644 (file)
--- a/gst/deinterlace2/gstdeinterlace2.c
+++ b/gst/deinterlace2/gstdeinterlace2.c
@@ -96,9 +96,7 @@ gst_deinterlace2_methods_get_type (void)
   static GType deinterlace2_methods_type = 0;
 
   static const GEnumValue methods_types[] = {
-#if 0
     {GST_DEINTERLACE2_TOMSMOCOMP, "Toms Motion Compensation", "tomsmocomp"},
-#endif
     {GST_DEINTERLACE2_GREEDY_H, "Greedy High Motion", "greedyh"},
     {GST_DEINTERLACE2_GREEDY_L, "Greedy Low Motion", "greedyl"},
     {GST_DEINTERLACE2_VFIR, "Vertical Blur", "vfir"},
@@ -216,11 +214,9 @@ gst_deinterlace2_set_method (GstDeinterlace2 * self,
   }
 
   switch (method) {
-#if 0
     case GST_DEINTERLACE2_TOMSMOCOMP:
       self->method = g_object_new (GST_TYPE_DEINTERLACE_TOMSMOCOMP, NULL);
       break;
-#endif
     case GST_DEINTERLACE2_GREEDY_H:
       self->method = g_object_new (GST_TYPE_DEINTERLACE_GREEDY_H, NULL);
       break;
@@ -276,7 +272,8 @@ gst_deinterlace2_class_init (GstDeinterlace2Class * klass)
           "Method",
           "Deinterlace Method",
           GST_TYPE_DEINTERLACE2_METHODS,
-          GST_DEINTERLACE2_GREEDY_H, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)
+          GST_DEINTERLACE2_TOMSMOCOMP,
+          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)
       );
 
   g_object_class_install_property (gobject_class, ARG_FIELDS,