expand tabs
authorThomas Vander Stichele <thomas@apestaart.org>
Tue, 6 Dec 2005 19:55:58 +0000 (19:55 +0000)
committerThomas Vander Stichele <thomas@apestaart.org>
Tue, 6 Dec 2005 19:55:58 +0000 (19:55 +0000)
Original commit message from CVS:
expand tabs

12 files changed:
gst/equalizer/gstiirequalizer.c
gst/qtdemux/qtdemux.c
gst/qtdemux/qtdemux.h
sys/v4l2/gstv4l2colorbalance.h
sys/v4l2/gstv4l2element.h
sys/v4l2/gstv4l2src.h
sys/v4l2/gstv4l2tuner.h
sys/v4l2/gstv4l2xoverlay.h
sys/v4l2/v4l2_calls.c
sys/v4l2/v4l2_calls.h
sys/v4l2/v4l2src_calls.c
sys/v4l2/v4l2src_calls.h

index 0a4a24d..5b19f48 100644 (file)
@@ -340,57 +340,57 @@ gst_iir_equalizer_get_property (GObject * object, guint prop_id,
 
 /* start of code that is type specific */
 
-#define CREATE_OPTIMIZED_FUNCTIONS(TYPE,BIG_TYPE,MIN_VAL,MAX_VAL)      \
-typedef struct {                                                       \
-  TYPE x1, x2;         /* history of input values for a filter */      \
-  TYPE y1, y2;         /* history of output values for a filter */     \
-} SecondOrderHistory ## TYPE;                                          \
-                                                                       \
-static inline TYPE                                                     \
-one_step_ ## TYPE (SecondOrderFilter *filter,                          \
-    SecondOrderHistory ## TYPE *history, TYPE input)                   \
-{                                                                      \
-  /* calculate output */                                               \
-  TYPE output = filter->alpha * (input - history->x2) +                        \
-    filter->gamma * history->y1 - filter->beta * history->y2;          \
-  /* update history */                                                 \
-  history->y2 = history->y1;                                           \
-  history->y1 = output;                                                        \
-  history->x2 = history->x1;                                           \
-  history->x1 = input;                                                 \
-                                                                       \
-  return output;                                                       \
-}                                                                      \
-                                                                       \
-static const guint                                                     \
-history_size_ ## TYPE = sizeof (SecondOrderHistory ## TYPE);           \
-                                                                       \
-static void                                                            \
-gst_iir_equ_process_ ## TYPE (GstIirEqualizer *equ, guint8 *data,      \
-guint size, guint channels)                                            \
-{                                                                      \
-  guint frames = size / channels / sizeof (TYPE);                      \
-  guint i, c, f;                                                       \
-  BIG_TYPE cur;                                                                \
-  TYPE val;                                                            \
-                                                                       \
-  for (i = 0; i < frames; i++) {                                       \
-    for (c = 0; c < channels; c++) {                                   \
-      SecondOrderHistory ## TYPE *history = equ->history;              \
-      val = *((TYPE *) data);                                          \
-      cur = 0;                                                         \
-      for (f = 0; f < equ->freq_count; f++) {                          \
-       SecondOrderFilter *filter = &equ->filter[f];                    \
-                                                                       \
-       cur += one_step_ ## TYPE (filter, history, val);                \
-       history++;                                                      \
-      }                                                                        \
-      cur += val * 0.25;                                               \
-      cur = CLAMP (cur, MIN_VAL, MAX_VAL);                             \
-      *((TYPE *) data) = (TYPE) cur;                                   \
-      data += sizeof (TYPE);                                           \
-    }                                                                  \
-  }                                                                    \
+#define CREATE_OPTIMIZED_FUNCTIONS(TYPE,BIG_TYPE,MIN_VAL,MAX_VAL)       \
+typedef struct {                                                        \
+  TYPE x1, x2;          /* history of input values for a filter */      \
+  TYPE y1, y2;          /* history of output values for a filter */     \
+} SecondOrderHistory ## TYPE;                                           \
+                                                                        \
+static inline TYPE                                                      \
+one_step_ ## TYPE (SecondOrderFilter *filter,                           \
+    SecondOrderHistory ## TYPE *history, TYPE input)                    \
+{                                                                       \
+  /* calculate output */                                                \
+  TYPE output = filter->alpha * (input - history->x2) +                 \
+    filter->gamma * history->y1 - filter->beta * history->y2;           \
+  /* update history */                                                  \
+  history->y2 = history->y1;                                            \
+  history->y1 = output;                                                 \
+  history->x2 = history->x1;                                            \
+  history->x1 = input;                                                  \
+                                                                        \
+  return output;                                                        \
+}                                                                       \
+                                                                        \
+static const guint                                                      \
+history_size_ ## TYPE = sizeof (SecondOrderHistory ## TYPE);            \
+                                                                        \
+static void                                                             \
+gst_iir_equ_process_ ## TYPE (GstIirEqualizer *equ, guint8 *data,       \
+guint size, guint channels)                                             \
+{                                                                       \
+  guint frames = size / channels / sizeof (TYPE);                       \
+  guint i, c, f;                                                        \
+  BIG_TYPE cur;                                                         \
+  TYPE val;                                                             \
+                                                                        \
+  for (i = 0; i < frames; i++) {                                        \
+    for (c = 0; c < channels; c++) {                                    \
+      SecondOrderHistory ## TYPE *history = equ->history;               \
+      val = *((TYPE *) data);                                           \
+      cur = 0;                                                          \
+      for (f = 0; f < equ->freq_count; f++) {                           \
+        SecondOrderFilter *filter = &equ->filter[f];                    \
+                                                                        \
+        cur += one_step_ ## TYPE (filter, history, val);                \
+        history++;                                                      \
+      }                                                                 \
+      cur += val * 0.25;                                                \
+      cur = CLAMP (cur, MIN_VAL, MAX_VAL);                              \
+      *((TYPE *) data) = (TYPE) cur;                                    \
+      data += sizeof (TYPE);                                            \
+    }                                                                   \
+  }                                                                     \
 }
 
 CREATE_OPTIMIZED_FUNCTIONS (gint16, gint, -32768, 32767);
