pcm: K&R formatting cosmetics

Signed-off-by: Diego Biurrun <diego@biurrun.de>

libavcodec/pcm.c

@@ -24,8 +24,8 @@
  * PCM codecs
  */
 
-#include "avcodec.h"
 #include "libavutil/common.h" /* for av_reverse */
+#include "avcodec.h"
 #include "bytestream.h"
 #include "internal.h"
 #include "pcm_tablegen.h"
@@ -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;
@@ -47,8 +47,8 @@ static av_cold int pcm_encode_init(AVCodecContext *avctx)
     }
 
     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->block_align           = avctx->channels * avctx->bits_per_coded_sample / 8;
+    avctx->coded_frame           = avcodec_alloc_frame();
     if (!avctx->coded_frame)
         return AVERROR(ENOMEM);
 
@@ -73,10 +73,10 @@ static av_cold int pcm_encode_close(AVCodecContext *avctx)
  * @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); \
+    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,
@@ -92,7 +92,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];
 
@@ -102,7 +102,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;
@@ -122,7 +122,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
@@ -138,7 +138,7 @@ static int pcm_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
         break;
     case CODEC_ID_PCM_S8:
         srcu8 = frame->data[0];
-        for(;n>0;n--) {
+        for (; n > 0; n--) {
             v      = *srcu8++;
             *dst++ = v - 128;
         }
@@ -175,17 +175,17 @@ 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--) {
+        for (; n > 0; n--) {
             v      = *samples++;
             *dst++ = linear_to_alaw[(v + 32768) >> 2];
         }
         break;
     case CODEC_ID_PCM_MULAW:
-        for(;n>0;n--) {
+        for (; n > 0; n--) {
             v      = *samples++;
             *dst++ = linear_to_ulaw[(v + 32768) >> 2];
         }
@@ -203,7 +203,7 @@ typedef struct PCMDecode {
     short   table[256];
 } PCMDecode;
 
-static av_cold int pcm_decode_init(AVCodecContext * avctx)
+static av_cold int pcm_decode_init(AVCodecContext *avctx)
 {
     PCMDecode *s = avctx->priv_data;
     int i;
@@ -213,13 +213,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:
@@ -248,9 +248,9 @@ static av_cold int pcm_decode_init(AVCodecContext * avctx)
  * @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); \
+    for (; n > 0; n--) {                                                \
+        uint ## size ## _t v = bytestream_get_ ## endian(&src);         \
+        AV_WN ## size ## A(dst, (v - offset) << shift);                 \
         dst += size / 8;                                                \
     }
 
@@ -264,7 +264,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;
@@ -290,15 +290,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;
@@ -308,7 +308,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;
@@ -328,7 +328,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] +
@@ -340,10 +340,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;
             }
@@ -356,9 +356,8 @@ 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;
 #if HAVE_BIGENDIAN
     case CODEC_ID_PCM_F64LE:
@@ -392,7 +391,7 @@ static int pcm_decode_frame(AVCodecContext *avctx, void *data,
     case CODEC_ID_PCM_S16LE:
 #endif /* HAVE_BIGENDIAN */
     case CODEC_ID_PCM_U8:
-        memcpy(samples, src, n*sample_size);
+        memcpy(samples, src, n * sample_size);
         break;
     case CODEC_ID_PCM_ZORK:
         for (; n > 0; n--) {
@@ -404,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;
         }
@@ -418,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;
             }
@@ -429,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);
@@ -446,18 +445,23 @@ 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-planarize
         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
-                *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 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
-                *dst_int32_t++ = (src8[4] << 24) | (src8[3] << 16) |
-                                 ((src8[2] & 0xF0) << 8) | (src8[4] << 4) | (src8[3] >> 4);
+            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);
             }
         }
         break;
@@ -473,7 +477,7 @@ static int pcm_decode_frame(AVCodecContext *avctx, void *data,
 }
 
 #if CONFIG_ENCODERS
-#define PCM_ENCODER(id_,sample_fmt_,name_,long_name_) \
+#define PCM_ENCODER(id_, sample_fmt_, name_, long_name_)                    \
 AVCodec ff_ ## name_ ## _encoder = {                                        \
     .name         = #name_,                                                 \
     .type         = AVMEDIA_TYPE_AUDIO,                                     \
@@ -482,15 +486,16 @@ AVCodec ff_ ## name_ ## _encoder = {            \
     .encode2      = pcm_encode_frame,                                       \
     .close        = pcm_encode_close,                                       \
     .capabilities = CODEC_CAP_VARIABLE_FRAME_SIZE,                          \
-    .sample_fmts = (const enum AVSampleFormat[]){sample_fmt_,AV_SAMPLE_FMT_NONE}, \
+    .sample_fmts  = (const enum AVSampleFormat[]){ sample_fmt_,             \
+                                                   AV_SAMPLE_FMT_NONE },    \
     .long_name    = NULL_IF_CONFIG_SMALL(long_name_),                       \
 }
 #else
-#define PCM_ENCODER(id,sample_fmt_,name,long_name_)
+#define PCM_ENCODER(id, sample_fmt_, name, long_name_)
 #endif
 
 #if CONFIG_DECODERS
-#define PCM_DECODER(id_,sample_fmt_,name_,long_name_)         \
+#define PCM_DECODER(id_, sample_fmt_, name_, long_name_)                    \
 AVCodec ff_ ## name_ ## _decoder = {                                        \
     .name           = #name_,                                               \
     .type           = AVMEDIA_TYPE_AUDIO,                                   \
@@ -499,15 +504,17 @@ AVCodec ff_ ## name_ ## _decoder = {            \
     .init           = pcm_decode_init,                                      \
     .decode         = pcm_decode_frame,                                     \
     .capabilities   = CODEC_CAP_DR1,                                        \
-    .sample_fmts = (const enum AVSampleFormat[]){sample_fmt_,AV_SAMPLE_FMT_NONE}, \
+    .sample_fmts    = (const enum AVSampleFormat[]){ sample_fmt_,           \
+                                                     AV_SAMPLE_FMT_NONE },  \
     .long_name      = NULL_IF_CONFIG_SMALL(long_name_),                     \
 }
 #else
-#define PCM_DECODER(id,sample_fmt_,name,long_name_)
+#define PCM_DECODER(id, sample_fmt_, name, long_name_)
 #endif
 
 #define PCM_CODEC(id, sample_fmt_, name, long_name_)                    \
-    PCM_ENCODER(id,sample_fmt_,name,long_name_); PCM_DECODER(id,sample_fmt_,name,long_name_)
+    PCM_ENCODER(id, sample_fmt_, name, long_name_);                     \
+    PCM_DECODER(id, sample_fmt_, name, long_name_)
 
 /* Note: Do not forget to add new entries to the Makefile as well. */
 PCM_CODEC  (CODEC_ID_PCM_ALAW,         AV_SAMPLE_FMT_S16, pcm_alaw,         "PCM A-law");