diff options
| author | Sebastian Dröge <slomo@circular-chaos.org> | 2008-07-18 08:34:06 +0000 |
|---|---|---|
| committer | Sebastian Dröge <slomo@circular-chaos.org> | 2008-07-18 08:34:06 +0000 |
| commit | 26cb95316c8043e05365337660c1e07b067f298e (patch) | |
| tree | 21f9652306edda7ca408ee1b389af80bca5a2d12 /gst/deinterlace2/gstdeinterlace2.c | |
| parent | 32e80c449f3a29513111bceb7583a03fd22ca299 (diff) | |
| download | gst-plugins-bad-26cb95316c8043e05365337660c1e07b067f298e.tar.gz gst-plugins-bad-26cb95316c8043e05365337660c1e07b067f298e.tar.bz2 gst-plugins-bad-26cb95316c8043e05365337660c1e07b067f298e.zip | |
Disable the tomsmocomp algorithm for this release as it's buggy and has no C implementation yet.
Original commit message from CVS:
* configure.ac:
* gst/deinterlace2/Makefile.am:
* gst/deinterlace2/gstdeinterlace2.c:
(gst_deinterlace2_methods_get_type), (gst_deinterlace2_set_method),
(gst_deinterlace2_class_init), (gst_deinterlace2_init):
* gst/deinterlace2/gstdeinterlace2.h:
* gst/deinterlace2/tvtime/greedy.c:
(gst_deinterlace_method_greedy_l_class_init):
* gst/deinterlace2/tvtime/greedyh.c:
(gst_deinterlace_method_greedy_h_class_init):
* gst/deinterlace2/tvtime/vfir.c:
(gst_deinterlace_method_vfir_class_init):
Disable the tomsmocomp algorithm for this release as it's buggy
and has no C implementation yet.
Build the deinterlace2 plugin on all architectures but still mark it
as experimental.
Build the x86 inline assembly only if GCC inline assembly is supported
and only on x86 or amd64. Fixes bug #543286.
Diffstat (limited to 'gst/deinterlace2/gstdeinterlace2.c')
| -rw-r--r-- | gst/deinterlace2/gstdeinterlace2.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/gst/deinterlace2/gstdeinterlace2.c b/gst/deinterlace2/gstdeinterlace2.c index 14fea794..54cde5ff 100644 --- a/gst/deinterlace2/gstdeinterlace2.c +++ b/gst/deinterlace2/gstdeinterlace2.c @@ -23,10 +23,11 @@ #include "config.h" #endif -#include "gstdeinterlace2.h" #include <gst/gst.h> #include <gst/video/video.h> +#include <liboil/liboil.h> +#include "gstdeinterlace2.h" #include "tvtime/plugins.h" #include <string.h> @@ -95,7 +96,9 @@ 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"}, @@ -212,9 +215,11 @@ 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; @@ -270,8 +275,7 @@ gst_deinterlace2_class_init (GstDeinterlace2Class * klass) "Method", "Deinterlace Method", GST_TYPE_DEINTERLACE2_METHODS, - GST_DEINTERLACE2_TOMSMOCOMP, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS) + GST_DEINTERLACE2_GREEDY_H, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS) ); g_object_class_install_property (gobject_class, ARG_FIELDS, @@ -351,7 +355,7 @@ gst_deinterlace2_init (GstDeinterlace2 * self, GstDeinterlace2Class * klass) gst_element_no_more_pads (GST_ELEMENT (self)); - gst_deinterlace2_set_method (self, GST_DEINTERLACE2_TOMSMOCOMP); + gst_deinterlace2_set_method (self, GST_DEINTERLACE2_GREEDY_H); self->field_layout = GST_DEINTERLACE2_LAYOUT_AUTO; self->fields = GST_DEINTERLACE2_ALL; |