index a569968..16417f1 100644 (file)
@@ -33,13 +33,13 @@ GST_DEBUG_CATEGORY_EXTERN (qtdemux_debug);
 /* temporary hack */
 #define gst_util_dump_mem(a,b)  /* */
 
-#define QTDEMUX_GUINT32_GET(a) (GST_READ_UINT32_BE(a))
-#define QTDEMUX_GUINT24_GET(a) (GST_READ_UINT32_BE(a) >> 8)
-#define QTDEMUX_GUINT16_GET(a) (GST_READ_UINT16_BE(a))
+#define QTDEMUX_GUINT32_GET(a)  (GST_READ_UINT32_BE(a))
+#define QTDEMUX_GUINT24_GET(a)  (GST_READ_UINT32_BE(a) >> 8)
+#define QTDEMUX_GUINT16_GET(a)  (GST_READ_UINT16_BE(a))
 #define QTDEMUX_GUINT8_GET(a) (*(guint8 *)(a))
-#define QTDEMUX_FP32_GET(a)    ((GST_READ_UINT32_BE(a))/65536.0)
-#define QTDEMUX_FP16_GET(a)    ((GST_READ_UINT16_BE(a))/256.0)
-#define QTDEMUX_FOURCC_GET(a)  (GST_READ_UINT32_LE(a))
+#define QTDEMUX_FP32_GET(a)     ((GST_READ_UINT32_BE(a))/65536.0)
+#define QTDEMUX_FP16_GET(a)     ((GST_READ_UINT16_BE(a))/256.0)
+#define QTDEMUX_FOURCC_GET(a)   (GST_READ_UINT32_LE(a))
 
 #define QTDEMUX_GUINT64_GET(a) ((((guint64)QTDEMUX_GUINT32_GET(a))<<32)|QTDEMUX_GUINT32_GET(((void *)a)+4))
 
