summaryrefslogtreecommitdiffstats
path: root/gst/law
diff options
context:
space:
mode:
authorThomas Vander Stichele <thomas@apestaart.org>2004-03-15 19:32:27 +0000
committerThomas Vander Stichele <thomas@apestaart.org>2004-03-15 19:32:27 +0000
commit6cc1c73d2baa95c46edc04f57cbe9ed690dc2f21 (patch)
tree82b5546809a42a56a7bc18bacf8ed6e209ad006e /gst/law
parentd07ec45fa47fbd0e36224e11bcd8ba2faee1a78c (diff)
don't mix tabs and spaces
Original commit message from CVS: don't mix tabs and spaces
Diffstat (limited to 'gst/law')
-rw-r--r--gst/law/alaw-decode.c5
-rw-r--r--gst/law/alaw-encode.c5
-rw-r--r--gst/law/alaw.c4
-rw-r--r--gst/law/mulaw-conversion.c12
-rw-r--r--gst/law/mulaw-decode.c5
-rw-r--r--gst/law/mulaw-encode.c5
-rw-r--r--gst/law/mulaw.c4
7 files changed, 22 insertions, 18 deletions
diff --git a/gst/law/alaw-decode.c b/gst/law/alaw-decode.c
index 4bae398e..2bf176c2 100644
--- a/gst/law/alaw-decode.c
+++ b/gst/law/alaw-decode.c
@@ -129,9 +129,10 @@ gst_alawdec_get_type (void)
0,
(GInstanceInitFunc) gst_alawdec_init,
};
+
alawdec_type =
- g_type_register_static (GST_TYPE_ELEMENT, "GstALawDec", &alawdec_info,
- 0);
+ g_type_register_static (GST_TYPE_ELEMENT, "GstALawDec", &alawdec_info,
+ 0);
}
return alawdec_type;
}
diff --git a/gst/law/alaw-encode.c b/gst/law/alaw-encode.c
index 052f2e00..6a6708ab 100644
--- a/gst/law/alaw-encode.c
+++ b/gst/law/alaw-encode.c
@@ -171,9 +171,10 @@ gst_alawenc_get_type (void)
0,
(GInstanceInitFunc) gst_alawenc_init,
};
+
alawenc_type =
- g_type_register_static (GST_TYPE_ELEMENT, "GstALawEnc", &alawenc_info,
- 0);
+ g_type_register_static (GST_TYPE_ELEMENT, "GstALawEnc", &alawenc_info,
+ 0);
}
return alawenc_type;
}
diff --git a/gst/law/alaw.c b/gst/law/alaw.c
index 05ac2d23..d85dd9aa 100644
--- a/gst/law/alaw.c
+++ b/gst/law/alaw.c
@@ -46,9 +46,9 @@ plugin_init (GstPlugin * plugin)
gst_pad_template_new ("sink", GST_PAD_SINK, GST_PAD_ALWAYS, alaw_caps);
if (!gst_element_register (plugin, "alawenc",
- GST_RANK_NONE, GST_TYPE_ALAWENC) ||
+ GST_RANK_NONE, GST_TYPE_ALAWENC) ||
!gst_element_register (plugin, "alawdec",
- GST_RANK_PRIMARY, GST_TYPE_ALAWENC))
+ GST_RANK_PRIMARY, GST_TYPE_ALAWENC))
return FALSE;
return TRUE;
diff --git a/gst/law/mulaw-conversion.c b/gst/law/mulaw-conversion.c
index fa4db3cb..a05d7bdc 100644
--- a/gst/law/mulaw-conversion.c
+++ b/gst/law/mulaw-conversion.c
@@ -25,8 +25,8 @@
#include <glib.h>
-#define ZEROTRAP /* turn on the trap as per the MIL-STD */
-#define BIAS 0x84 /* define the add-in bias for 16 bit samples */
+#define ZEROTRAP /* turn on the trap as per the MIL-STD */
+#define BIAS 0x84 /* define the add-in bias for 16 bit samples */
#define CLIP 32635
void
@@ -56,11 +56,11 @@ mulaw_encode (gint16 * in, guint8 * out, gint numsamples)
for (i = 0; i < numsamples; i++) {
sample = in[i];
/** get the sample into sign-magnitude **/
- sign = (sample >> 8) & 0x80; /* set aside the sign */
+ sign = (sample >> 8) & 0x80; /* set aside the sign */
if (sign != 0)
- sample = -sample; /* get magnitude */
+ sample = -sample; /* get magnitude */
if (sample > CLIP)
- sample = CLIP; /* clip the magnitude */
+ sample = CLIP; /* clip the magnitude */
/** convert from 16 bit linear to ulaw **/
sample = sample + BIAS;
exponent = exp_lut[(sample >> 7) & 0xFF];
@@ -68,7 +68,7 @@ mulaw_encode (gint16 * in, guint8 * out, gint numsamples)
ulawbyte = ~(sign | (exponent << 4) | mantissa);
#ifdef ZEROTRAP
if (ulawbyte == 0)
- ulawbyte = 0x02; /* optional CCITT trap */
+ ulawbyte = 0x02; /* optional CCITT trap */
#endif
out[i] = ulawbyte;
}
diff --git a/gst/law/mulaw-decode.c b/gst/law/mulaw-decode.c
index 6a8f9e81..807dd280 100644
--- a/gst/law/mulaw-decode.c
+++ b/gst/law/mulaw-decode.c
@@ -106,9 +106,10 @@ gst_mulawdec_get_type (void)
0,
(GInstanceInitFunc) gst_mulawdec_init,
};
+
mulawdec_type =
- g_type_register_static (GST_TYPE_ELEMENT, "GstMuLawDec", &mulawdec_info,
- 0);
+ g_type_register_static (GST_TYPE_ELEMENT, "GstMuLawDec", &mulawdec_info,
+ 0);
}
return mulawdec_type;
}
diff --git a/gst/law/mulaw-encode.c b/gst/law/mulaw-encode.c
index db65e169..0c002c5d 100644
--- a/gst/law/mulaw-encode.c
+++ b/gst/law/mulaw-encode.c
@@ -104,9 +104,10 @@ gst_mulawenc_get_type (void)
0,
(GInstanceInitFunc) gst_mulawenc_init,
};
+
mulawenc_type =
- g_type_register_static (GST_TYPE_ELEMENT, "GstMuLawEnc", &mulawenc_info,
- 0);
+ g_type_register_static (GST_TYPE_ELEMENT, "GstMuLawEnc", &mulawenc_info,
+ 0);
}
return mulawenc_type;
}
diff --git a/gst/law/mulaw.c b/gst/law/mulaw.c
index 3702aaa6..7b7d222d 100644
--- a/gst/law/mulaw.c
+++ b/gst/law/mulaw.c
@@ -46,9 +46,9 @@ plugin_init (GstPlugin * plugin)
gst_pad_template_new ("sink", GST_PAD_SINK, GST_PAD_ALWAYS, mulaw_caps);
if (!gst_element_register (plugin, "mulawenc",
- GST_RANK_NONE, GST_TYPE_MULAWENC) ||
+ GST_RANK_NONE, GST_TYPE_MULAWENC) ||
!gst_element_register (plugin, "mulawdec",
- GST_RANK_PRIMARY, GST_TYPE_MULAWDEC))
+ GST_RANK_PRIMARY, GST_TYPE_MULAWDEC))
return FALSE;
return TRUE;