mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-02-22 05:56:31 +00:00
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.
This commit is contained in:
parent
9c028ad75d
commit
fbaea28b97
3 changed files with 13 additions and 10 deletions
|
@ -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>
|
2008-08-02 Sebastian Dröge <sebastian.droege@collabora.co.uk>
|
||||||
|
|
||||||
* gst/deinterlace2/gstdeinterlace2.c: (gst_deinterlace2_init),
|
* gst/deinterlace2/gstdeinterlace2.c: (gst_deinterlace2_init),
|
||||||
|
|
|
@ -4,9 +4,8 @@ libgstdeinterlace2_la_SOURCES = \
|
||||||
gstdeinterlace2.c \
|
gstdeinterlace2.c \
|
||||||
tvtime/greedy.c \
|
tvtime/greedy.c \
|
||||||
tvtime/greedyh.c \
|
tvtime/greedyh.c \
|
||||||
tvtime/vfir.c
|
tvtime/vfir.c \
|
||||||
|
tvtime/tomsmocomp.c
|
||||||
# tvtime/tomsmocomp.c
|
|
||||||
|
|
||||||
libgstdeinterlace2_la_CFLAGS = $(GST_CFLAGS) \
|
libgstdeinterlace2_la_CFLAGS = $(GST_CFLAGS) \
|
||||||
$(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(LIBOIL_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)
|
$(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) $(GST_BASE_LIBS) $(LIBOIL_LIBS)
|
||||||
libgstdeinterlace2_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
|
libgstdeinterlace2_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
|
||||||
|
|
||||||
EXTRA_DIST = tvtime/tomsmocomp.c
|
|
||||||
|
|
||||||
noinst_HEADERS = \
|
noinst_HEADERS = \
|
||||||
gstdeinterlace2.h \
|
gstdeinterlace2.h \
|
||||||
tvtime/mmx.h \
|
tvtime/mmx.h \
|
||||||
|
|
|
@ -96,9 +96,7 @@ gst_deinterlace2_methods_get_type (void)
|
||||||
static GType deinterlace2_methods_type = 0;
|
static GType deinterlace2_methods_type = 0;
|
||||||
|
|
||||||
static const GEnumValue methods_types[] = {
|
static const GEnumValue methods_types[] = {
|
||||||
#if 0
|
|
||||||
{GST_DEINTERLACE2_TOMSMOCOMP, "Toms Motion Compensation", "tomsmocomp"},
|
{GST_DEINTERLACE2_TOMSMOCOMP, "Toms Motion Compensation", "tomsmocomp"},
|
||||||
#endif
|
|
||||||
{GST_DEINTERLACE2_GREEDY_H, "Greedy High Motion", "greedyh"},
|
{GST_DEINTERLACE2_GREEDY_H, "Greedy High Motion", "greedyh"},
|
||||||
{GST_DEINTERLACE2_GREEDY_L, "Greedy Low Motion", "greedyl"},
|
{GST_DEINTERLACE2_GREEDY_L, "Greedy Low Motion", "greedyl"},
|
||||||
{GST_DEINTERLACE2_VFIR, "Vertical Blur", "vfir"},
|
{GST_DEINTERLACE2_VFIR, "Vertical Blur", "vfir"},
|
||||||
|
@ -216,11 +214,9 @@ gst_deinterlace2_set_method (GstDeinterlace2 * self,
|
||||||
}
|
}
|
||||||
|
|
||||||
switch (method) {
|
switch (method) {
|
||||||
#if 0
|
|
||||||
case GST_DEINTERLACE2_TOMSMOCOMP:
|
case GST_DEINTERLACE2_TOMSMOCOMP:
|
||||||
self->method = g_object_new (GST_TYPE_DEINTERLACE_TOMSMOCOMP, NULL);
|
self->method = g_object_new (GST_TYPE_DEINTERLACE_TOMSMOCOMP, NULL);
|
||||||
break;
|
break;
|
||||||
#endif
|
|
||||||
case GST_DEINTERLACE2_GREEDY_H:
|
case GST_DEINTERLACE2_GREEDY_H:
|
||||||
self->method = g_object_new (GST_TYPE_DEINTERLACE_GREEDY_H, NULL);
|
self->method = g_object_new (GST_TYPE_DEINTERLACE_GREEDY_H, NULL);
|
||||||
break;
|
break;
|
||||||
|
@ -276,7 +272,8 @@ gst_deinterlace2_class_init (GstDeinterlace2Class * klass)
|
||||||
"Method",
|
"Method",
|
||||||
"Deinterlace Method",
|
"Deinterlace Method",
|
||||||
GST_TYPE_DEINTERLACE2_METHODS,
|
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,
|
g_object_class_install_property (gobject_class, ARG_FIELDS,
|
||||||
|
|
Loading…
Reference in a new issue