@@ -781,76 +781,76 @@ gst_qtdemux_add_stream (GstQTDemux * qtdemux,
 
 #define QT_CONTAINER 1
 
-#define FOURCC_moov    GST_MAKE_FOURCC('m','o','o','v')
-#define FOURCC_mvhd    GST_MAKE_FOURCC('m','v','h','d')
-#define FOURCC_clip    GST_MAKE_FOURCC('c','l','i','p')
-#define FOURCC_trak    GST_MAKE_FOURCC('t','r','a','k')
-#define FOURCC_udta    GST_MAKE_FOURCC('u','d','t','a')
-#define FOURCC_ctab    GST_MAKE_FOURCC('c','t','a','b')
-#define FOURCC_tkhd    GST_MAKE_FOURCC('t','k','h','d')
-#define FOURCC_crgn    GST_MAKE_FOURCC('c','r','g','n')
-#define FOURCC_matt    GST_MAKE_FOURCC('m','a','t','t')
-#define FOURCC_kmat    GST_MAKE_FOURCC('k','m','a','t')
-#define FOURCC_edts    GST_MAKE_FOURCC('e','d','t','s')
-#define FOURCC_elst    GST_MAKE_FOURCC('e','l','s','t')
-#define FOURCC_load    GST_MAKE_FOURCC('l','o','a','d')
-#define FOURCC_tref    GST_MAKE_FOURCC('t','r','e','f')
-#define FOURCC_imap    GST_MAKE_FOURCC('i','m','a','p')
-#define FOURCC___in    GST_MAKE_FOURCC(' ',' ','i','n')
-#define FOURCC___ty    GST_MAKE_FOURCC(' ',' ','t','y')
-#define FOURCC_mdia    GST_MAKE_FOURCC('m','d','i','a')
-#define FOURCC_mdhd    GST_MAKE_FOURCC('m','d','h','d')
-#define FOURCC_hdlr    GST_MAKE_FOURCC('h','d','l','r')
-#define FOURCC_minf    GST_MAKE_FOURCC('m','i','n','f')
-#define FOURCC_vmhd    GST_MAKE_FOURCC('v','m','h','d')
-#define FOURCC_smhd    GST_MAKE_FOURCC('s','m','h','d')
-#define FOURCC_gmhd    GST_MAKE_FOURCC('g','m','h','d')
-#define FOURCC_gmin    GST_MAKE_FOURCC('g','m','i','n')
-#define FOURCC_dinf    GST_MAKE_FOURCC('d','i','n','f')
-#define FOURCC_dref    GST_MAKE_FOURCC('d','r','e','f')
-#define FOURCC_stbl    GST_MAKE_FOURCC('s','t','b','l')
-#define FOURCC_stsd    GST_MAKE_FOURCC('s','t','s','d')
-#define FOURCC_stts    GST_MAKE_FOURCC('s','t','t','s')
-#define FOURCC_stss    GST_MAKE_FOURCC('s','t','s','s')
-#define FOURCC_stsc    GST_MAKE_FOURCC('s','t','s','c')
-#define FOURCC_stsz    GST_MAKE_FOURCC('s','t','s','z')
-#define FOURCC_stco    GST_MAKE_FOURCC('s','t','c','o')
-#define FOURCC_vide    GST_MAKE_FOURCC('v','i','d','e')
-#define FOURCC_soun    GST_MAKE_FOURCC('s','o','u','n')
-#define FOURCC_co64    GST_MAKE_FOURCC('c','o','6','4')
-#define FOURCC_cmov    GST_MAKE_FOURCC('c','m','o','v')
-#define FOURCC_dcom    GST_MAKE_FOURCC('d','c','o','m')
-#define FOURCC_cmvd    GST_MAKE_FOURCC('c','m','v','d')
-#define FOURCC_hint    GST_MAKE_FOURCC('h','i','n','t')
-#define FOURCC_mp4a    GST_MAKE_FOURCC('m','p','4','a')
-#define FOURCC_mp4v    GST_MAKE_FOURCC('m','p','4','v')
-#define FOURCC_wave    GST_MAKE_FOURCC('w','a','v','e')
-#define FOURCC_appl    GST_MAKE_FOURCC('a','p','p','l')
-#define FOURCC_esds    GST_MAKE_FOURCC('e','s','d','s')
-#define FOURCC_hnti    GST_MAKE_FOURCC('h','n','t','i')
-#define FOURCC_rtp_    GST_MAKE_FOURCC('r','t','p',' ')
-#define FOURCC_sdp_    GST_MAKE_FOURCC('s','d','p',' ')
-#define FOURCC_meta    GST_MAKE_FOURCC('m','e','t','a')
-#define FOURCC_ilst    GST_MAKE_FOURCC('i','l','s','t')
-#define FOURCC__nam    GST_MAKE_FOURCC(0xa9,'n','a','m')
-#define FOURCC__ART    GST_MAKE_FOURCC(0xa9,'A','R','T')
-#define FOURCC__wrt    GST_MAKE_FOURCC(0xa9,'w','r','t')
-#define FOURCC__grp    GST_MAKE_FOURCC(0xa9,'g','r','p')
-#define FOURCC__alb    GST_MAKE_FOURCC(0xa9,'a','l','b')
-#define FOURCC_gnre    GST_MAKE_FOURCC('g','n','r','e')
-#define FOURCC_disc    GST_MAKE_FOURCC('d','i','s','c')
-#define FOURCC_trkn    GST_MAKE_FOURCC('t','r','k','n')
-#define FOURCC_cpil    GST_MAKE_FOURCC('c','p','i','l')
-#define FOURCC_tmpo    GST_MAKE_FOURCC('t','m','p','o')
-#define FOURCC__too    GST_MAKE_FOURCC(0xa9,'t','o','o')
-#define FOURCC_____    GST_MAKE_FOURCC('-','-','-','-')
-#define FOURCC_free    GST_MAKE_FOURCC('f','r','e','e')
-#define FOURCC_data    GST_MAKE_FOURCC('d','a','t','a')
-#define FOURCC_SVQ3    GST_MAKE_FOURCC('S','V','Q','3')
-#define FOURCC_rmra    GST_MAKE_FOURCC('r','m','r','a')
-#define FOURCC_rmda    GST_MAKE_FOURCC('r','m','d','a')
-#define FOURCC_rdrf    GST_MAKE_FOURCC('r','d','r','f')
-#define FOURCC__gen    GST_MAKE_FOURCC(0xa9, 'g', 'e', 'n')
+#define FOURCC_moov     GST_MAKE_FOURCC('m','o','o','v')
+#define FOURCC_mvhd     GST_MAKE_FOURCC('m','v','h','d')
+#define FOURCC_clip     GST_MAKE_FOURCC('c','l','i','p')
+#define FOURCC_trak     GST_MAKE_FOURCC('t','r','a','k')
+#define FOURCC_udta     GST_MAKE_FOURCC('u','d','t','a')
+#define FOURCC_ctab     GST_MAKE_FOURCC('c','t','a','b')
+#define FOURCC_tkhd     GST_MAKE_FOURCC('t','k','h','d')
+#define FOURCC_crgn     GST_MAKE_FOURCC('c','r','g','n')
+#define FOURCC_matt     GST_MAKE_FOURCC('m','a','t','t')
+#define FOURCC_kmat     GST_MAKE_FOURCC('k','m','a','t')
+#define FOURCC_edts     GST_MAKE_FOURCC('e','d','t','s')
+#define FOURCC_elst     GST_MAKE_FOURCC('e','l','s','t')
+#define FOURCC_load     GST_MAKE_FOURCC('l','o','a','d')
+#define FOURCC_tref     GST_MAKE_FOURCC('t','r','e','f')
+#define FOURCC_imap     GST_MAKE_FOURCC('i','m','a','p')
+#define FOURCC___in     GST_MAKE_FOURCC(' ',' ','i','n')
+#define FOURCC___ty     GST_MAKE_FOURCC(' ',' ','t','y')
+#define FOURCC_mdia     GST_MAKE_FOURCC('m','d','i','a')
+#define FOURCC_mdhd     GST_MAKE_FOURCC('m','d','h','d')
+#define FOURCC_hdlr     GST_MAKE_FOURCC('h','d','l','r')
+#define FOURCC_minf     GST_MAKE_FOURCC('m','i','n','f')
+#define FOURCC_vmhd     GST_MAKE_FOURCC('v','m','h','d')
+#define FOURCC_smhd     GST_MAKE_FOURCC('s','m','h','d')
+#define FOURCC_gmhd     GST_MAKE_FOURCC('g','m','h','d')
+#define FOURCC_gmin     GST_MAKE_FOURCC('g','m','i','n')
+#define FOURCC_dinf     GST_MAKE_FOURCC('d','i','n','f')
+#define FOURCC_dref     GST_MAKE_FOURCC('d','r','e','f')
+#define FOURCC_stbl     GST_MAKE_FOURCC('s','t','b','l')
+#define FOURCC_stsd     GST_MAKE_FOURCC('s','t','s','d')
+#define FOURCC_stts     GST_MAKE_FOURCC('s','t','t','s')
+#define FOURCC_stss     GST_MAKE_FOURCC('s','t','s','s')
+#define FOURCC_stsc     GST_MAKE_FOURCC('s','t','s','c')
+#define FOURCC_stsz     GST_MAKE_FOURCC('s','t','s','z')
+#define FOURCC_stco     GST_MAKE_FOURCC('s','t','c','o')
+#define FOURCC_vide     GST_MAKE_FOURCC('v','i','d','e')
+#define FOURCC_soun     GST_MAKE_FOURCC('s','o','u','n')
+#define FOURCC_co64     GST_MAKE_FOURCC('c','o','6','4')
+#define FOURCC_cmov     GST_MAKE_FOURCC('c','m','o','v')
+#define FOURCC_dcom     GST_MAKE_FOURCC('d','c','o','m')
+#define FOURCC_cmvd     GST_MAKE_FOURCC('c','m','v','d')
+#define FOURCC_hint     GST_MAKE_FOURCC('h','i','n','t')
+#define FOURCC_mp4a     GST_MAKE_FOURCC('m','p','4','a')
+#define FOURCC_mp4v     GST_MAKE_FOURCC('m','p','4','v')
+#define FOURCC_wave     GST_MAKE_FOURCC('w','a','v','e')
+#define FOURCC_appl     GST_MAKE_FOURCC('a','p','p','l')
+#define FOURCC_esds     GST_MAKE_FOURCC('e','s','d','s')
+#define FOURCC_hnti     GST_MAKE_FOURCC('h','n','t','i')
+#define FOURCC_rtp_     GST_MAKE_FOURCC('r','t','p',' ')
+#define FOURCC_sdp_     GST_MAKE_FOURCC('s','d','p',' ')
+#define FOURCC_meta     GST_MAKE_FOURCC('m','e','t','a')
+#define FOURCC_ilst     GST_MAKE_FOURCC('i','l','s','t')
+#define FOURCC__nam     GST_MAKE_FOURCC(0xa9,'n','a','m')
+#define FOURCC__ART     GST_MAKE_FOURCC(0xa9,'A','R','T')
+#define FOURCC__wrt     GST_MAKE_FOURCC(0xa9,'w','r','t')
+#define FOURCC__grp     GST_MAKE_FOURCC(0xa9,'g','r','p')
+#define FOURCC__alb     GST_MAKE_FOURCC(0xa9,'a','l','b')
+#define FOURCC_gnre     GST_MAKE_FOURCC('g','n','r','e')
+#define FOURCC_disc     GST_MAKE_FOURCC('d','i','s','c')
+#define FOURCC_trkn     GST_MAKE_FOURCC('t','r','k','n')
+#define FOURCC_cpil     GST_MAKE_FOURCC('c','p','i','l')
+#define FOURCC_tmpo     GST_MAKE_FOURCC('t','m','p','o')
+#define FOURCC__too     GST_MAKE_FOURCC(0xa9,'t','o','o')
+#define FOURCC_____     GST_MAKE_FOURCC('-','-','-','-')
+#define FOURCC_free     GST_MAKE_FOURCC('f','r','e','e')
+#define FOURCC_data     GST_MAKE_FOURCC('d','a','t','a')
+#define FOURCC_SVQ3     GST_MAKE_FOURCC('S','V','Q','3')
+#define FOURCC_rmra     GST_MAKE_FOURCC('r','m','r','a')
+#define FOURCC_rmda     GST_MAKE_FOURCC('r','m','d','a')
+#define FOURCC_rdrf     GST_MAKE_FOURCC('r','d','r','f')
+#define FOURCC__gen     GST_MAKE_FOURCC(0xa9, 'g', 'e', 'n')
 
 static void qtdemux_dump_mvhd (GstQTDemux * qtdemux, void *buffer, int depth);
 static void qtdemux_dump_tkhd (GstQTDemux * qtdemux, void *buffer, int depth);
index 37fbd3b..a5653fe 100644 (file)
@@ -39,7 +39,7 @@ extern "C" {
 #define GST_IS_QTDEMUX_CLASS(obj) \
   (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_QTDEMUX))
 
-#define GST_QTDEMUX_MAX_STREAMS                8
+#define GST_QTDEMUX_MAX_STREAMS         8
 
 typedef struct _GstQTDemux GstQTDemux;
 typedef struct _GstQTDemuxClass GstQTDemuxClass;
index 4003203..b573cb2 100644 (file)
@@ -32,10 +32,10 @@ G_BEGIN_DECLS
   (gst_v4l2_color_balance_channel_get_type ())
 #define GST_V4L2_COLOR_BALANCE_CHANNEL(obj) \
   (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_V4L2_COLOR_BALANCE_CHANNEL, \
-                              GstV4l2ColorBalanceChannel))
+                               GstV4l2ColorBalanceChannel))
 #define GST_V4L2_COLOR_BALANCE_CHANNEL_CLASS(klass) \
   (G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_V4L2_COLOR_BALANCE_CHANNEL, \
-                           GstV4l2ColorBalanceChannelClass))
+                            GstV4l2ColorBalanceChannelClass))
 #define GST_IS_V4L2_COLOR_BALANCE_CHANNEL(obj) \
   (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_V4L2_COLOR_BALANCE_CHANNEL))
 #define GST_IS_V4L2_COLOR_BALANCE_CHANNEL_CLASS(klass) \
