Commit 43445935 authored by Sebastian Dröge's avatar Sebastian Dröge

Moved 'deinterlace2' from -bad to -good

And rename it to deinterlace.
parent 77c15d10
...@@ -280,6 +280,7 @@ AG_GST_CHECK_PLUGIN(autodetect) ...@@ -280,6 +280,7 @@ AG_GST_CHECK_PLUGIN(autodetect)
AG_GST_CHECK_PLUGIN(avi) AG_GST_CHECK_PLUGIN(avi)
AG_GST_CHECK_PLUGIN(cutter) AG_GST_CHECK_PLUGIN(cutter)
AG_GST_CHECK_PLUGIN(debugutils) AG_GST_CHECK_PLUGIN(debugutils)
AG_GST_CHECK_PLUGIN(deinterlace)
AG_GST_CHECK_PLUGIN(effectv) AG_GST_CHECK_PLUGIN(effectv)
AG_GST_CHECK_PLUGIN(equalizer) AG_GST_CHECK_PLUGIN(equalizer)
AG_GST_CHECK_PLUGIN(flv) AG_GST_CHECK_PLUGIN(flv)
...@@ -1055,7 +1056,7 @@ gst/auparse/Makefile ...@@ -1055,7 +1056,7 @@ gst/auparse/Makefile
gst/autodetect/Makefile gst/autodetect/Makefile
gst/avi/Makefile gst/avi/Makefile
gst/cutter/Makefile gst/cutter/Makefile
gst/debugutils/Makefile gst/deinterlace/Makefile
gst/effectv/Makefile gst/effectv/Makefile
gst/equalizer/Makefile gst/equalizer/Makefile
gst/flv/Makefile gst/flv/Makefile
......
...@@ -137,6 +137,7 @@ EXTRA_HFILES = \ ...@@ -137,6 +137,7 @@ EXTRA_HFILES = \
$(top_srcdir)/gst/cutter/gstcutter.h \ $(top_srcdir)/gst/cutter/gstcutter.h \
$(top_srcdir)/gst/debugutils/gsttaginject.h \ $(top_srcdir)/gst/debugutils/gsttaginject.h \
$(top_srcdir)/gst/debugutils/progressreport.h \ $(top_srcdir)/gst/debugutils/progressreport.h \
$(top_srcdir)/gst/deinterlace/gstdeinterlace.h \
$(top_srcdir)/gst/equalizer/gstiirequalizer.h \ $(top_srcdir)/gst/equalizer/gstiirequalizer.h \
$(top_srcdir)/gst/equalizer/gstiirequalizer3bands.h \ $(top_srcdir)/gst/equalizer/gstiirequalizer3bands.h \
$(top_srcdir)/gst/equalizer/gstiirequalizer10bands.h \ $(top_srcdir)/gst/equalizer/gstiirequalizer10bands.h \
......
...@@ -50,6 +50,7 @@ ...@@ -50,6 +50,7 @@
<xi:include href="xml/element-cmmldec.xml" /> <xi:include href="xml/element-cmmldec.xml" />
<xi:include href="xml/element-cmmlenc.xml" /> <xi:include href="xml/element-cmmlenc.xml" />
<xi:include href="xml/element-cutter.xml" /> <xi:include href="xml/element-cutter.xml" />
<xi:include href="xml/element-deinterlace.xml" />
<xi:include href="xml/element-deinterleave.xml" /> <xi:include href="xml/element-deinterleave.xml" />
<xi:include href="xml/element-directdrawsink.xml" /> <xi:include href="xml/element-directdrawsink.xml" />
<xi:include href="xml/element-directsoundsink.xml" /> <xi:include href="xml/element-directsoundsink.xml" />
...@@ -155,6 +156,7 @@ ...@@ -155,6 +156,7 @@
<xi:include href="xml/plugin-cairo.xml" /> <xi:include href="xml/plugin-cairo.xml" />
<xi:include href="xml/plugin-cutter.xml" /> <xi:include href="xml/plugin-cutter.xml" />
<xi:include href="xml/plugin-debug.xml" /> <xi:include href="xml/plugin-debug.xml" />
<xi:include href="xml/plugin-deinterlace.xml" />
<xi:include href="xml/plugin-directdraw.xml" /> <xi:include href="xml/plugin-directdraw.xml" />
<xi:include href="xml/plugin-directsound.xml" /> <xi:include href="xml/plugin-directsound.xml" />
<xi:include href="xml/plugin-dv.xml" /> <xi:include href="xml/plugin-dv.xml" />
......
...@@ -464,6 +464,20 @@ GstCutterClass ...@@ -464,6 +464,20 @@ GstCutterClass
gst_cutter_get_type gst_cutter_get_type
</SECTION> </SECTION>
<SECTION>
<FILE>element-deinterlace</FILE>
<TITLE>deinterlace</TITLE>
GstDeinterlace
<SUBSECTION Standard>
GstDeinterlaceClass
GST_IS_DEINTERLACE
GST_IS_DEINTERLACE_CLASS
GST_DEINTERLACE
GST_DEINTERLACE_CLASS
GST_TYPE_DEINTERLACE
gst_deinterlace_get_type
</SECTION>
<SECTION> <SECTION>
<FILE>element-deinterleave</FILE> <FILE>element-deinterleave</FILE>
<TITLE>deinterleave</TITLE> <TITLE>deinterleave</TITLE>
......
...@@ -19918,3 +19918,43 @@ ...@@ -19918,3 +19918,43 @@
<DEFAULT>TRUE</DEFAULT> <DEFAULT>TRUE</DEFAULT>
</ARG> </ARG>
<ARG>
<NAME>GstDeinterlace::fields</NAME>
<TYPE>GstDeinterlaceFields</TYPE>
<RANGE></RANGE>
<FLAGS>rw</FLAGS>
<NICK>fields</NICK>
<BLURB>Fields to use for deinterlacing.</BLURB>
<DEFAULT>All fields</DEFAULT>
</ARG>
<ARG>
<NAME>GstDeinterlace::method</NAME>
<TYPE>GstDeinterlaceMethods</TYPE>
<RANGE></RANGE>
<FLAGS>rw</FLAGS>
<NICK>Method</NICK>
<BLURB>Deinterlace Method.</BLURB>
<DEFAULT>Motion Adaptive: Advanced Detection</DEFAULT>
</ARG>
<ARG>
<NAME>GstDeinterlace::mode</NAME>
<TYPE>GstDeinterlaceModes</TYPE>
<RANGE></RANGE>
<FLAGS>rw</FLAGS>
<NICK>Mode</NICK>
<BLURB>Deinterlace Mode.</BLURB>
<DEFAULT>Enfore deinterlacing</DEFAULT>
</ARG>
<ARG>
<NAME>GstDeinterlace::tff</NAME>
<TYPE>GstDeinterlaceFieldLayout</TYPE>
<RANGE></RANGE>
<FLAGS>rw</FLAGS>
<NICK>tff</NICK>
<BLURB>Deinterlace top field first.</BLURB>
<DEFAULT>Auto detection</DEFAULT>
</ARG>
...@@ -142,6 +142,8 @@ GObject ...@@ -142,6 +142,8 @@ GObject
GstID3Demux GstID3Demux
GstGoom GstGoom
GstGoom2k1 GstGoom2k1
GstFLVDemux
GstFlvMux
GstMultipartDemux GstMultipartDemux
GstMultipartMux GstMultipartMux
GstMuLawEnc GstMuLawEnc
...@@ -187,6 +189,7 @@ GObject ...@@ -187,6 +189,7 @@ GObject
GstInterleave GstInterleave
GstDeinterleave GstDeinterleave
GstMonoscope GstMonoscope
GstDeinterlace
GstWavEnc GstWavEnc
GstAuParse GstAuParse
GstRTPDepay GstRTPDepay
......
...@@ -40,4 +40,6 @@ GstSpeexEnc GstTagSetter GstPreset ...@@ -40,4 +40,6 @@ GstSpeexEnc GstTagSetter GstPreset
GstOssMixerElement GstImplementsInterface GstMixer GstOssMixerElement GstImplementsInterface GstMixer
GstMatroskaMux GstTagSetter GstMatroskaMux GstTagSetter
GstVideoMixer GstChildProxy GstVideoMixer GstChildProxy
GstFlvMux GstTagSetter
GstAviMux GstTagSetter GstAviMux GstTagSetter
GstDeinterlace GstChildProxy
<plugin>
<name>deinterlace</name>
<description>Deinterlacer</description>
<filename>../../gst/deinterlace/.libs/libgstdeinterlace.so</filename>
<basename>libgstdeinterlace.so</basename>
<version>0.10.14.2</version>
<license>LGPL</license>
<source>gst-plugins-good</source>
<package>GStreamer Good Plug-ins CVS/prerelease</package>
<origin>Unknown package origin</origin>
<elements>
<element>
<name>deinterlace</name>
<longname>Deinterlacer</longname>
<class>Filter/Video</class>
<description>Deinterlace Methods ported from DScaler/TvTime</description>
<author>Martin Eikermann &lt;meiker@upb.de&gt;, Sebastian Dröge &lt;slomo@circular-chaos.org&gt;</author>
<pads>
<caps>
<name>sink</name>
<direction>sink</direction>
<presence>always</presence>
<details>video/x-raw-yuv, format=(fourcc)YUY2, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]; video/x-raw-yuv, format=(fourcc)YVYU, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]</details>
</caps>
<caps>
<name>src</name>
<direction>source</direction>
<presence>always</presence>
<details>video/x-raw-yuv, format=(fourcc)YUY2, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]; video/x-raw-yuv, format=(fourcc)YVYU, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]</details>
</caps>
</pads>
</element>
</elements>
</plugin>
\ No newline at end of file
plugin_LTLIBRARIES = libgstdeinterlace2.la plugin_LTLIBRARIES = libgstdeinterlace.la
libgstdeinterlace2_la_SOURCES = \ libgstdeinterlace_la_SOURCES = \
gstdeinterlace2.c \ gstdeinterlace.c \
tvtime/greedy.c \ tvtime/greedy.c \
tvtime/greedyh.c \ tvtime/greedyh.c \
tvtime/vfir.c \ tvtime/vfir.c \
...@@ -13,15 +13,15 @@ libgstdeinterlace2_la_SOURCES = \ ...@@ -13,15 +13,15 @@ libgstdeinterlace2_la_SOURCES = \
tvtime/linearblend.c \ tvtime/linearblend.c \
tvtime/scalerbob.c tvtime/scalerbob.c
libgstdeinterlace2_la_CFLAGS = $(GST_CFLAGS) \ libgstdeinterlace_la_CFLAGS = $(GST_CFLAGS) \
$(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(LIBOIL_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(LIBOIL_CFLAGS)
libgstdeinterlace2_la_LIBADD = $(GST_LIBS) \ libgstdeinterlace_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) libgstdeinterlace_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
libgstdeinterlace2_la_LIBTOOLFLAGS = --tag=disable-static libgstdeinterlace_la_LIBTOOLFLAGS = --tag=disable-static
noinst_HEADERS = \ noinst_HEADERS = \
gstdeinterlace2.h \ gstdeinterlace.h \
tvtime/mmx.h \ tvtime/mmx.h \
tvtime/sse.h \ tvtime/sse.h \
tvtime/greedyh.asm \ tvtime/greedyh.asm \
......
...@@ -19,8 +19,8 @@ ...@@ -19,8 +19,8 @@
* Boston, MA 02111-1307, USA. * Boston, MA 02111-1307, USA.
*/ */
#ifndef __GST_DEINTERLACE_2_H__ #ifndef __GST_DEINTERLACE_H__
#define __GST_DEINTERLACE_2_H__ #define __GST_DEINTERLACE_H__
#include <gst/gst.h> #include <gst/gst.h>
#include <gst/base/gstbasetransform.h> #include <gst/base/gstbasetransform.h>
...@@ -36,19 +36,19 @@ ...@@ -36,19 +36,19 @@
G_BEGIN_DECLS G_BEGIN_DECLS
#define GST_TYPE_DEINTERLACE2 \ #define GST_TYPE_DEINTERLACE \
(gst_deinterlace2_get_type()) (gst_deinterlace_get_type())
#define GST_DEINTERLACE2(obj) \ #define GST_DEINTERLACE(obj) \
(G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_DEINTERLACE2,GstDeinterlace2)) (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_DEINTERLACE,GstDeinterlace))
#define GST_DEINTERLACE2_CLASS(klass) \ #define GST_DEINTERLACE_CLASS(klass) \
(G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_DEINTERLACE2,GstDeinterlace2)) (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_DEINTERLACE,GstDeinterlace))
#define GST_IS_DEINTERLACE2(obj) \ #define GST_IS_DEINTERLACE(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_DEINTERLACE2)) (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_DEINTERLACE))
#define GST_IS_DEINTERLACE2_CLASS(obj) \ #define GST_IS_DEINTERLACE_CLASS(obj) \
(G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_DEINTERLACE2)) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_DEINTERLACE))
typedef struct _GstDeinterlace2 GstDeinterlace2; typedef struct _GstDeinterlace GstDeinterlace;
typedef struct _GstDeinterlace2Class GstDeinterlace2Class; typedef struct _GstDeinterlaceClass GstDeinterlaceClass;
#define GST_TYPE_DEINTERLACE_METHOD (gst_deinterlace_method_get_type ()) #define GST_TYPE_DEINTERLACE_METHOD (gst_deinterlace_method_get_type ())
#define GST_IS_DEINTERLACE_METHOD(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_DEINTERLACE_METHOD)) #define GST_IS_DEINTERLACE_METHOD(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_DEINTERLACE_METHOD))
...@@ -74,7 +74,7 @@ struct _GstDeinterlaceMethodClass { ...@@ -74,7 +74,7 @@ struct _GstDeinterlaceMethodClass {
guint fields_required; guint fields_required;
guint latency; guint latency;
void (*deinterlace_frame) (GstDeinterlaceMethod *self, GstDeinterlace2 * parent, GstBuffer *outbuf); void (*deinterlace_frame) (GstDeinterlaceMethod *self, GstDeinterlace * parent, GstBuffer *outbuf);
const gchar *name; const gchar *name;
const gchar *nick; const gchar *nick;
...@@ -137,8 +137,8 @@ struct _GstDeinterlaceSimpleMethod { ...@@ -137,8 +137,8 @@ struct _GstDeinterlaceSimpleMethod {
struct _GstDeinterlaceSimpleMethodClass { struct _GstDeinterlaceSimpleMethodClass {
GstDeinterlaceMethodClass parent_class; GstDeinterlaceMethodClass parent_class;
void (*interpolate_scanline) (GstDeinterlaceMethod *self, GstDeinterlace2 * parent, guint8 *out, GstDeinterlaceScanlineData *scanlines, gint width); void (*interpolate_scanline) (GstDeinterlaceMethod *self, GstDeinterlace * parent, guint8 *out, GstDeinterlaceScanlineData *scanlines, gint width);
void (*copy_scanline) (GstDeinterlaceMethod *self, GstDeinterlace2 * parent, guint8 *out, GstDeinterlaceScanlineData *scanlines, gint width); void (*copy_scanline) (GstDeinterlaceMethod *self, GstDeinterlace * parent, guint8 *out, GstDeinterlaceScanlineData *scanlines, gint width);
}; };
GType gst_deinterlace_simple_method_get_type (void); GType gst_deinterlace_simple_method_get_type (void);
...@@ -161,39 +161,39 @@ typedef struct ...@@ -161,39 +161,39 @@ typedef struct
typedef enum typedef enum
{ {
GST_DEINTERLACE2_TOMSMOCOMP, GST_DEINTERLACE_TOMSMOCOMP,
GST_DEINTERLACE2_GREEDY_H, GST_DEINTERLACE_GREEDY_H,
GST_DEINTERLACE2_GREEDY_L, GST_DEINTERLACE_GREEDY_L,
GST_DEINTERLACE2_VFIR, GST_DEINTERLACE_VFIR,
GST_DEINTERLACE2_LINEAR, GST_DEINTERLACE_LINEAR,
GST_DEINTERLACE2_LINEAR_BLEND, GST_DEINTERLACE_LINEAR_BLEND,
GST_DEINTERLACE2_SCALER_BOB, GST_DEINTERLACE_SCALER_BOB,
GST_DEINTERLACE2_WEAVE, GST_DEINTERLACE_WEAVE,
GST_DEINTERLACE2_WEAVE_TFF, GST_DEINTERLACE_WEAVE_TFF,
GST_DEINTERLACE2_WEAVE_BFF GST_DEINTERLACE_WEAVE_BFF
} GstDeinterlace2Methods; } GstDeinterlaceMethods;
typedef enum typedef enum
{ {
GST_DEINTERLACE2_ALL, /* All (missing data is interp.) */ GST_DEINTERLACE_ALL, /* All (missing data is interp.) */
GST_DEINTERLACE2_TF, /* Top Fields Only */ GST_DEINTERLACE_TF, /* Top Fields Only */
GST_DEINTERLACE2_BF /* Bottom Fields Only */ GST_DEINTERLACE_BF /* Bottom Fields Only */
} GstDeinterlace2Fields; } GstDeinterlaceFields;
typedef enum typedef enum
{ {
GST_DEINTERLACE2_LAYOUT_AUTO, GST_DEINTERLACE_LAYOUT_AUTO,
GST_DEINTERLACE2_LAYOUT_TFF, GST_DEINTERLACE_LAYOUT_TFF,
GST_DEINTERLACE2_LAYOUT_BFF GST_DEINTERLACE_LAYOUT_BFF
} GstDeinterlace2FieldLayout; } GstDeinterlaceFieldLayout;
typedef enum { typedef enum {
GST_DEINTERLACE2_MODE_AUTO, GST_DEINTERLACE_MODE_AUTO,
GST_DEINTERLACE2_MODE_INTERLACED, GST_DEINTERLACE_MODE_INTERLACED,
GST_DEINTERLACE2_MODE_DISABLED GST_DEINTERLACE_MODE_DISABLED
} GstDeinterlace2Mode; } GstDeinterlaceMode;
struct _GstDeinterlace2 struct _GstDeinterlace
{ {
GstElement parent; GstElement parent;
...@@ -201,9 +201,9 @@ struct _GstDeinterlace2 ...@@ -201,9 +201,9 @@ struct _GstDeinterlace2
/* <private> */ /* <private> */
GstDeinterlace2Mode mode; GstDeinterlaceMode mode;
GstDeinterlace2FieldLayout field_layout; GstDeinterlaceFieldLayout field_layout;
guint frame_size; guint frame_size;
gint frame_rate_n, frame_rate_d; gint frame_rate_n, frame_rate_d;
...@@ -212,9 +212,9 @@ struct _GstDeinterlace2 ...@@ -212,9 +212,9 @@ struct _GstDeinterlace2
/* Duration of one field */ /* Duration of one field */
GstClockTime field_duration; GstClockTime field_duration;
GstDeinterlace2Fields fields; GstDeinterlaceFields fields;
GstDeinterlace2Methods method_id; GstDeinterlaceMethods method_id;
GstDeinterlaceMethod *method; GstDeinterlaceMethod *method;
/* The most recent pictures /* The most recent pictures
...@@ -248,12 +248,12 @@ struct _GstDeinterlace2 ...@@ -248,12 +248,12 @@ struct _GstDeinterlace2
guint field_stride; guint field_stride;
}; };
struct _GstDeinterlace2Class struct _GstDeinterlaceClass
{ {
GstElementClass parent_class; GstElementClass parent_class;
}; };
GType gst_deinterlace2_get_type (void); GType gst_deinterlace_get_type (void);
G_END_DECLS G_END_DECLS
#endif /* __GST_DEINTERLACE_2_H__ */ #endif /* __GST_DEINTERLACE_H__ */
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
#include "_stdint.h" #include "_stdint.h"
#include "gstdeinterlace2.h" #include "gstdeinterlace.h"
#include <string.h> #include <string.h>
#define GST_TYPE_DEINTERLACE_METHOD_GREEDY_L (gst_deinterlace_method_greedy_l_get_type ()) #define GST_TYPE_DEINTERLACE_METHOD_GREEDY_L (gst_deinterlace_method_greedy_l_get_type ())
...@@ -335,7 +335,7 @@ deinterlace_greedy_packed422_scanline_mmxext (GstDeinterlaceMethodGreedyL * ...@@ -335,7 +335,7 @@ deinterlace_greedy_packed422_scanline_mmxext (GstDeinterlaceMethodGreedyL *
static void static void
deinterlace_frame_di_greedy (GstDeinterlaceMethod * d_method, deinterlace_frame_di_greedy (GstDeinterlaceMethod * d_method,
GstDeinterlace2 * object, GstBuffer * outbuf) GstDeinterlace * object, GstBuffer * outbuf)
{ {
GstDeinterlaceMethodGreedyL *self = GstDeinterlaceMethodGreedyL *self =
GST_DEINTERLACE_METHOD_GREEDY_L (d_method); GST_DEINTERLACE_METHOD_GREEDY_L (d_method);
......
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
#include "gst/gst.h" #include "gst/gst.h"
#include "plugins.h" #include "plugins.h"
#include "gstdeinterlace2.h" #include "gstdeinterlace.h"
#define GST_TYPE_DEINTERLACE_METHOD_GREEDY_H (gst_deinterlace_method_greedy_h_get_type ()) #define GST_TYPE_DEINTERLACE_METHOD_GREEDY_H (gst_deinterlace_method_greedy_h_get_type ())
#define GST_IS_DEINTERLACE_METHOD_GREEDY_H(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_DEINTERLACE_METHOD_GREEDY_H)) #define GST_IS_DEINTERLACE_METHOD_GREEDY_H(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_DEINTERLACE_METHOD_GREEDY_H))
...@@ -235,7 +235,7 @@ greedyDScaler_C (GstDeinterlaceMethodGreedyH * self, uint8_t * L1, uint8_t * L2, ...@@ -235,7 +235,7 @@ greedyDScaler_C (GstDeinterlaceMethodGreedyH * self, uint8_t * L1, uint8_t * L2,
static void static void
deinterlace_frame_di_greedyh (GstDeinterlaceMethod * d_method, deinterlace_frame_di_greedyh (GstDeinterlaceMethod * d_method,
GstDeinterlace2 * object, GstBuffer * outbuf) GstDeinterlace * object, GstBuffer * outbuf)
{ {
GstDeinterlaceMethodGreedyH *self = GstDeinterlaceMethodGreedyH *self =
GST_DEINTERLACE_METHOD_GREEDY_H (d_method); GST_DEINTERLACE_METHOD_GREEDY_H (d_method);
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
#endif #endif
#include "_stdint.h" #include "_stdint.h"
#include "gstdeinterlace2.h" #include "gstdeinterlace.h"
#include <string.h> #include <string.h>
#define GST_TYPE_DEINTERLACE_METHOD_LINEAR (gst_deinterlace_method_linear_get_type ()) #define GST_TYPE_DEINTERLACE_METHOD_LINEAR (gst_deinterlace_method_linear_get_type ())
...@@ -42,7 +42,7 @@ typedef GstDeinterlaceSimpleMethodClass GstDeinterlaceMethodLinearClass; ...@@ -42,7 +42,7 @@ typedef GstDeinterlaceSimpleMethodClass GstDeinterlaceMethodLinearClass;
static void static void
deinterlace_scanline_linear_c (GstDeinterlaceMethod * self, deinterlace_scanline_linear_c (GstDeinterlaceMethod * self,
GstDeinterlace2 * parent, guint8 * out, GstDeinterlace * parent, guint8 * out,
GstDeinterlaceScanlineData * scanlines, gint width) GstDeinterlaceScanlineData * scanlines, gint width)
{ {
gint i; gint i;
...@@ -56,7 +56,7 @@ deinterlace_scanline_linear_c (GstDeinterlaceMethod * self, ...@@ -56,7 +56,7 @@ deinterlace_scanline_linear_c (GstDeinterlaceMethod * self,
#include "mmx.h" #include "mmx.h"
static void static void
deinterlace_scanline_linear_mmx (GstDeinterlaceMethod * self, deinterlace_scanline_linear_mmx (GstDeinterlaceMethod * self,
GstDeinterlace2 * parent, guint8 * out, GstDeinterlace * parent, guint8 * out,
GstDeinterlaceScanlineData * scanlines, gint width) GstDeinterlaceScanlineData * scanlines, gint width)
{ {
const mmx_t shiftmask = { 0xfefffefffefffeffULL }; /* To avoid shifting chroma to luma. */ const mmx_t shiftmask = { 0xfefffefffefffeffULL }; /* To avoid shifting chroma to luma. */
...@@ -128,7 +128,7 @@ deinterlace_scanline_linear_mmx (GstDeinterlaceMethod * self, ...@@ -128,7 +128,7 @@ deinterlace_scanline_linear_mmx (GstDeinterlaceMethod * self,
#include "sse.h" #include "sse.h"
static void static void
deinterlace_scanline_linear_mmxext (GstDeinterlaceMethod * self, deinterlace_scanline_linear_mmxext (GstDeinterlaceMethod * self,
GstDeinterlace2 * parent, guint8 * out, GstDeinterlace * parent, guint8 * out,
GstDeinterlaceScanlineData * scanlines, gint width) GstDeinterlaceScanlineData * scanlines, gint width)
{ {
gint i; gint i;
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
#endif #endif
#include "_stdint.h" #include "_stdint.h"
#include "gstdeinterlace2.h" #include "gstdeinterlace.h"
#include <string.h> #include <string.h>
#define GST_TYPE_DEINTERLACE_METHOD_LINEAR_BLEND (gst_deinterlace_method_linear_blend_get_type ()) #define GST_TYPE_DEINTERLACE_METHOD_LINEAR_BLEND (gst_deinterlace_method_linear_blend_get_type ())
...@@ -47,7 +47,7 @@ typedef GstDeinterlaceSimpleMethodClass GstDeinterlaceMethodLinearBlendClass; ...@@ -47,7 +47,7 @@ typedef GstDeinterlaceSimpleMethodClass GstDeinterlaceMethodLinearBlendClass;
static inline void static inline void
deinterlace_scanline_linear_blend_c (GstDeinterlaceMethod * self, deinterlace_scanline_linear_blend_c (GstDeinterlaceMethod * self,
GstDeinterlace2 * parent, guint8 * out, GstDeinterlace * parent, guint8 * out,
GstDeinterlaceScanlineData * scanlines, gint width) GstDeinterlaceScanlineData * scanlines, gint width)
{ {
guint8 *t0 = scanlines->t0; guint8 *t0 = scanlines->t0;
...@@ -63,7 +63,7 @@ deinterlace_scanline_linear_blend_c (GstDeinterlaceMethod * self, ...@@ -63,7 +63,7 @@ deinterlace_scanline_linear_blend_c (GstDeinterlaceMethod * self,
static inline void static inline void
deinterlace_scanline_linear_blend2_c (GstDeinterlaceMethod * self, deinterlace_scanline_linear_blend2_c (GstDeinterlaceMethod * self,
GstDeinterlace2 * parent, guint8 * out, GstDeinterlace * parent, guint8 * out,
GstDeinterlaceScanlineData * scanlines, gint width) GstDeinterlaceScanlineData * scanlines, gint width)
{ {
guint8 *m0 = scanlines->m0; guint8 *m0 = scanlines->m0;
...@@ -80,7 +80,7 @@ deinterlace_scanline_linear_blend2_c (GstDeinterlaceMethod * self, ...@@ -80,7 +80,7 @@ deinterlace_scanline_linear_blend2_c (GstDeinterlaceMethod * self,
#include "mmx.h" #include "mmx.h"
static inline void static inline void
deinterlace_scanline_linear_blend_mmx (GstDeinterlaceMethod * self, deinterlace_scanline_linear_blend_mmx (GstDeinterlaceMethod * self,
GstDeinterlace2 * parent, guint8 * out, GstDeinterlace * parent, guint8 * out,
GstDeinterlaceScanlineData * scanlines, gint width) GstDeinterlaceScanlineData * scanlines, gint width)
{ {
guint8 *t0 = scanlines->t0; guint8 *t0 = scanlines->t0;
...@@ -137,7 +137,7 @@ deinterlace_scanline_linear_blend_mmx (GstDeinterlaceMethod * self, ...@@ -137,7 +137,7 @@ deinterlace_scanline_linear_blend_mmx (GstDeinterlaceMethod * self,
static inline void static inline void
deinterlace_scanline_linear_blend2_mmx (GstDeinterlaceMethod * self, deinterlace_scanline_linear_blend2_mmx (GstDeinterlaceMethod * self,