summaryrefslogtreecommitdiffstats
path: root/gst-libs/gst/riff
diff options
context:
space:
mode:
authorJohan Dahlin <johan@gnome.org>2004-03-15 16:32:54 +0000
committerJohan Dahlin <johan@gnome.org>2004-03-15 16:32:54 +0000
commit39fd8a2dbd436cbabe5e336d1145b62c2a885ed5 (patch)
tree61df7da4a9d2b8bdb853af50a27219a8921bf5e4 /gst-libs/gst/riff
parent1633bd8693c54cbc5f6648703a7ecf01548ec55f (diff)
downloadgst-plugins-bad-39fd8a2dbd436cbabe5e336d1145b62c2a885ed5.tar.gz
gst-plugins-bad-39fd8a2dbd436cbabe5e336d1145b62c2a885ed5.tar.bz2
gst-plugins-bad-39fd8a2dbd436cbabe5e336d1145b62c2a885ed5.zip
*.h: Revert indenting
Original commit message from CVS: * *.h: Revert indenting
Diffstat (limited to 'gst-libs/gst/riff')
-rw-r--r--gst-libs/gst/riff/riff-ids.h80
-rw-r--r--gst-libs/gst/riff/riff-media.h23
-rw-r--r--gst-libs/gst/riff/riff-read.h59
3 files changed, 87 insertions, 75 deletions
diff --git a/gst-libs/gst/riff/riff-ids.h b/gst-libs/gst/riff/riff-ids.h
index 141cbab5..da465c2d 100644
--- a/gst-libs/gst/riff/riff-ids.h
+++ b/gst-libs/gst/riff/riff-ids.h
@@ -66,29 +66,29 @@
#define GST_RIFF_FCCH_MSVC GST_MAKE_FOURCC ('M','S','V','C')
/* INFO types - see http://www.saettler.com/RIFFMCI/riffmci.html */
-#define GST_RIFF_INFO_IARL GST_MAKE_FOURCC ('I','A','R','L') /* location */
-#define GST_RIFF_INFO_IART GST_MAKE_FOURCC ('I','A','R','T') /* artist */
-#define GST_RIFF_INFO_ICMS GST_MAKE_FOURCC ('I','C','M','S') /* commissioned */
-#define GST_RIFF_INFO_ICMT GST_MAKE_FOURCC ('I','C','M','T') /* comment */
-#define GST_RIFF_INFO_ICOP GST_MAKE_FOURCC ('I','C','O','P') /* copyright */
-#define GST_RIFF_INFO_ICRD GST_MAKE_FOURCC ('I','C','R','D') /* creation date */
-#define GST_RIFF_INFO_ICRP GST_MAKE_FOURCC ('I','C','R','P') /* cropped */
-#define GST_RIFF_INFO_IDIM GST_MAKE_FOURCC ('I','D','I','M') /* dimensions */
-#define GST_RIFF_INFO_IDPI GST_MAKE_FOURCC ('I','D','P','I') /* dots-per-inch */
-#define GST_RIFF_INFO_IENG GST_MAKE_FOURCC ('I','E','N','G') /* engineer(s) */
-#define GST_RIFF_INFO_IGNR GST_MAKE_FOURCC ('I','G','N','R') /* genre */
-#define GST_RIFF_INFO_IKEY GST_MAKE_FOURCC ('I','K','E','Y') /* keywords */
-#define GST_RIFF_INFO_ILGT GST_MAKE_FOURCC ('I','L','G','T') /* lightness */
-#define GST_RIFF_INFO_IMED GST_MAKE_FOURCC ('I','M','E','D') /* medium */
-#define GST_RIFF_INFO_INAM GST_MAKE_FOURCC ('I','N','A','M') /* name */
-#define GST_RIFF_INFO_IPLT GST_MAKE_FOURCC ('I','P','L','T') /* palette setting */
-#define GST_RIFF_INFO_IPRD GST_MAKE_FOURCC ('I','P','R','D') /* product */
-#define GST_RIFF_INFO_ISBJ GST_MAKE_FOURCC ('I','S','B','J') /* subject */
-#define GST_RIFF_INFO_ISFT GST_MAKE_FOURCC ('I','S','F','T') /* software */
-#define GST_RIFF_INFO_ISHP GST_MAKE_FOURCC ('I','S','H','P') /* sharpness */
-#define GST_RIFF_INFO_ISRC GST_MAKE_FOURCC ('I','S','R','C') /* source */
-#define GST_RIFF_INFO_ISRF GST_MAKE_FOURCC ('I','S','R','F') /* source form */
-#define GST_RIFF_INFO_ITCH GST_MAKE_FOURCC ('I','T','C','H') /* technician(s) */
+#define GST_RIFF_INFO_IARL GST_MAKE_FOURCC ('I','A','R','L') /* location */
+#define GST_RIFF_INFO_IART GST_MAKE_FOURCC ('I','A','R','T') /* artist */
+#define GST_RIFF_INFO_ICMS GST_MAKE_FOURCC ('I','C','M','S') /* commissioned */
+#define GST_RIFF_INFO_ICMT GST_MAKE_FOURCC ('I','C','M','T') /* comment */
+#define GST_RIFF_INFO_ICOP GST_MAKE_FOURCC ('I','C','O','P') /* copyright */
+#define GST_RIFF_INFO_ICRD GST_MAKE_FOURCC ('I','C','R','D') /* creation date */
+#define GST_RIFF_INFO_ICRP GST_MAKE_FOURCC ('I','C','R','P') /* cropped */
+#define GST_RIFF_INFO_IDIM GST_MAKE_FOURCC ('I','D','I','M') /* dimensions */
+#define GST_RIFF_INFO_IDPI GST_MAKE_FOURCC ('I','D','P','I') /* dots-per-inch */
+#define GST_RIFF_INFO_IENG GST_MAKE_FOURCC ('I','E','N','G') /* engineer(s) */
+#define GST_RIFF_INFO_IGNR GST_MAKE_FOURCC ('I','G','N','R') /* genre */
+#define GST_RIFF_INFO_IKEY GST_MAKE_FOURCC ('I','K','E','Y') /* keywords */
+#define GST_RIFF_INFO_ILGT GST_MAKE_FOURCC ('I','L','G','T') /* lightness */
+#define GST_RIFF_INFO_IMED GST_MAKE_FOURCC ('I','M','E','D') /* medium */
+#define GST_RIFF_INFO_INAM GST_MAKE_FOURCC ('I','N','A','M') /* name */
+#define GST_RIFF_INFO_IPLT GST_MAKE_FOURCC ('I','P','L','T') /* palette setting */
+#define GST_RIFF_INFO_IPRD GST_MAKE_FOURCC ('I','P','R','D') /* product */
+#define GST_RIFF_INFO_ISBJ GST_MAKE_FOURCC ('I','S','B','J') /* subject */
+#define GST_RIFF_INFO_ISFT GST_MAKE_FOURCC ('I','S','F','T') /* software */
+#define GST_RIFF_INFO_ISHP GST_MAKE_FOURCC ('I','S','H','P') /* sharpness */
+#define GST_RIFF_INFO_ISRC GST_MAKE_FOURCC ('I','S','R','C') /* source */
+#define GST_RIFF_INFO_ISRF GST_MAKE_FOURCC ('I','S','R','F') /* source form */
+#define GST_RIFF_INFO_ITCH GST_MAKE_FOURCC ('I','T','C','H') /* technician(s) */
/*********Chunk Names***************/
#define GST_RIFF_FF00 GST_MAKE_FOURCC (0xFF,0xFF,0x00,0x00)
@@ -167,7 +167,7 @@
#define GST_RIFF_v422 GST_MAKE_FOURCC ('v', '4', '2', '2')
#define GST_RIFF_V422 GST_MAKE_FOURCC ('V', '4', '2', '2')
#define GST_RIFF_mvi1 GST_MAKE_FOURCC ('m', 'v', 'i', '1')
-#define GST_RIFF_MPIX GST_MAKE_FOURCC (0x04,0x00, 'i', '1') /* MotionPixels munged their id */
+#define GST_RIFF_MPIX GST_MAKE_FOURCC (0x04,0x00, 'i', '1') /* MotionPixels munged their id */
#define GST_RIFF_AURA GST_MAKE_FOURCC ('A', 'U', 'R', 'A')
#define GST_RIFF_DMB1 GST_MAKE_FOURCC ('D', 'M', 'B', '1')
#define GST_RIFF_dmb1 GST_MAKE_FOURCC ('d', 'm', 'b', '1')
@@ -203,7 +203,7 @@
#define GST_RIFF_rpza GST_MAKE_FOURCC ('r', 'p', 'z', 'a')
/* And this here's the mistakes that need to be supported */
-#define GST_RIFF_azpr GST_MAKE_FOURCC ('a', 'z', 'p', 'r') /* recognize Apple's rpza mangled? */
+#define GST_RIFF_azpr GST_MAKE_FOURCC ('a', 'z', 'p', 'r') /* recognize Apple's rpza mangled? */
/*********** FND in MJPG **********/
#define GST_RIFF_ISFT GST_MAKE_FOURCC ('I', 'S', 'F', 'T')
@@ -216,28 +216,26 @@
#define GST_RIFF_rec GST_MAKE_FOURCC ('r', 'e', 'c', ' ')
/* common data structures */
-typedef struct _gst_riff_strh
-{
- guint32 type; /* stream type */
- guint32 fcc_handler; /* fcc_handler */
+typedef struct _gst_riff_strh {
+ guint32 type; /* stream type */
+ guint32 fcc_handler; /* fcc_handler */
guint32 flags;
/* flags values */
#define GST_RIFF_STRH_DISABLED 0x000000001
#define GST_RIFF_STRH_VIDEOPALCHANGES 0x000010000
guint32 priority;
- guint32 init_frames; /* initial frames (???) */
+ guint32 init_frames; /* initial frames (???) */
guint32 scale;
guint32 rate;
guint32 start;
guint32 length;
- guint32 bufsize; /* suggested buffer size */
+ guint32 bufsize; /* suggested buffer size */
guint32 quality;
guint32 samplesize;
/* XXX 16 bytes ? */
} gst_riff_strh;
-typedef struct _gst_riff_strf_vids
-{ /* == BitMapInfoHeader */
+typedef struct _gst_riff_strf_vids { /* == BitMapInfoHeader */
guint32 size;
guint32 width;
guint32 height;
@@ -247,14 +245,13 @@ typedef struct _gst_riff_strf_vids
guint32 image_size;
guint32 xpels_meter;
guint32 ypels_meter;
- guint32 num_colors; /* used colors */
- guint32 imp_colors; /* important colors */
+ guint32 num_colors; /* used colors */
+ guint32 imp_colors; /* important colors */
/* may be more for some codecs */
} gst_riff_strf_vids;
-typedef struct _gst_riff_strf_auds
-{ /* == WaveHeader (?) */
+typedef struct _gst_riff_strf_auds { /* == WaveHeader (?) */
guint16 format;
/**** from public Microsoft RIFF docs ******/
#define GST_RIFF_WAVE_FORMAT_UNKNOWN (0x0000)
@@ -293,8 +290,7 @@ typedef struct _gst_riff_strf_auds
guint16 size;
} gst_riff_strf_auds;
-typedef struct _gst_riff_strf_iavs
-{
+typedef struct _gst_riff_strf_iavs {
guint32 DVAAuxSrc;
guint32 DVAAuxCtl;
guint32 DVAAuxSrc1;
@@ -305,8 +301,7 @@ typedef struct _gst_riff_strf_iavs
guint32 DVReserved2;
} gst_riff_strf_iavs;
-typedef struct _gst_riff_index_entry
-{
+typedef struct _gst_riff_index_entry {
guint32 id;
guint32 flags;
#define GST_RIFF_IF_LIST (0x00000001L)
@@ -317,8 +312,7 @@ typedef struct _gst_riff_index_entry
guint32 size;
} gst_riff_index_entry;
-typedef struct _gst_riff_dmlh
-{
+typedef struct _gst_riff_dmlh {
guint32 totalframes;
} gst_riff_dmlh;
diff --git a/gst-libs/gst/riff/riff-media.h b/gst-libs/gst/riff/riff-media.h
index ca4a9434..220671af 100644
--- a/gst-libs/gst/riff/riff-media.h
+++ b/gst-libs/gst/riff/riff-media.h
@@ -27,15 +27,23 @@
#include "riff-ids.h"
G_BEGIN_DECLS
+
/*
* Create one caps. strh/strf can be NULL (for non-fixed caps).
*/
- GstCaps * gst_riff_create_video_caps (guint32 codec_fcc,
- gst_riff_strh * strh, gst_riff_strf_vids * strf, char **codec_name);
-GstCaps *gst_riff_create_audio_caps (guint16 codec_id,
- gst_riff_strh * strh, gst_riff_strf_auds * strf, char **codec_name);
-GstCaps *gst_riff_create_iavs_caps (guint32 codec_fcc,
- gst_riff_strh * strh, gst_riff_strf_iavs * strf, char **codec_name);
+
+GstCaps *gst_riff_create_video_caps (guint32 codec_fcc,
+ gst_riff_strh *strh,
+ gst_riff_strf_vids *strf,
+ char **codec_name);
+GstCaps *gst_riff_create_audio_caps (guint16 codec_id,
+ gst_riff_strh *strh,
+ gst_riff_strf_auds *strf,
+ char **codec_name);
+GstCaps *gst_riff_create_iavs_caps (guint32 codec_fcc,
+ gst_riff_strh *strh,
+ gst_riff_strf_iavs *strf,
+ char **codec_name);
/*
* Create template caps (includes all known types).
@@ -43,7 +51,8 @@ GstCaps *gst_riff_create_iavs_caps (guint32 codec_fcc,
GstCaps *gst_riff_create_video_template_caps (void);
GstCaps *gst_riff_create_audio_template_caps (void);
-GstCaps *gst_riff_create_iavs_template_caps (void);
+GstCaps *gst_riff_create_iavs_template_caps (void);
G_END_DECLS
+
#endif /* __GST_RIFF_READ_H__ */
diff --git a/gst-libs/gst/riff/riff-read.h b/gst-libs/gst/riff/riff-read.h
index 41ae89e3..9c663cca 100644
--- a/gst-libs/gst/riff/riff-read.h
+++ b/gst-libs/gst/riff/riff-read.h
@@ -27,6 +27,7 @@
#include <gst/bytestream/bytestream.h>
G_BEGIN_DECLS
+
#define GST_TYPE_RIFF_READ \
(gst_riff_read_get_type ())
#define GST_RIFF_READ(obj) \
@@ -39,13 +40,13 @@ G_BEGIN_DECLS
(G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_RIFF_READ))
#define GST_RIFF_READ_GET_CLASS(obj) \
(G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_RIFF_READ, GstRiffReadClass))
- typedef struct _GstRiffLevel
-{
- guint64 start, length;
+
+typedef struct _GstRiffLevel {
+ guint64 start,
+ length;
} GstRiffLevel;
-typedef struct _GstRiffRead
-{
+typedef struct _GstRiffRead {
GstElement parent;
GstPad *sinkpad;
@@ -54,35 +55,43 @@ typedef struct _GstRiffRead
GList *level;
} GstRiffRead;
-typedef struct _GstRiffReadClass
-{
+typedef struct _GstRiffReadClass {
GstElementClass parent;
} GstRiffReadClass;
-GType gst_riff_read_get_type (void);
+GType gst_riff_read_get_type (void);
-guint32 gst_riff_peek_tag (GstRiffRead * riff, guint * level_up);
-guint32 gst_riff_peek_list (GstRiffRead * riff);
+guint32 gst_riff_peek_tag (GstRiffRead *riff,
+ guint *level_up);
+guint32 gst_riff_peek_list (GstRiffRead *riff);
-GstEvent *gst_riff_read_seek (GstRiffRead * riff, guint64 offset);
-gboolean gst_riff_read_skip (GstRiffRead * riff);
-gboolean gst_riff_read_data (GstRiffRead * riff,
- guint32 * tag, GstBuffer ** buf);
-gboolean gst_riff_read_ascii (GstRiffRead * riff, guint32 * tag, gchar ** str);
-gboolean gst_riff_read_list (GstRiffRead * riff, guint32 * tag);
-gboolean gst_riff_read_header (GstRiffRead * read, guint32 * doctype);
+GstEvent *gst_riff_read_seek (GstRiffRead *riff,
+ guint64 offset);
+gboolean gst_riff_read_skip (GstRiffRead *riff);
+gboolean gst_riff_read_data (GstRiffRead *riff,
+ guint32 *tag,
+ GstBuffer **buf);
+gboolean gst_riff_read_ascii (GstRiffRead *riff,
+ guint32 *tag,
+ gchar **str);
+gboolean gst_riff_read_list (GstRiffRead *riff,
+ guint32 *tag);
+gboolean gst_riff_read_header (GstRiffRead *read,
+ guint32 *doctype);
/*
* Utility functions (including byteswapping).
*/
-gboolean gst_riff_read_strh (GstRiffRead * riff, gst_riff_strh ** header);
-gboolean gst_riff_read_strf_vids (GstRiffRead * riff,
- gst_riff_strf_vids ** header);
-gboolean gst_riff_read_strf_auds (GstRiffRead * riff,
- gst_riff_strf_auds ** header);
-gboolean gst_riff_read_strf_iavs (GstRiffRead * riff,
- gst_riff_strf_iavs ** header);
-gboolean gst_riff_read_info (GstRiffRead * riff);
+gboolean gst_riff_read_strh (GstRiffRead *riff,
+ gst_riff_strh **header);
+gboolean gst_riff_read_strf_vids (GstRiffRead *riff,
+ gst_riff_strf_vids **header);
+gboolean gst_riff_read_strf_auds (GstRiffRead *riff,
+ gst_riff_strf_auds **header);
+gboolean gst_riff_read_strf_iavs (GstRiffRead *riff,
+ gst_riff_strf_iavs **header);
+gboolean gst_riff_read_info (GstRiffRead *riff);
G_END_DECLS
+
#endif /* __GST_RIFF_READ_H__ */