summaryrefslogtreecommitdiffstats
path: root/audio/format.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-11-07 22:12:26 +0100
committerwm4 <wm4@nowhere>2013-11-07 22:12:26 +0100
commitaa48eeac9707f7e54468b55226af1188e7d72e30 (patch)
treea935c0a7767e386d4cdba6345f3247a6a28ce9bd /audio/format.c
parent6c4b504eca88f4083cfbd99b04e997691db94380 (diff)
downloadmpv-aa48eeac9707f7e54468b55226af1188e7d72e30.tar.bz2
mpv-aa48eeac9707f7e54468b55226af1188e7d72e30.tar.xz
audio/format: reformat
Diffstat (limited to 'audio/format.c')
-rw-r--r--audio/format.c38
1 files changed, 18 insertions, 20 deletions
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;
}