From aa48eeac9707f7e54468b55226af1188e7d72e30 Mon Sep 17 00:00:00 2001 From: wm4 Date: Thu, 7 Nov 2013 22:12:26 +0100 Subject: audio/format: reformat --- audio/format.c | 38 ++++++++++++++++++-------------------- 1 file changed, 18 insertions(+), 20 deletions(-) (limited to 'audio/format.c') diff --git a/audio/format.c b/audio/format.c index c6c617cf28..9b0967ae53 100644 --- a/audio/format.c +++ b/audio/format.c @@ -31,13 +31,12 @@ int af_fmt2bits(int format) if (AF_FORMAT_IS_AC3(format)) return 16; if (format == AF_FORMAT_UNKNOWN) return 0; - switch(format & AF_FORMAT_BITS_MASK) - { - case AF_FORMAT_8BIT: return 8; - case AF_FORMAT_16BIT: return 16; - case AF_FORMAT_24BIT: return 24; - case AF_FORMAT_32BIT: return 32; - case AF_FORMAT_64BIT: return 64; + switch (format & AF_FORMAT_BITS_MASK) { + case AF_FORMAT_8BIT: return 8; + case AF_FORMAT_16BIT: return 16; + case AF_FORMAT_24BIT: return 24; + case AF_FORMAT_32BIT: return 32; + case AF_FORMAT_64BIT: return 64; } return 0; } @@ -45,11 +44,11 @@ int af_fmt2bits(int format) static int bits_to_mask(int bits) { switch (bits) { - case 8: return AF_FORMAT_8BIT; - case 16: return AF_FORMAT_16BIT; - case 24: return AF_FORMAT_24BIT; - case 32: return AF_FORMAT_32BIT; - case 64: return AF_FORMAT_64BIT; + case 8: return AF_FORMAT_8BIT; + case 16: return AF_FORMAT_16BIT; + case 24: return AF_FORMAT_24BIT; + case 32: return AF_FORMAT_32BIT; + case 64: return AF_FORMAT_64BIT; } return 0; } @@ -65,7 +64,7 @@ int af_fmt_change_bits(int format, int bits) /* Convert format to str input str is a buffer for the converted string, size is the size of the buffer */ -char* af_fmt2str(int format, char* str, int size) +char *af_fmt2str(int format, char* str, int size) { const char *name = af_fmt2str_short(format); snprintf(str, size, "%s", name); @@ -122,11 +121,10 @@ bool af_fmt_is_valid(int format) const char *af_fmt2str_short(int format) { - int i; - - for (i = 0; af_fmtstr_table[i].name; i++) - if (af_fmtstr_table[i].format == format) - return af_fmtstr_table[i].name; + for (int i = 0; af_fmtstr_table[i].name; i++) { + if (af_fmtstr_table[i].format == format) + return af_fmtstr_table[i].name; + } return "??"; } @@ -143,9 +141,9 @@ int af_fmt_seconds_to_bytes(int format, float seconds, int channels, int sampler int af_str2fmt_short(bstr str) { - for (int i = 0; af_fmtstr_table[i].name; i++) + for (int i = 0; af_fmtstr_table[i].name; i++) { if (!bstrcasecmp0(str, af_fmtstr_table[i].name)) return af_fmtstr_table[i].format; - + } return 0; } -- cgit v1.2.3