@@ -51,8 +51,8 @@ typedef struct _GstV4l2ColorBalanceChannelClass {
   GstColorBalanceChannelClass parent;
 } GstV4l2ColorBalanceChannelClass;
 
-GType  gst_v4l2_color_balance_channel_get_type (void);
+GType   gst_v4l2_color_balance_channel_get_type (void);
 
-void   gst_v4l2_color_balance_interface_init   (GstColorBalanceClass *klass);
+void    gst_v4l2_color_balance_interface_init   (GstColorBalanceClass *klass);
 
 #endif /* __GST_V4L2_COLOR_BALANCE_H__ */
index c9e5f34..62663a2 100644 (file)
 #ifdef GST_V4L2_MISSING_BUFDECL
 struct v4l2_buffer
 {
-       __u32                   index;
-       enum v4l2_buf_type      type;
-       __u32                   bytesused;
-       __u32                   flags;
-       enum v4l2_field         field;
-       struct timeval          timestamp;
-       struct v4l2_timecode    timecode;
-       __u32                   sequence;
-
-       /* memory location */
-       enum v4l2_memory        memory;
-       union {
-               __u32           offset;
-               unsigned long   userptr;
-       } m;
-       __u32                   length;
-
-       __u32                   reserved[2];
+        __u32                   index;
+        enum v4l2_buf_type      type;
+        __u32                   bytesused;
+        __u32                   flags;
+        enum v4l2_field         field;
+        struct timeval          timestamp;
+        struct v4l2_timecode    timecode;
+        __u32                   sequence;
+
+        /* memory location */
+        enum v4l2_memory        memory;
+        union {
+                __u32           offset;
+                unsigned long   userptr;
+        } m;
+        __u32                   length;
+
+        __u32                   reserved[2];
 };
 #endif /* GST_V4L2_MISSING_BUFDECL */
 
 
 #define GST_TYPE_V4L2ELEMENT \
