diff options
author | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2009-06-10 14:45:06 +0200 |
---|---|---|
committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2009-06-11 10:06:03 +0200 |
commit | 4710a91cbfb1b77cd9d93dc7373a07f07b1c9fde (patch) | |
tree | be3be3298a714c1a7eed74110858b3b53cad5c97 /gst/deinterlace/gstdeinterlace.h | |
parent | 645b9449a5610f488f90953115399eca5a5a4b5c (diff) |
deinterlace: Clean up includes and clean up order of instance struct fields
Diffstat (limited to 'gst/deinterlace/gstdeinterlace.h')
-rw-r--r-- | gst/deinterlace/gstdeinterlace.h | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/gst/deinterlace/gstdeinterlace.h b/gst/deinterlace/gstdeinterlace.h index ed0cb2fa..9e0a83fa 100644 --- a/gst/deinterlace/gstdeinterlace.h +++ b/gst/deinterlace/gstdeinterlace.h @@ -23,7 +23,7 @@ #define __GST_DEINTERLACE_H__ #include <gst/gst.h> -#include <gst/base/gstbasetransform.h> +#include <gst/video/video.h> #include <liboil/liboil.h> #include <liboil/liboilcpu.h> #include <liboil/liboilfunction.h> @@ -205,33 +205,14 @@ struct _GstDeinterlace GstDeinterlaceFieldLayout field_layout; - guint frame_size; - gint frame_rate_n, frame_rate_d; - gboolean interlaced; - - /* Duration of one field */ - GstClockTime field_duration; - GstDeinterlaceFields fields; GstDeinterlaceMethods method_id; GstDeinterlaceMethod *method; - /* The most recent pictures - PictureHistory[0] is always the most recent. - Pointers are NULL if the picture in question isn't valid, e.g. because - the program just started or a picture was skipped. - */ - GstPicture field_history[MAX_FIELD_HISTORY]; - guint history_count; - - /* Set to TRUE if we're in still frame mode, - i.e. just forward all buffers - */ - gboolean still_frame_mode; - - /* Last buffer that was pushed in */ - GstBuffer *last_buffer; + guint frame_size; + gint frame_rate_n, frame_rate_d; + gboolean interlaced; /* Number of bytes of actual data in each scanline. May be less than OverlayPitch since the overlay's scanlines might have alignment @@ -255,6 +236,25 @@ struct _GstDeinterlace */ guint field_stride; + /* Duration of one field */ + GstClockTime field_duration; + + /* The most recent pictures + PictureHistory[0] is always the most recent. + Pointers are NULL if the picture in question isn't valid, e.g. because + the program just started or a picture was skipped. + */ + GstPicture field_history[MAX_FIELD_HISTORY]; + guint history_count; + + /* Set to TRUE if we're in still frame mode, + i.e. just forward all buffers + */ + gboolean still_frame_mode; + + /* Last buffer that was pushed in */ + GstBuffer *last_buffer; + /* Current segment */ GstSegment segment; |