dca: K&R formatting cosmetics

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

libavcodec/dca.c

@@ -26,8 +26,7 @@
 #include "dca.h"
 #include "put_bits.h"
 
-const uint32_t avpriv_dca_sample_rates[16] =
-{
+const uint32_t avpriv_dca_sample_rates[16] = {
     0, 8000, 16000, 32000, 0, 0, 11025, 22050, 44100, 0, 0,
     12000, 24000, 48000, 96000, 192000
 };

libavcodec/dca_parser.c

@@ -22,9 +22,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "parser.h"
 #include "dca.h"
 #include "get_bits.h"
+#include "parser.h"
 
 typedef struct DCAParseContext {
     ParseContext pc;
@@ -35,15 +35,15 @@ typedef struct DCAParseContext {
 } DCAParseContext;
 
 #define IS_MARKER(state, i, buf, buf_size) \
- ((state == DCA_MARKER_14B_LE && (i < buf_size-2) && (buf[i+1] & 0xF0) == 0xF0 && buf[i+2] == 0x07) \
- || (state == DCA_MARKER_14B_BE && (i < buf_size-2) && buf[i+1] == 0x07 && (buf[i+2] & 0xF0) == 0xF0) \
- || state == DCA_MARKER_RAW_LE || state == DCA_MARKER_RAW_BE)
+    ((state == DCA_MARKER_14B_LE && (i < buf_size - 2) && (buf[i + 1] & 0xF0) == 0xF0 &&  buf[i + 2]         == 0x07) || \
+     (state == DCA_MARKER_14B_BE && (i < buf_size - 2) &&  buf[i + 1]         == 0x07 && (buf[i + 2] & 0xF0) == 0xF0) || \
+      state == DCA_MARKER_RAW_LE || state == DCA_MARKER_RAW_BE)
 
 /**
  * Find the end of the current frame in the bitstream.
  * @return the position of the first byte of the next frame, or -1
  */
-static int dca_find_frame_end(DCAParseContext * pc1, const uint8_t * buf,
+static int dca_find_frame_end(DCAParseContext *pc1, const uint8_t *buf,
                               int buf_size)
 {
     int start_found, i;
@@ -78,7 +78,7 @@ static int dca_find_frame_end(DCAParseContext * pc1, const uint8_t * buf,
             if (state == DCA_HD_MARKER && !pc1->hd_pos)
                 pc1->hd_pos = pc1->size;
             if (state == pc1->lastmarker && IS_MARKER(state, i, buf, buf_size)) {
-                if(pc1->framesize > pc1->size)
+                if (pc1->framesize > pc1->size)
                     continue;
                 pc->frame_start_found = 0;
                 pc->state             = -1;
@@ -92,7 +92,7 @@ static int dca_find_frame_end(DCAParseContext * pc1, const uint8_t * buf,
     return END_NOT_FOUND;
 }
 
-static av_cold int dca_parse_init(AVCodecParserContext * s)
+static av_cold int dca_parse_init(AVCodecParserContext *s)
 {
     DCAParseContext *pc1 = s->priv_data;
 
@@ -134,10 +134,9 @@ static int dca_parse_params(const uint8_t *buf, int buf_size, int *duration,
     return 0;
 }
 
-static int dca_parse(AVCodecParserContext * s,
-                     AVCodecContext * avctx,
-                     const uint8_t ** poutbuf, int *poutbuf_size,
-                     const uint8_t * buf, int buf_size)
+static int dca_parse(AVCodecParserContext *s, AVCodecContext *avctx,
+                     const uint8_t **poutbuf, int *poutbuf_size,
+                     const uint8_t *buf, int buf_size)
 {
     DCAParseContext *pc1 = s->priv_data;
     ParseContext *pc = &pc1->pc;

libavcodec/dcadsp.c

@@ -20,8 +20,10 @@
  */
 
 #include "config.h"
+
 #include "libavutil/attributes.h"
 #include "libavutil/intreadwrite.h"
+
 #include "dcadsp.h"
 
 static void decode_hf_c(float dst[DCA_SUBBANDS][8],
@@ -42,8 +44,7 @@ static void decode_hf_c(float dst[DCA_SUBBANDS][8],
     }
 }
 
-static inline void
-dca_lfe_fir(float *out, const float *in, const float *coefs,
+static inline void dca_lfe_fir(float *out, const float *in, const float *coefs,
                                int decifactor)
 {
     float *out2    = out + 2 * decifactor - 1;
@@ -86,7 +87,8 @@ static void dca_qmf_32_subbands(float samples_in[32][8], int sb_act,
         }
 
         synth->synth_filter_float(imdct, synth_buf_ptr, synth_buf_offset,
-                                  synth_buf2, window, samples_out, raXin, scale);
+                                  synth_buf2, window, samples_out, raXin,
+                                  scale);
         samples_out += 32;
     }
 }
@@ -107,6 +109,9 @@ av_cold void ff_dcadsp_init(DCADSPContext *s)
     s->lfe_fir[1]      = dca_lfe_fir1_c;
     s->qmf_32_subbands = dca_qmf_32_subbands;
     s->decode_hf       = decode_hf_c;
-    if (ARCH_ARM) ff_dcadsp_init_arm(s);
-    if (ARCH_X86) ff_dcadsp_init_x86(s);
+
+    if (ARCH_ARM)
+        ff_dcadsp_init_arm(s);
+    if (ARCH_X86)
+        ff_dcadsp_init_x86(s);
 }