-               (gst_v4l2element_get_type())
+                (gst_v4l2element_get_type())
 #define GST_V4L2ELEMENT(obj) \
-               (G_TYPE_CHECK_INSTANCE_CAST((obj), GST_TYPE_V4L2ELEMENT, GstV4l2Element))
+                (G_TYPE_CHECK_INSTANCE_CAST((obj), GST_TYPE_V4L2ELEMENT, GstV4l2Element))
 #define GST_V4L2ELEMENT_CLASS(klass) \
-               (G_TYPE_CHECK_CLASS_CAST((klass), GST_TYPE_V4L2ELEMENT, GstV4l2ElementClass))
+                (G_TYPE_CHECK_CLASS_CAST((klass), GST_TYPE_V4L2ELEMENT, GstV4l2ElementClass))
 #define GST_IS_V4L2ELEMENT(obj) \
-               (G_TYPE_CHECK_INSTANCE_TYPE((obj), GST_TYPE_V4L2ELEMENT))
+                (G_TYPE_CHECK_INSTANCE_TYPE((obj), GST_TYPE_V4L2ELEMENT))
 #define GST_IS_V4L2ELEMENT_CLASS(obj) \
-               (G_TYPE_CHECK_CLASS_TYPE((klass), GST_TYPE_V4L2ELEMENT))
+                (G_TYPE_CHECK_CLASS_TYPE((klass), GST_TYPE_V4L2ELEMENT))
 #define GST_V4L2ELEMENT_GET_CLASS(obj) \
-               (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_V4L2ELEMENT, GstV4l2ElementClass))
+                (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_V4L2ELEMENT, GstV4l2ElementClass))
 
 
-typedef        struct _GstV4l2Element          GstV4l2Element;
-typedef        struct _GstV4l2ElementClass     GstV4l2ElementClass;
-typedef struct _GstV4l2Xv              GstV4l2Xv;
+typedef struct _GstV4l2Element          GstV4l2Element;
+typedef struct _GstV4l2ElementClass     GstV4l2ElementClass;
+typedef struct _GstV4l2Xv               GstV4l2Xv;
 
 struct _GstV4l2Element {
-       GstElement element;
+        GstElement element;
 
-       /* the video device */
-       char *device;
+        /* the video device */
+        char *device;
 
-       /* the video-device's file descriptor */
-       gint video_fd;
+        /* the video-device's file descriptor */
+        gint video_fd;
 
-       /* the video buffer (mmap()'ed) */
-       guint8 **buffer;
+        /* the video buffer (mmap()'ed) */
+        guint8 **buffer;
 
-       /* the video-device's capabilities */
-       struct v4l2_capability vcap;
+        /* the video-device's capabilities */
+        struct v4l2_capability vcap;
 
-       /* the toys available to us */
-       GList *channels;
-       GList *norms;
-       GList *colors;
+        /* the toys available to us */
+        GList *channels;
+        GList *norms;
+        GList *colors;
 
-       /* X-overlay */
-       GstV4l2Xv *xv;
-       XID xwindow_id;
+        /* X-overlay */
+        GstV4l2Xv *xv;
+        XID xwindow_id;
 
-       /* properties */
-       gchar *norm;
-       gchar *channel;
-       gulong frequency;
+        /* properties */
+        gchar *norm;
+        gchar *channel;
+        gulong frequency;
 };
 
 struct _GstV4l2ElementClass {
-       GstElementClass parent_class;
+        GstElementClass parent_class;
 
-       /* probed devices */
-       GList *devices;
+        /* probed devices */
+        GList *devices;
 
-       /* signals */
-       void     (*open)            (GstElement  *element,
-                                    const gchar *device);
-       void     (*close)           (GstElement  *element,
-                                    const gchar *device);
+        /* signals */
+        void     (*open)            (GstElement  *element,
+                                     const gchar *device);
+        void     (*close)           (GstElement  *element,
+                                     const gchar *device);
 };
 
 
index cbcfc6e..c5aac38 100644 (file)
@@ -28,78 +28,78 @@ GST_DEBUG_CATEGORY_EXTERN (v4l2src_debug);
 #define GST_V4L2_MIN_BUFFERS 2
 
 #define GST_TYPE_V4L2SRC \
-               (gst_v4l2src_get_type())
+                (gst_v4l2src_get_type())
 #define GST_V4L2SRC(obj) \
-               (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_V4L2SRC,GstV4l2Src))
+                (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_V4L2SRC,GstV4l2Src))
 #define GST_V4L2SRC_CLASS(klass) \
-               (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_V4L2SRC,GstV4l2SrcClass))
+                (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_V4L2SRC,GstV4l2SrcClass))
 #define GST_IS_V4L2SRC(obj) \
-               (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_V4L2SRC))
+                (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_V4L2SRC))
 #define GST_IS_V4L2SRC_CLASS(obj) \
-               (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_V4L2SRC))
+                (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_V4L2SRC))
 
