diff options
Diffstat (limited to 'wsutil')
-rw-r--r-- | wsutil/mpeg-audio.c | 8 | ||||
-rw-r--r-- | wsutil/mpeg-audio.h | 34 |
2 files changed, 21 insertions, 21 deletions
diff --git a/wsutil/mpeg-audio.c b/wsutil/mpeg-audio.c index e6deac9a5e..e848ce673e 100644 --- a/wsutil/mpeg-audio.c +++ b/wsutil/mpeg-audio.c @@ -27,13 +27,13 @@ static const int mpa_versions[4] = { 2, -1, 1, 0 }; static const int mpa_layers[4] = { -1, 2, 1, 0 }; -static const unsigned mpa_samples_data[3][3] = { +static const unsigned int mpa_samples_data[3][3] = { { 384, 1152, 1152 }, { 384, 1152, 576 }, { 384, 1152, 576 }, }; -static const unsigned mpa_bitrates[3][3][16] = { /* kb/s */ +static const unsigned int mpa_bitrates[3][3][16] = { /* kb/s */ { { 0, 32, 64, 96, 128, 160, 192, 224, 256, 288, 320, 352, 384, 416, 448 }, { 0, 32, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 256, 320, 384 }, @@ -51,13 +51,13 @@ static const unsigned mpa_bitrates[3][3][16] = { /* kb/s */ }, }; -static const unsigned mpa_frequencies[3][4] = { +static const unsigned int mpa_frequencies[3][4] = { { 44100, 48000, 32000 }, { 22050, 24000, 16000 }, { 11025, 12000, 8000 }, }; -static const unsigned mpa_padding_data[3] = { 4, 1, 1 }; +static const unsigned int mpa_padding_data[3] = { 4, 1, 1 }; int mpa_version(const struct mpa *mpa) diff --git a/wsutil/mpeg-audio.h b/wsutil/mpeg-audio.h index 2f6194cc6b..23ee3465da 100644 --- a/wsutil/mpeg-audio.h +++ b/wsutil/mpeg-audio.h @@ -26,19 +26,19 @@ #define MPA_H 1 struct mpa { - unsigned emphasis :2; - unsigned original :1; - unsigned copyright :1; - unsigned modeext :2; - unsigned mode :2; - unsigned private :1; - unsigned padding :1; - unsigned frequency :2; - unsigned bitrate :4; - unsigned protection :1; - unsigned layer :2; - unsigned version :2; - unsigned sync :11; + unsigned int emphasis :2; + unsigned int original :1; + unsigned int copyright :1; + unsigned int modeext :2; + unsigned int mode :2; + unsigned int private :1; + unsigned int padding :1; + unsigned int frequency :2; + unsigned int bitrate :4; + unsigned int protection :1; + unsigned int layer :2; + unsigned int version :2; + unsigned int sync :11; }; #define MPA_UNMARSHAL_SYNC(n) ((n) >> 21 & 0x7ff) @@ -73,10 +73,10 @@ struct mpa { int mpa_version(const struct mpa *); int mpa_layer(const struct mpa *); -unsigned mpa_samples(const struct mpa *); -unsigned mpa_bitrate(const struct mpa *); -unsigned mpa_frequency(const struct mpa *); -unsigned mpa_padding(const struct mpa *); +unsigned int mpa_samples(const struct mpa *); +unsigned int mpa_bitrate(const struct mpa *); +unsigned int mpa_frequency(const struct mpa *); +unsigned int mpa_padding(const struct mpa *); #define MPA_DATA_BYTES(mpa) (mpa_bitrate(mpa) * mpa_samples(mpa) \ / mpa_frequency(mpa) / 8) |