diff options
author | Johan Dahlin <johan@gnome.org> | 2004-03-15 16:32:54 +0000 |
---|---|---|
committer | Johan Dahlin <johan@gnome.org> | 2004-03-15 16:32:54 +0000 |
commit | 5acffea623eaa95469a8fb77260c85240c6c0a41 (patch) | |
tree | 5d1eb5b3c6cbe7ff7888cfe0b2f972f7e509e99d /gst/avi | |
parent | f878cc16402dcc70f31861bb120f435f3157c518 (diff) |
*.h: Revert indenting
Original commit message from CVS:
* *.h: Revert indenting
Diffstat (limited to 'gst/avi')
-rw-r--r-- | gst/avi/avi-ids.h | 25 | ||||
-rw-r--r-- | gst/avi/gstavidemux.h | 88 | ||||
-rw-r--r-- | gst/avi/gstavimux.h | 121 |
3 files changed, 115 insertions, 119 deletions
diff --git a/gst/avi/avi-ids.h b/gst/avi/avi-ids.h index f7e773ec..f9e2dd31 100644 --- a/gst/avi/avi-ids.h +++ b/gst/avi/avi-ids.h @@ -22,22 +22,21 @@ #include <gst/gst.h> -typedef struct _gst_riff_avih -{ - guint32 us_frame; /* microsec per frame */ - guint32 max_bps; /* byte/s overall */ - guint32 pad_gran; /* pad_granularity */ +typedef struct _gst_riff_avih { + guint32 us_frame; /* microsec per frame */ + guint32 max_bps; /* byte/s overall */ + guint32 pad_gran; /* pad_granularity */ guint32 flags; /* flags values */ -#define GST_RIFF_AVIH_HASINDEX 0x00000010 /* has idx1 chunk */ -#define GST_RIFF_AVIH_MUSTUSEINDEX 0x00000020 /* must use idx1 chunk to determine order */ -#define GST_RIFF_AVIH_ISINTERLEAVED 0x00000100 /* AVI file is interleaved */ -#define GST_RIFF_AVIH_WASCAPTUREFILE 0x00010000 /* specially allocated used for capturing real time video */ -#define GST_RIFF_AVIH_COPYRIGHTED 0x00020000 /* contains copyrighted data */ - guint32 tot_frames; /* # of frames (all) */ - guint32 init_frames; /* initial frames (???) */ +#define GST_RIFF_AVIH_HASINDEX 0x00000010 /* has idx1 chunk */ +#define GST_RIFF_AVIH_MUSTUSEINDEX 0x00000020 /* must use idx1 chunk to determine order */ +#define GST_RIFF_AVIH_ISINTERLEAVED 0x00000100 /* AVI file is interleaved */ +#define GST_RIFF_AVIH_WASCAPTUREFILE 0x00010000 /* specially allocated used for capturing real time video */ +#define GST_RIFF_AVIH_COPYRIGHTED 0x00020000 /* contains copyrighted data */ + guint32 tot_frames; /* # of frames (all) */ + guint32 init_frames; /* initial frames (???) */ guint32 streams; - guint32 bufsize; /* suggested buffer size */ + guint32 bufsize; /* suggested buffer size */ guint32 width; guint32 height; guint32 scale; diff --git a/gst/avi/gstavidemux.h b/gst/avi/gstavidemux.h index 9849bdaf..d94433ae 100644 --- a/gst/avi/gstavidemux.h +++ b/gst/avi/gstavidemux.h @@ -26,6 +26,7 @@ #include "gst/riff/riff-read.h" G_BEGIN_DECLS + #define GST_TYPE_AVI_DEMUX \ (gst_avi_demux_get_type ()) #define GST_AVI_DEMUX(obj) \ @@ -36,94 +37,93 @@ G_BEGIN_DECLS (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_AVI_DEMUX)) #define GST_IS_AVI_DEMUX_CLASS(obj) \ (G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_AVI_DEMUX)) -#define GST_AVI_DEMUX_MAX_STREAMS 16 + +#define GST_AVI_DEMUX_MAX_STREAMS 16 + #define CHUNKID_TO_STREAMNR(chunkid) \ ((((chunkid) & 0xff) - '0') * 10 + \ (((chunkid) >> 8) & 0xff) - '0') - typedef struct -{ - gint index_nr; - gint stream_nr; - guint64 ts; - guint32 flags; - guint32 offset; - gint size; - guint64 bytes_before; - guint32 frames_before; + +typedef struct { + gint index_nr; + gint stream_nr; + guint64 ts; + guint32 flags; + guint32 offset; + gint size; + guint64 bytes_before; + guint32 frames_before; } gst_avi_index_entry; -typedef struct -{ +typedef struct { /* index of this streamcontext */ - guint num; + guint num; /* pad, strh */ - GstPad *pad; - GstCaps *caps; - gst_riff_strh *strh; + GstPad *pad; + GstCaps *caps; + gst_riff_strh *strh; /* current position (byte, frame, time) */ - guint current_frame; - guint64 current_byte; - gint current_entry; + guint current_frame; + guint64 current_byte; + gint current_entry; /* delay in time (init_frames) */ - guint64 delay; + guint64 delay; /* stream length */ - guint64 total_bytes; - guint32 total_frames; + guint64 total_bytes; + guint32 total_frames; - guint32 skip; + guint32 skip; } avi_stream_context; -typedef enum -{ +typedef enum { GST_AVI_DEMUX_START, GST_AVI_DEMUX_HEADER, GST_AVI_DEMUX_MOVI, } GstAviDemuxState; -typedef struct _GstAviDemux -{ - GstRiffRead parent; +typedef struct _GstAviDemux { + GstRiffRead parent; /* pads */ - GstPad *sinkpad; + GstPad *sinkpad; /* AVI decoding state */ GstAviDemuxState state; - guint level_up; + guint level_up; /* index */ gst_avi_index_entry *index_entries; - guint index_size; - guint64 index_offset; + guint index_size; + guint64 index_offset; /* streams */ - guint num_streams; - guint num_v_streams; - guint num_a_streams; + guint num_streams; + guint num_v_streams; + guint num_a_streams; avi_stream_context stream[GST_AVI_DEMUX_MAX_STREAMS]; /* some stream info for length */ - guint32 us_per_frame; - guint32 num_frames; + guint32 us_per_frame; + guint32 num_frames; /* seeking */ - guint64 seek_offset; - guint64 last_seek; + guint64 seek_offset; + guint64 last_seek; /* info */ - GstCaps *streaminfo; + GstCaps *streaminfo; } GstAviDemux; -typedef struct _GstAviDemuxClass -{ +typedef struct _GstAviDemuxClass { GstRiffReadClass parent_class; } GstAviDemuxClass; -GType gst_avi_demux_get_type (void); +GType gst_avi_demux_get_type (void); G_END_DECLS + #endif /* __GST_AVI_DEMUX_H__ */ diff --git a/gst/avi/gstavimux.h b/gst/avi/gstavimux.h index e51f3010..452b7221 100644 --- a/gst/avi/gstavimux.h +++ b/gst/avi/gstavimux.h @@ -28,9 +28,8 @@ #ifdef __cplusplus -extern "C" -{ -#endif /* __cplusplus */ +extern "C" { +#endif /* __cplusplus */ #define GST_TYPE_AVIMUX \ @@ -45,67 +44,65 @@ extern "C" (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_AVIMUX)) - typedef struct _GstAviMux GstAviMux; - typedef struct _GstAviMuxClass GstAviMuxClass; - - struct _GstAviMux - { - GstElement element; - - /* pads */ - GstPad *srcpad; - GstPad *audiosinkpad; - gboolean audio_pad_connected, audio_pad_eos; - GstPad *videosinkpad; - gboolean video_pad_connected, video_pad_eos; - - /* the AVI header */ - gst_riff_avih avi_hdr; - guint32 total_frames; /* total number of frames */ - guint64 total_data; /* amount of total data */ - guint32 data_size, datax_size; /* amount of data (bytes) in the AVI/AVIX block */ - guint32 num_frames, numx_frames; /* num frames in the AVI/AVIX block */ - guint32 header_size; - gboolean write_header; - gboolean restart; - guint32 audio_size; - guint64 audio_time; - - /* video header */ - gst_riff_strh vids_hdr; - gst_riff_strf_vids vids; - - /* audio header */ - gst_riff_strh auds_hdr; - gst_riff_strf_auds auds; - - /* information about the AVI index ('idx') */ - gst_riff_index_entry *idx; - gint idx_index, idx_count; - guint32 idx_offset, idx_size; - - /* are we a big file already? */ - gboolean is_bigfile; - guint64 avix_start; - - /* whether to use "large AVI files" or just stick to small indexed files */ - gboolean enable_large_avi; - - /* in order to be usable as a loopbased element, we need an internal - * 'buffered' buffer for each pad, so one for audio, one for video */ - GstBuffer *audio_buffer_queue, *video_buffer_queue; - }; - - struct _GstAviMuxClass - { - GstElementClass parent_class; - }; - - GType gst_avimux_get_type (void); +typedef struct _GstAviMux GstAviMux; +typedef struct _GstAviMuxClass GstAviMuxClass; + +struct _GstAviMux { + GstElement element; + + /* pads */ + GstPad *srcpad; + GstPad *audiosinkpad; + gboolean audio_pad_connected, audio_pad_eos; + GstPad *videosinkpad; + gboolean video_pad_connected, video_pad_eos; + + /* the AVI header */ + gst_riff_avih avi_hdr; + guint32 total_frames; /* total number of frames */ + guint64 total_data; /* amount of total data */ + guint32 data_size, datax_size; /* amount of data (bytes) in the AVI/AVIX block */ + guint32 num_frames, numx_frames; /* num frames in the AVI/AVIX block */ + guint32 header_size; + gboolean write_header; + gboolean restart; + guint32 audio_size; + guint64 audio_time; + + /* video header */ + gst_riff_strh vids_hdr; + gst_riff_strf_vids vids; + + /* audio header */ + gst_riff_strh auds_hdr; + gst_riff_strf_auds auds; + + /* information about the AVI index ('idx') */ + gst_riff_index_entry *idx; + gint idx_index, idx_count; + guint32 idx_offset, idx_size; + + /* are we a big file already? */ + gboolean is_bigfile; + guint64 avix_start; + + /* whether to use "large AVI files" or just stick to small indexed files */ + gboolean enable_large_avi; + + /* in order to be usable as a loopbased element, we need an internal + * 'buffered' buffer for each pad, so one for audio, one for video */ + GstBuffer *audio_buffer_queue, *video_buffer_queue; +}; + +struct _GstAviMuxClass { + GstElementClass parent_class; +}; + +GType gst_avimux_get_type(void); #ifdef __cplusplus } -#endif /* __cplusplus */ +#endif /* __cplusplus */ -#endif /* __GST_AVIMUX_H__ */ +#endif /* __GST_AVIMUX_H__ */ |