diff options
| author | Sebastian Dröge <slomo@circular-chaos.org> | 2008-08-02 18:09:56 +0000 |
|---|---|---|
| committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2009-05-13 10:34:00 +0200 |
| commit | 95d12cbca9164c2e3d2caa0f4b09eebf737e5c66 (patch) | |
| tree | 16caf2fc0b9740f24df100b634a84922f3c36e86 /gst | |
| parent | 060ba0ede11bcaa8220897bf745b58439f71ef94 (diff) | |
[MOVED FROM BAD 33/56] 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.am | 7 | ||||
| -rw-r--r-- | gst/deinterlace2/gstdeinterlace2.c | 7 |
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, |