Mercurial > SDL_sound_CoreAudio
diff decoders/au.c @ 536:8a814bbbedfa
Merged r544:545 from branches/stable-1.0: converted to UTF-8 encoding.
| author | Ryan C. Gordon <icculus@icculus.org> |
|---|---|
| date | Thu, 17 Apr 2008 18:08:02 +0000 |
| parents | 3e705c9180e5 |
| children | 2e8907ff98e9 |
line wrap: on
line diff
--- a/decoders/au.c Thu Apr 17 17:56:09 2008 +0000 +++ b/decoders/au.c Thu Apr 17 18:08:02 2008 +0000 @@ -19,12 +19,12 @@ /* * Sun/NeXT .au decoder for SDL_sound. - * Formats supported: 8 and 16 bit linear PCM, 8 bit µ-law. - * Files without valid header are assumed to be 8 bit µ-law, 8kHz, mono. + * Formats supported: 8 and 16 bit linear PCM, 8 bit µ-law. + * Files without valid header are assumed to be 8 bit µ-law, 8kHz, mono. * * Please see the file COPYING in the source's root directory. * - * This file written by Mattias Engdegård. (f91-men@nada.kth.se) + * This file written by Mattias EngdegÃ¥rd. (f91-men@nada.kth.se) */ #if HAVE_CONFIG_H @@ -61,7 +61,7 @@ { extensions_au, "Sun/NeXT audio file format", - "Mattias Engdegård <f91-men@nada.kth.se>", + "Mattias EngdegÃ¥rd <f91-men@nada.kth.se>", "http://www.icculus.org/SDL_sound/" }, @@ -99,7 +99,7 @@ enum { - AU_ENC_ULAW_8 = 1, /* 8-bit ISDN µ-law */ + AU_ENC_ULAW_8 = 1, /* 8-bit ISDN µ-law */ AU_ENC_LINEAR_8 = 2, /* 8-bit linear PCM */ AU_ENC_LINEAR_16 = 3, /* 16-bit linear PCM */ @@ -185,9 +185,9 @@ switch(dec->encoding) { case AU_ENC_ULAW_8: - /* Convert 8-bit µ-law to 16-bit linear on the fly. This is + /* Convert 8-bit µ-law to 16-bit linear on the fly. This is slightly wasteful if the audio driver must convert them - back, but µ-law only devices are rare (mostly _old_ Suns) */ + back, but µ-law only devices are rare (mostly _old_ Suns) */ sample->actual.format = AUDIO_S16SYS; break; @@ -224,11 +224,11 @@ { /* * A number of files in the wild have the .au extension but no valid - * header; these are traditionally assumed to be 8kHz µ-law. Handle + * header; these are traditionally assumed to be 8kHz µ-law. Handle * them here only if the extension is recognized. */ - SNDDBG(("AU: Invalid header, assuming raw 8kHz µ-law.\n")); + SNDDBG(("AU: Invalid header, assuming raw 8kHz µ-law.\n")); /* if seeking fails, we lose 24 samples. big deal */ SDL_RWseek(rw, -HDR_SIZE, SEEK_CUR); dec->encoding = AU_ENC_ULAW_8; @@ -267,7 +267,7 @@ } /* AU_close */ -/* table to convert from µ-law encoding to signed 16-bit samples, +/* table to convert from µ-law encoding to signed 16-bit samples, generated by a throwaway perl script */ static Sint16 ulaw_to_linear[256] = { -32124,-31100,-30076,-29052,-28028,-27004,-25980,-24956, @@ -317,7 +317,7 @@ buf = internal->buffer; if (dec->encoding == AU_ENC_ULAW_8) { - /* We read µ-law samples into the second half of the buffer, so + /* We read µ-law samples into the second half of the buffer, so we can expand them to 16-bit samples afterwards */ maxlen >>= 1; buf += maxlen;