summaryrefslogtreecommitdiffstats
path: root/gst
diff options
context:
space:
mode:
authorSebastian Dröge <slomo@circular-chaos.org>2008-08-02 18:09:56 +0000
committerSebastian Dröge <slomo@circular-chaos.org>2008-08-02 18:09:56 +0000
commitfbaea28b978c9b73a814d8fc42bfa0dd72988104 (patch)
treedefc9a3c2060752898cfd7945e2d7520a7fbec29 /gst
parent9c028ad75d5adbda075c846d1c24e334490dd595 (diff)
downloadgst-plugins-bad-fbaea28b978c9b73a814d8fc42bfa0dd72988104.tar.gz
gst-plugins-bad-fbaea28b978c9b73a814d8fc42bfa0dd72988104.tar.bz2
gst-plugins-bad-fbaea28b978c9b73a814d8fc42bfa0dd72988104.zip
gst/deinterlace2/: Enable tomsmocomp again as the C port will be ready for the next release.
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.
Diffstat (limited to 'gst')
-rw-r--r--gst/deinterlace2/Makefile.am7
-rw-r--r--gst/deinterlace2/gstdeinterlace2.c7
2 files changed, 4 insertions, 10 deletions
diff --git a/gst/deinterlace2/Makefile.am b/gst/deinterlace2/Makefile.am
index fbddf189..0359ff81 100644
--- 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 a9809a17..8f3525e1 100644
--- 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,