-typedef struct _GstV4l2BufferPool      GstV4l2BufferPool;
-typedef struct _GstV4l2Buffer          GstV4l2Buffer;
-typedef        struct _GstV4l2Src              GstV4l2Src;
-typedef        struct _GstV4l2SrcClass         GstV4l2SrcClass;
+typedef struct _GstV4l2BufferPool       GstV4l2BufferPool;
+typedef struct _GstV4l2Buffer           GstV4l2Buffer;
+typedef struct _GstV4l2Src              GstV4l2Src;
+typedef struct _GstV4l2SrcClass         GstV4l2SrcClass;
 
 /* global info */
 struct _GstV4l2BufferPool {
-  GstAtomicInt         refcount; /* number of users: 1 for every buffer, 1 for element */
-  gint                 video_fd;
-  guint                        buffer_count;
-  GstV4l2Buffer *      buffers;
+  GstAtomicInt          refcount; /* number of users: 1 for every buffer, 1 for element */
+  gint                  video_fd;
+  guint                 buffer_count;
+  GstV4l2Buffer *       buffers;
 };
 
 struct _GstV4l2Buffer {
-  struct v4l2_buffer   buffer;
-  guint8 *             start;
-  guint                        length;
-  GstAtomicInt         refcount; /* add 1 if in use by element, add 1 if in use by GstBuffer */
-  GstV4l2BufferPool *  pool;
+  struct v4l2_buffer    buffer;
+  guint8 *              start;
+  guint                 length;
+  GstAtomicInt          refcount; /* add 1 if in use by element, add 1 if in use by GstBuffer */
+  GstV4l2BufferPool *   pool;
 };
 
 struct _GstV4l2Src {
-       GstV4l2Element v4l2element;
+        GstV4l2Element v4l2element;
 
-       /* pads */
-       GstPad *srcpad;
+        /* pads */
+        GstPad *srcpad;
 
-       /* internal lists */
-       GSList *formats; /* list of available capture formats */
+        /* internal lists */
+        GSList *formats; /* list of available capture formats */
 
-       /* buffers */
-       GstV4l2BufferPool *pool;
+        /* buffers */
+        GstV4l2BufferPool *pool;
 
-       struct v4l2_requestbuffers breq;
-       struct v4l2_format format;
+        struct v4l2_requestbuffers breq;
+        struct v4l2_format format;
 
-       /* True if we want to stop */
-       gboolean quit, is_capturing;
+        /* True if we want to stop */
+        gboolean quit, is_capturing;
 
-       /* A/V sync... frame counter and internal cache */
-       gulong handled;
-       gint need_writes;
-       GstBuffer *cached_buffer;
-       gulong last_seq;
+        /* A/V sync... frame counter and internal cache */
+        gulong handled;
+        gint need_writes;
+        GstBuffer *cached_buffer;
+        gulong last_seq;
 
-       /* clock */
-       GstClock *clock;
-       
-       /* time to substract from clock time to get back to timestamp */
-       GstClockTime substract_time;
+        /* clock */
+        GstClock *clock;
+        
+        /* time to substract from clock time to get back to timestamp */
+        GstClockTime substract_time;
 
-       /* how are we going to push buffers? */
-       gboolean use_fixed_fps;
+        /* how are we going to push buffers? */
+        gboolean use_fixed_fps;
 };
 
 struct _GstV4l2SrcClass {
-       GstV4l2ElementClass parent_class;
+        GstV4l2ElementClass parent_class;
 
-       void (*frame_capture) (GObject *object);
-       void (*frame_drop)    (GObject *object);
-       void (*frame_insert)  (GObject *object);
-       void (*frame_lost)    (GObject *object,
+        void (*frame_capture) (GObject *object);
+        void (*frame_drop)    (GObject *object);
+        void (*frame_insert)  (GObject *object);
+        void (*frame_lost)    (GObject *object,
                                gint     num_lost);
 };
 
index a768ea2..c51bf19 100644 (file)
@@ -33,10 +33,10 @@ G_BEGIN_DECLS
   (gst_v4l2_tuner_channel_get_type ())
 #define GST_V4L2_TUNER_CHANNEL(obj) \
   (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_V4L2_TUNER_CHANNEL, \
-                              GstV4l2TunerChannel))
+                               GstV4l2TunerChannel))
 #define GST_V4L2_TUNER_CHANNEL_CLASS(klass) \
   (G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_V4L2_TUNER_CHANNEL, \
-                           GstV4l2TunerChannelClass))
+                            GstV4l2TunerChannelClass))
 #define GST_IS_V4L2_TUNER_CHANNEL(obj) \
   (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_V4L2_TUNER_CHANNEL))
 #define GST_IS_V4L2_TUNER_CHANNEL_CLASS(klass) \
@@ -58,10 +58,10 @@ typedef struct _GstV4l2TunerChannelClass {
   (gst_v4l2_tuner_norm_get_type ())
 #define GST_V4L2_TUNER_NORM(obj) \
   (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_V4L2_TUNER_NORM, \
-                              GstV4l2TunerNorm))
+                               GstV4l2TunerNorm))
 #define GST_V4L2_TUNER_NORM_CLASS(klass) \
   (G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_V4L2_TUNER_NORM, \
-                           GstV4l2TunerNormClass))
+                            GstV4l2TunerNormClass))
 #define GST_IS_V4L2_TUNER_NORM(obj) \
   (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_V4L2_TUNER_NORM))
 #define GST_IS_V4L2_TUNER_NORM_CLASS(klass) \
@@ -77,9 +77,9 @@ typedef struct _GstV4l2TunerNormClass {
   GstTunerNormClass parent;
 } GstV4l2TunerNormClass;
 
-GType  gst_v4l2_tuner_channel_get_type (void);
-GType  gst_v4l2_tuner_norm_get_type    (void);
+GType   gst_v4l2_tuner_channel_get_type (void);
+GType   gst_v4l2_tuner_norm_get_type    (void);
 
-void   gst_v4l2_tuner_interface_init   (GstTunerClass *klass);
+void    gst_v4l2_tuner_interface_init   (GstTunerClass *klass);
 
 #endif /* __GST_V4L2_TUNER_H__ */
index c59c453..a1bf5d7 100644 (file)
@@ -29,9 +29,9 @@
 
 G_BEGIN_DECLS
 
