oysteikt/mpd
oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Tidying up pcm_utils.c a bit more.

Browse Source 
git-svn-id: https://svn.musicpd.org/mpd/trunk@6230 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
J. Alexander Treuman 2007-05-23 11:04:04 +00:00
parent fbb3a94f17
commit 495e1b6cf9
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/pcm_utils.c
View File

@ -275,7 +275,7 @@ static int pcm_convertSampleRate(mpd_sint8 channels, mpd_uint32 inSampleRate,
} }
#endif /* !HAVE_LIBSAMPLERATE */ #endif /* !HAVE_LIBSAMPLERATE */
static char *pcm_convertChannels(mpd_sint8 inChannels, char *inBuffer, static char *pcm_convertChannels(mpd_sint8 channels, char *inBuffer,
size_t inSize, size_t *outSize) size_t inSize, size_t *outSize)
{ {
static char *buf; static char *buf;
@ -285,7 +285,7 @@ static char *pcm_convertChannels(mpd_sint8 inChannels, char *inBuffer,
mpd_sint16 *out; mpd_sint16 *out;
int inSamples, i; int inSamples, i;
switch (inChannels) { switch (channels) {
/* convert from 1 -> 2 channels */ /* convert from 1 -> 2 channels */
case 1: case 1:
*outSize = (inSize >> 1) << 2; *outSize = (inSize >> 1) << 2;
@ -329,7 +329,7 @@ static char *pcm_convertChannels(mpd_sint8 inChannels, char *inBuffer,
return outBuffer; return outBuffer;
} }
static char *pcm_convertTo16bit(mpd_sint8 inBits, char *inBuffer, size_t inSize, static char *pcm_convertTo16bit(mpd_sint8 bits, char *inBuffer, size_t inSize,
size_t *outSize) size_t *outSize)
{ {
static char *buf; static char *buf;
@ -339,7 +339,7 @@ static char *pcm_convertTo16bit(mpd_sint8 inBits, char *inBuffer, size_t inSize,
mpd_sint16 *out; mpd_sint16 *out;
int i; int i;
switch (inBits) { switch (bits) {
case 8: case 8:
*outSize = inSize << 1; *outSize = inSize << 1;
if (*outSize > len) { if (*outSize > len) {
@ -405,12 +405,14 @@ void pcm_convertAudioFormat(AudioFormat * inFormat, char *inBuffer,
size_t pcm_sizeOfConvBuffer(AudioFormat * inFormat, size_t inSize, size_t pcm_sizeOfConvBuffer(AudioFormat * inFormat, size_t inSize,
AudioFormat * outFormat) AudioFormat * outFormat)
{ {
const int shift = sizeof(mpd_sint16) * outFormat->channels; const double ratio = (double)outFormat->sampleRate /
(double)inFormat->sampleRate;
const int shift = 2 * outFormat->channels;
size_t outSize = inSize; size_t outSize = inSize;
switch (inFormat->bits) { switch (inFormat->bits) {
case 8: case 8:
outSize = outSize << 1; outSize <<= 1;
break; break;
case 16: case 16:
break; break;
@ -431,8 +433,7 @@ size_t pcm_sizeOfConvBuffer(AudioFormat * inFormat, size_t inSize,
} }
outSize /= shift; outSize /= shift;
outSize = floor(0.5 + (double)outSize * outSize = floor(0.5 + (double)outSize * ratio);
((double)outFormat->sampleRate / (double)inFormat->sampleRate));
outSize *= shift; outSize *= shift;
return outSize; return outSize;