trivial whitespace cleanups

[paraslash.git] / wmadec_filter.c

diff --git a/wmadec_filter.c b/wmadec_filter.c
index c49489b70eea8d1d9ae271f318cefbb3a349e1e8..0565a14bfaac6e0353fd5eac89b23666c03a1282 100644 (file)
--- a/wmadec_filter.c
+++ b/wmadec_filter.c
@@ -123,13 +123,13 @@ struct private_wmadec_data {
 };
 
 #define EXPVLCBITS 8
-#define EXPMAX ((19+EXPVLCBITS-1)/EXPVLCBITS)
+#define EXPMAX ((19 + EXPVLCBITS - 1) / EXPVLCBITS)
 
 #define HGAINVLCBITS 9
-#define HGAINMAX ((13+HGAINVLCBITS-1)/HGAINVLCBITS)
+#define HGAINMAX ((13 + HGAINVLCBITS - 1) / HGAINVLCBITS)
 
 #define VLCBITS 9
-#define VLCMAX ((22+VLCBITS-1)/VLCBITS)
+#define VLCMAX ((22 + VLCBITS - 1)/VLCBITS)
 
 DECLARE_ALIGNED(16, float, ff_sine_128[128]);
 DECLARE_ALIGNED(16, float, ff_sine_256[256]);
@@ -664,41 +664,30 @@ static void wma_window(struct private_wmadec_data *s, float *out)
        if (s->block_len_bits <= s->prev_block_len_bits) {
                block_len = s->block_len;
                bsize = s->frame_len_bits - s->block_len_bits;
-
                vector_mult_add(out, in, s->windows[bsize], out, block_len);
-
        } else {
                block_len = 1 << s->prev_block_len_bits;
                n = (s->block_len - block_len) / 2;
                bsize = s->frame_len_bits - s->prev_block_len_bits;
-
                vector_mult_add(out + n, in + n, s->windows[bsize], out + n,
                        block_len);
-
                memcpy(out + n + block_len, in + n + block_len,
-                      n * sizeof(float));
+                       n * sizeof(float));
        }
-
        out += s->block_len;
        in += s->block_len;
-
        /* right part */
        if (s->block_len_bits <= s->next_block_len_bits) {
                block_len = s->block_len;
                bsize = s->frame_len_bits - s->block_len_bits;
-
                vector_mult_reverse(out, in, s->windows[bsize], block_len);
-
        } else {
                block_len = 1 << s->next_block_len_bits;
                n = (s->block_len - block_len) / 2;
                bsize = s->frame_len_bits - s->next_block_len_bits;
-
                memcpy(out, in, n * sizeof(float));
-
                vector_mult_reverse(out + n, in + n, s->windows[bsize],
-                                     block_len);
-
+                       block_len);
                memset(out + n + block_len, 0, n * sizeof(float));
        }
 }
@@ -763,9 +752,8 @@ static int wma_decode_block(struct private_wmadec_data *s)
        if ((s->block_pos + s->block_len) > s->frame_len)
                return -E_INCOHERENT_BLOCK_LEN;
 
-       if (s->ahi.channels == 2) {
+       if (s->ahi.channels == 2)
                s->ms_stereo = get_bits1(&s->gb);
-       }
        v = 0;
        for (ch = 0; ch < s->ahi.channels; ch++) {
                int a = get_bits1(&s->gb);
@@ -1141,7 +1129,7 @@ static inline int16_t av_clip_int16(int a)
 }
 
 /* Decode a frame of frame_len samples. */
-static int wma_decode_frame(struct private_wmadec_data *s, int16_t * samples)
+static int wma_decode_frame(struct private_wmadec_data *s, int16_t *samples)
 {
        int ret, i, n, ch, incr;
        int16_t *ptr;
@@ -1216,9 +1204,8 @@ static int wma_decode_superframe(struct private_wmadec_data *s, void *data,
                                *q++ = get_bits(&s->gb, 8);
                                len -= 8;
                        }
-                       if (len > 0) {
+                       if (len > 0)
                                *q++ = get_bits(&s->gb, len) << (8 - len);
-                       }
 
                        /* XXX: bit_offset bits into last frame */
                        init_get_bits(&s->gb, s->last_superframe,
@@ -1261,9 +1248,8 @@ static int wma_decode_superframe(struct private_wmadec_data *s, void *data,
                pos >>= 3;
                len = buf_size - pos;
                ret = -E_WMA_BAD_SUPERFRAME;
-               if (len > MAX_CODED_SUPERFRAME_SIZE || len < 0) {
+               if (len > MAX_CODED_SUPERFRAME_SIZE || len < 0)
                        goto fail;
-               }
                s->last_superframe_len = len;
                memcpy(s->last_superframe, buf + pos, len);
        } else {
@@ -1322,6 +1308,7 @@ static ssize_t wmadec_convert(char *inbuffer, size_t len,
 static void wmadec_close(struct filter_node *fn)
 {
        struct private_wmadec_data *pwd = fn->private_data;
+
        if (!pwd)
                return;
        wmadec_cleanup(pwd);