-void   gst_v4l2_xoverlay_interface_init (GstXOverlayClass *klass);
+void    gst_v4l2_xoverlay_interface_init (GstXOverlayClass *klass);
 
-void   gst_v4l2_xoverlay_open          (GstV4l2Element  *v4l2element);
-void   gst_v4l2_xoverlay_close         (GstV4l2Element  *v4l2element);
+void    gst_v4l2_xoverlay_open          (GstV4l2Element  *v4l2element);
+void    gst_v4l2_xoverlay_close         (GstV4l2Element  *v4l2element);
 
 #endif /* __GST_V4L2_X_OVERLAY_H__ */
index fa9f398..b4b16d9 100644 (file)
@@ -37,9 +37,9 @@
 #include "gstv4l2src.h"
 
 #define DEBUG(format, args...) \
-       GST_DEBUG_OBJECT (\
-               GST_ELEMENT(v4l2element), \
-               "V4L2: " format, ##args)
+        GST_DEBUG_OBJECT (\
+                GST_ELEMENT(v4l2element), \
+                "V4L2: " format, ##args)
 
 
 /******************************************************
index 537ca72..5325ead 100644 (file)
   (element->vcap.capabilities & V4L2_CAP_VIDEO_OVERLAY)
 
 /* checks whether the current v4lelement has already been open()'ed or not */
-#define GST_V4L2_CHECK_OPEN(element)                           \
-  if (!GST_V4L2_IS_OPEN(element))                              \
-  {                                                            \
-    GST_ELEMENT_ERROR (element, RESOURCE, TOO_LAZY,            \
+#define GST_V4L2_CHECK_OPEN(element)                            \
+  if (!GST_V4L2_IS_OPEN(element))                               \
+  {                                                             \
+    GST_ELEMENT_ERROR (element, RESOURCE, TOO_LAZY,             \
       (_("Device is not open.")), (NULL));                      \
-    return FALSE;                                              \
+    return FALSE;                                               \
   }
 
 /* checks whether the current v4lelement is close()'ed or whether it is still open */
-#define GST_V4L2_CHECK_NOT_OPEN(element)                       \
-  if (GST_V4L2_IS_OPEN(element))                               \
-  {                                                            \
-    GST_ELEMENT_ERROR (element, RESOURCE, TOO_LAZY,            \
+#define GST_V4L2_CHECK_NOT_OPEN(element)                        \
+  if (GST_V4L2_IS_OPEN(element))                                \
+  {                                                             \
+    GST_ELEMENT_ERROR (element, RESOURCE, TOO_LAZY,             \
       (_("Device is open.")), (NULL));                          \
-    return FALSE;                                              \
+    return FALSE;                                               \
   }
 
 /* checks whether the current v4lelement does video overlay */
-#define GST_V4L2_CHECK_OVERLAY(element)                                \
-  if (!GST_V4L2_IS_OVERLAY(element))                           \
-  {                                                            \
+#define GST_V4L2_CHECK_OVERLAY(element)                         \
+  if (!GST_V4L2_IS_OVERLAY(element))                            \
+  {                                                             \
     GST_ELEMENT_ERROR (element, RESOURCE, TOO_LAZY,             \
       (NULL), ("Device cannot handle overlay"));                \
-    return FALSE;                                              \
+    return FALSE;                                               \
   }
 
 /* checks whether we're in capture mode or not */
-#define GST_V4L2_CHECK_ACTIVE(element)                         \
-  if (!GST_V4L2_IS_ACTIVE(element))                            \
-  {                                                            \
+#define GST_V4L2_CHECK_ACTIVE(element)                          \
+  if (!GST_V4L2_IS_ACTIVE(element))                             \
+  {                                                             \
     GST_ELEMENT_ERROR (element, RESOURCE, SETTINGS,             \
       (NULL), ("Device is not in streaming mode"));             \
-    return FALSE;                                              \
+    return FALSE;                                               \
   }
 
 /* checks whether we're out of capture mode or not */
-#define GST_V4L2_CHECK_NOT_ACTIVE(element)                     \
-  if (GST_V4L2_IS_ACTIVE(element))                             \
-  {                                                            \
+#define GST_V4L2_CHECK_NOT_ACTIVE(element)                      \
+  if (GST_V4L2_IS_ACTIVE(element))                              \
+  {                                                             \
     GST_ELEMENT_ERROR (element, RESOURCE, SETTINGS,             \
       (NULL), ("Device is in streaming mode"));                 \
-    return FALSE;                                              \
+    return FALSE;                                               \
   }
 
 
 /* open/close the device */
-gboolean       gst_v4l2_open                   (GstV4l2Element *v4l2element);
-gboolean       gst_v4l2_close                  (GstV4l2Element *v4l2element);
+gboolean        gst_v4l2_open                   (GstV4l2Element *v4l2element);
+gboolean        gst_v4l2_close                  (GstV4l2Element *v4l2element);
 
 /* norm/input/output */
-gboolean       gst_v4l2_get_norm               (GstV4l2Element *v4l2element,
-                                                v4l2_std_id    *norm);
-gboolean       gst_v4l2_set_norm               (GstV4l2Element *v4l2element,
-                                                v4l2_std_id     norm);
-gboolean       gst_v4l2_get_input              (GstV4l2Element *v4l2element,
-                                                gint           *input);
-gboolean       gst_v4l2_set_input              (GstV4l2Element *v4l2element,
-                                                gint            input);
-gboolean       gst_v4l2_get_output             (GstV4l2Element *v4l2element,
-                                                gint           *output);
-gboolean       gst_v4l2_set_output             (GstV4l2Element *v4l2element,
-                                                gint            output);
+gboolean        gst_v4l2_get_norm               (GstV4l2Element *v4l2element,
+                                                 v4l2_std_id    *norm);
+gboolean        gst_v4l2_set_norm               (GstV4l2Element *v4l2element,
+                                                 v4l2_std_id     norm);
+gboolean        gst_v4l2_get_input              (GstV4l2Element *v4l2element,
+                                                 gint           *input);
+gboolean        gst_v4l2_set_input              (GstV4l2Element *v4l2element,
+                                                 gint            input);
+gboolean        gst_v4l2_get_output             (GstV4l2Element *v4l2element,
+                                                 gint           *output);
+gboolean        gst_v4l2_set_output             (GstV4l2Element *v4l2element,
+                                                 gint            output);
 
 /* frequency control */
-gboolean       gst_v4l2_get_frequency          (GstV4l2Element *v4l2element,
-                                                gint            tunernum,
-                                                gulong         *frequency);
-gboolean       gst_v4l2_set_frequency          (GstV4l2Element *v4l2element,
-                                                gint            tunernum,
-                                                gulong          frequency);
-gboolean       gst_v4l2_signal_strength        (GstV4l2Element *v4l2element,
-                                                gint            tunernum,
-                                                gulong         *signal);
+gboolean        gst_v4l2_get_frequency          (GstV4l2Element *v4l2element,
+                                                 gint            tunernum,
+                                                 gulong         *frequency);
+gboolean        gst_v4l2_set_frequency          (GstV4l2Element *v4l2element,
+                                                 gint            tunernum,
+                                                 gulong          frequency);
+gboolean        gst_v4l2_signal_strength        (GstV4l2Element *v4l2element,
+                                                 gint            tunernum,
+                                                 gulong         *signal);
 
 /* attribute control */
-gboolean       gst_v4l2_get_attribute          (GstV4l2Element *v4l2element,
-                                                int             attribute,
-                                                int            *value);
-gboolean       gst_v4l2_set_attribute          (GstV4l2Element *v4l2element,
-                                                int             attribute,
-                                                const int       value);
+gboolean        gst_v4l2_get_attribute          (GstV4l2Element *v4l2element,
+                                                 int             attribute,
+                                                 int            *value);
+gboolean        gst_v4l2_set_attribute          (GstV4l2Element *v4l2element,
+                                                 int             attribute,
+                                                 const int       value);
 
 #endif /* __V4L2_CALLS_H__ */
index 5e8d916..6971733 100644 (file)
@@ -40,9 +40,9 @@
 #define GST_V4L2_SET_INACTIVE(element) (element)->buffer = NULL
 
 #define DEBUG(format, args...) \
-       GST_CAT_DEBUG_OBJECT (\
-               v4l2src_debug, v4l2src, \
-               "V4L2SRC: " format, ##args)
+        GST_CAT_DEBUG_OBJECT (\
+                v4l2src_debug, v4l2src, \
+                "V4L2SRC: " format, ##args)
 
 /* On some systems MAP_FAILED seems to be missing */
 #ifndef MAP_FAILED
index dc5fca0..d4f271b 100644 (file)
 #include "v4l2_calls.h"
 
 
-gboolean       gst_v4l2src_get_capture         (GstV4l2Src *v4l2src);
-gboolean       gst_v4l2src_set_capture         (GstV4l2Src *v4l2src,
-                                                struct v4l2_fmtdesc *fmt,
-                                                gint        width,
-                                                gint        height);
-gboolean       gst_v4l2src_capture_init        (GstV4l2Src *v4l2src);
-gboolean       gst_v4l2src_capture_start       (GstV4l2Src *v4l2src);
-gint           gst_v4l2src_grab_frame          (GstV4l2Src *v4l2src);
-guint8 *       gst_v4l2src_get_buffer          (GstV4l2Src *v4l2src,
-                                                gint        num);
-gboolean       gst_v4l2src_queue_frame         (GstV4l2Src *v4l2src,
-                                                guint i);
-gboolean       gst_v4l2src_capture_stop        (GstV4l2Src *v4l2src);
-gboolean       gst_v4l2src_capture_deinit      (GstV4l2Src *v4l2src);
+gboolean        gst_v4l2src_get_capture         (GstV4l2Src *v4l2src);
+gboolean        gst_v4l2src_set_capture         (GstV4l2Src *v4l2src,
+                                                 struct v4l2_fmtdesc *fmt,
+                                                 gint        width,
+                                                 gint        height);
+gboolean        gst_v4l2src_capture_init        (GstV4l2Src *v4l2src);
+gboolean        gst_v4l2src_capture_start       (GstV4l2Src *v4l2src);
+gint            gst_v4l2src_grab_frame          (GstV4l2Src *v4l2src);
+guint8 *        gst_v4l2src_get_buffer          (GstV4l2Src *v4l2src,
+                                                 gint        num);
+gboolean        gst_v4l2src_queue_frame         (GstV4l2Src *v4l2src,
+                                                 guint i);
+gboolean        gst_v4l2src_capture_stop        (GstV4l2Src *v4l2src);
+gboolean        gst_v4l2src_capture_deinit      (GstV4l2Src *v4l2src);
 
-gboolean       gst_v4l2src_fill_format_list    (GstV4l2Src *v4l2src);
-gboolean       gst_v4l2src_clear_format_list   (GstV4l2Src *v4l2src);
+gboolean        gst_v4l2src_fill_format_list    (GstV4l2Src *v4l2src);
+gboolean        gst_v4l2src_clear_format_list   (GstV4l2Src *v4l2src);
 
 /* hacky */
-gboolean       gst_v4l2src_get_size_limits     (GstV4l2Src *v4l2src,
-                                                struct v4l2_fmtdesc *fmt,
-                                                gint *min_w, gint *max_w,
-                                                gint *min_h, gint *max_h);
+gboolean        gst_v4l2src_get_size_limits     (GstV4l2Src *v4l2src,
+                                                 struct v4l2_fmtdesc *fmt,
+                                                 gint *min_w, gint *max_w,
+                                                 gint *min_h, gint *max_h);
 
-void           gst_v4l2src_free_buffer         (GstBuffer *buffer);
+void            gst_v4l2src_free_buffer         (GstBuffer *buffer);
   
 #endif /* __V4L2SRC_CALLS_H__ */