pcm: K&R Cosmetics.

Message ID 1329979117-6812-1-git-send-email-lionaneesh@gmail.com
State Superseded
Delegated to: Diego Biurrun
Headers show

Commit Message

Aneesh Dogra Feb. 23, 2012, 6:38 a.m.
---
 libavcodec/pcm.c |  104 +++++++++++++++++++++++++++---------------------------
 1 files changed, 52 insertions(+), 52 deletions(-)

Patch

diff --git a/libavcodec/pcm.c b/libavcodec/pcm.c
index 594bd44..afb8d43 100644
--- a/libavcodec/pcm.c
+++ b/libavcodec/pcm.c
@@ -35,7 +35,7 @@ 
 static av_cold int pcm_encode_init(AVCodecContext *avctx)
 {
     avctx->frame_size = 0;
-    switch(avctx->codec->id) {
+    switch (avctx->codec->id) {
     case CODEC_ID_PCM_ALAW:
         pcm_alaw_tableinit();
         break;
@@ -46,10 +46,10 @@  static av_cold int pcm_encode_init(AVCodecContext *avctx)
         break;
     }
 
-    avctx->bits_per_coded_sample = av_get_bits_per_sample(avctx->codec->id);
-    avctx->block_align = avctx->channels * avctx->bits_per_coded_sample/8;
-    avctx->coded_frame= avcodec_alloc_frame();
-    avctx->coded_frame->key_frame= 1;
+    avctx->bits_per_coded_sample  = av_get_bits_per_sample(avctx->codec->id);
+    avctx->block_align            = avctx->channels * avctx->bits_per_coded_sample/8;
+    avctx->coded_frame            = avcodec_alloc_frame();
+    avctx->coded_frame->key_frame = 1;
 
     return 0;
 }
@@ -71,11 +71,11 @@  static av_cold int pcm_encode_close(AVCodecContext *avctx)
  * @param shift Bitshift (bits)
  * @param offset Sample value offset
  */
-#define ENCODE(type, endian, src, dst, n, shift, offset) \
-    samples_##type = (const type*) src; \
-    for(;n>0;n--) { \
-        register type v = (*samples_##type++ >> shift) + offset; \
-        bytestream_put_##endian(&dst, v); \
+#define ENCODE(type, endian, src, dst, n, shift, offset)           \
+    samples_ ## type = (const type*) src;                          \
+    for (; n > 0; n--) {                                           \
+        register type v = (*samples_ ## type++ >> shift) + offset; \
+        bytestream_put_ ## endian(&dst, v);                        \
     }
 
 static int pcm_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
@@ -91,7 +91,7 @@  static int pcm_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
     const uint16_t *samples_uint16_t;
     const uint32_t *samples_uint32_t;
 
-    sample_size = av_get_bits_per_sample(avctx->codec->id)/8;
+    sample_size = av_get_bits_per_sample(avctx->codec->id) / 8;
     n           = frame->nb_samples * avctx->channels;
     samples     = (const short *)frame->data[0];
 
@@ -101,7 +101,7 @@  static int pcm_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
     }
     dst = avpkt->data;
 
-    switch(avctx->codec->id) {
+    switch (avctx->codec->id) {
     case CODEC_ID_PCM_U32LE:
         ENCODE(uint32_t, le32, samples, dst, n, 0, 0x80000000)
         break;
@@ -121,7 +121,7 @@  static int pcm_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
         ENCODE(uint32_t, be24, samples, dst, n, 8, 0x800000)
         break;
     case CODEC_ID_PCM_S24DAUD:
-        for(;n>0;n--) {
+        for (; n > 0; n--) {
             uint32_t tmp = av_reverse[(*samples >> 8) & 0xff] +
                            (av_reverse[*samples & 0xff] << 8);
             tmp <<= 4; // sync flags would go here
@@ -137,8 +137,8 @@  static int pcm_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
         break;
     case CODEC_ID_PCM_S8:
         srcu8 = frame->data[0];
-        for(;n>0;n--) {
-            v = *srcu8++;
+        for (; n > 0; n--) {
+            v      = *srcu8++;
             *dst++ = v - 128;
         }
         break;
@@ -174,18 +174,18 @@  static int pcm_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
     case CODEC_ID_PCM_S16LE:
 #endif /* HAVE_BIGENDIAN */
     case CODEC_ID_PCM_U8:
-        memcpy(dst, samples, n*sample_size);
-        dst += n*sample_size;
+        memcpy(dst, samples, n * sample_size);
+        dst += n * sample_size;
         break;
     case CODEC_ID_PCM_ALAW:
-        for(;n>0;n--) {
-            v = *samples++;
+        for (; n > 0; n--) {
+            v      = *samples++;
             *dst++ = linear_to_alaw[(v + 32768) >> 2];
         }
         break;
     case CODEC_ID_PCM_MULAW:
-        for(;n>0;n--) {
-            v = *samples++;
+        for (; n > 0; n--) {
+            v      = *samples++;
             *dst++ = linear_to_ulaw[(v + 32768) >> 2];
         }
         break;
@@ -212,13 +212,13 @@  static av_cold int pcm_decode_init(AVCodecContext * avctx)
         return AVERROR(EINVAL);
     }
 
-    switch(avctx->codec->id) {
+    switch (avctx->codec->id) {
     case CODEC_ID_PCM_ALAW:
-        for(i=0;i<256;i++)
+        for (i = 0; i < 256; i++)
             s->table[i] = alaw2linear(i);
         break;
     case CODEC_ID_PCM_MULAW:
-        for(i=0;i<256;i++)
+        for (i = 0; i < 256; i++)
             s->table[i] = ulaw2linear(i);
         break;
     default:
@@ -246,11 +246,11 @@  static av_cold int pcm_decode_init(AVCodecContext * avctx)
  * @param shift Bitshift (bits)
  * @param offset Sample value offset
  */
-#define DECODE(size, endian, src, dst, n, shift, offset) \
-    for(;n>0;n--) { \
-        uint##size##_t v = bytestream_get_##endian(&src); \
-        AV_WN##size##A(dst, (v - offset) << shift); \
-        dst += size / 8; \
+#define DECODE(size, endian, src, dst, n, shift, offset)         \
+    for (; n > 0; n--) {                                         \
+        uint  ## size ## _t v = bytestream_get_ ## endian(&src); \
+        AV_WN ## size ## A(dst, (v - offset) << shift);          \
+        dst += size / 8;                                         \
     }
 
 static int pcm_decode_frame(AVCodecContext *avctx, void *data,
@@ -263,7 +263,7 @@  static int pcm_decode_frame(AVCodecContext *avctx, void *data,
     uint8_t *samples;
     int32_t *dst_int32_t;
 
-    sample_size = av_get_bits_per_sample(avctx->codec_id)/8;
+    sample_size = av_get_bits_per_sample(avctx->codec_id) / 8;
 
     /* av_get_bits_per_sample returns 0 for CODEC_ID_PCM_DVD */
     samples_per_block = 1;
@@ -275,11 +275,11 @@  static int pcm_decode_frame(AVCodecContext *avctx, void *data,
         }
         /* 2 samples are interleaved per block in PCM_DVD */
         samples_per_block = 2;
-        sample_size = avctx->bits_per_coded_sample * 2 / 8;
+        sample_size       = avctx->bits_per_coded_sample * 2 / 8;
     } else if (avctx->codec_id == CODEC_ID_PCM_LXF) {
         /* we process 40-bit blocks per channel for LXF */
         samples_per_block = 2;
-        sample_size = 5;
+        sample_size       = 5;
     }
 
     if (sample_size == 0) {
@@ -289,15 +289,15 @@  static int pcm_decode_frame(AVCodecContext *avctx, void *data,
 
     n = avctx->channels * sample_size;
 
-    if(n && buf_size % n){
+    if (n && buf_size % n) {
         if (buf_size < n) {
             av_log(avctx, AV_LOG_ERROR, "invalid PCM packet\n");
             return -1;
-        }else
+        } else
             buf_size -= buf_size % n;
     }
 
-    n = buf_size/sample_size;
+    n = buf_size / sample_size;
 
     /* get output buffer */
     s->frame.nb_samples = n * samples_per_block / avctx->channels;
@@ -307,7 +307,7 @@  static int pcm_decode_frame(AVCodecContext *avctx, void *data,
     }
     samples = s->frame.data[0];
 
-    switch(avctx->codec->id) {
+    switch (avctx->codec->id) {
     case CODEC_ID_PCM_U32LE:
         DECODE(32, le32, src, samples, n, 0, 0x80000000)
         break;
@@ -327,7 +327,7 @@  static int pcm_decode_frame(AVCodecContext *avctx, void *data,
         DECODE(32, be24, src, samples, n, 8, 0x800000)
         break;
     case CODEC_ID_PCM_S24DAUD:
-        for(;n>0;n--) {
+        for (; n > 0; n--) {
           uint32_t v = bytestream_get_be24(&src);
           v >>= 4; // sync flags are here
           AV_WN16A(samples, av_reverse[(v >> 8) & 0xff] +
@@ -339,10 +339,10 @@  static int pcm_decode_frame(AVCodecContext *avctx, void *data,
     {
         const uint8_t *src2[MAX_CHANNELS];
         n /= avctx->channels;
-        for(c=0;c<avctx->channels;c++)
-            src2[c] = &src[c*n*2];
-        for(;n>0;n--)
-            for(c=0;c<avctx->channels;c++) {
+        for (c = 0; c < avctx->channels; c++)
+            src2[c] = &src[c * n * 2];
+        for (; n > 0; n--)
+            for (c = 0; c < avctx->channels; c++) {
                 AV_WN16A(samples, bytestream_get_le16(&src2[c]));
                 samples += 2;
             }
@@ -355,7 +355,7 @@  static int pcm_decode_frame(AVCodecContext *avctx, void *data,
         DECODE(16, be16, src, samples, n, 0, 0x8000)
         break;
     case CODEC_ID_PCM_S8:
-        for(;n>0;n--) {
+        for (; n > 0; n--) {
             *samples++ = *src++ + 128;
         }
         break;
@@ -403,7 +403,7 @@  static int pcm_decode_frame(AVCodecContext *avctx, void *data,
         break;
     case CODEC_ID_PCM_ALAW:
     case CODEC_ID_PCM_MULAW:
-        for(;n>0;n--) {
+        for (; n > 0; n--) {
             AV_WN16A(samples, s->table[*src++]);
             samples += 2;
         }
@@ -417,10 +417,10 @@  static int pcm_decode_frame(AVCodecContext *avctx, void *data,
         case 20:
             while (n--) {
                 c = avctx->channels;
-                src8 = src + 4*c;
+                src8 = src + 4 * c;
                 while (c--) {
-                    *dst_int32_t++ = (bytestream_get_be16(&src) << 16) + ((*src8   &0xf0) << 8);
-                    *dst_int32_t++ = (bytestream_get_be16(&src) << 16) + ((*src8++ &0x0f) << 12);
+                    *dst_int32_t++ = (bytestream_get_be16(&src) << 16) + ((*src8   & 0xf0) << 8);
+                    *dst_int32_t++ = (bytestream_get_be16(&src) << 16) + ((*src8++ & 0x0f) << 12);
                 }
                 src = src8;
             }
@@ -428,7 +428,7 @@  static int pcm_decode_frame(AVCodecContext *avctx, void *data,
         case 24:
             while (n--) {
                 c = avctx->channels;
-                src8 = src + 4*c;
+                src8 = src + 4 * c;
                 while (c--) {
                     *dst_int32_t++ = (bytestream_get_be16(&src) << 16) + ((*src8++) << 8);
                     *dst_int32_t++ = (bytestream_get_be16(&src) << 16) + ((*src8++) << 8);
@@ -445,16 +445,16 @@  static int pcm_decode_frame(AVCodecContext *avctx, void *data,
         const uint8_t *src8;
         dst_int32_t = (int32_t *)s->frame.data[0];
         n /= avctx->channels;
-        //unpack and de-planerize
+        // unpack and de-planerize
         for (i = 0; i < n; i++) {
-            for (c = 0, src8 = src + i*5; c < avctx->channels; c++, src8 += n*5) {
-                //extract low 20 bits and expand to 32 bits
+            for (c = 0, src8 = src + i * 5; c < avctx->channels; c++, src8 += n * 5) {
+                // extract low 20 bits and expand to 32 bits
                 *dst_int32_t++ = (src8[2] << 28) | (src8[1] << 20) | (src8[0] << 12) |
                                  ((src8[2] & 0xF) << 8) | src8[1];
             }
 
-            for (c = 0, src8 = src + i*5; c < avctx->channels; c++, src8 += n*5) {
-                //extract high 20 bits and expand to 32 bits
+            for (c = 0, src8 = src + i * 5; c < avctx->channels; c++, src8 += n * 5) {
+                // extract high 20 bits and expand to 32 bits
                 *dst_int32_t++ = (src8[4] << 24) | (src8[3] << 16) |
                                  ((src8[2] & 0xF0) << 8) | (src8[4] << 4) | (src8[3] >> 4);
             }