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

Reindenting

Browse Source 
git-svn-id: https://svn.musicpd.org/mpd/trunk@6199 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
J. Alexander Treuman 2007-05-22 15:02:25 +00:00
parent 92ff09881a
commit f2850a66f0
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/pcm_utils.c
View File

@ -32,7 +32,7 @@
#endif #endif
void pcm_volumeChange(char *buffer, int bufferSize, AudioFormat * format, void pcm_volumeChange(char *buffer, int bufferSize, AudioFormat * format,
int volume) int volume)
{ {
mpd_sint32 temp32; mpd_sint32 temp32;
mpd_sint8 *buffer8 = (mpd_sint8 *) buffer; mpd_sint8 *buffer8 = (mpd_sint8 *) buffer;
@ -83,8 +83,8 @@ void pcm_volumeChange(char *buffer, int bufferSize, AudioFormat * format,
} }
static void pcm_add(char *buffer1, char *buffer2, size_t bufferSize1, static void pcm_add(char *buffer1, char *buffer2, size_t bufferSize1,
size_t bufferSize2, int vol1, int vol2, size_t bufferSize2, int vol1, int vol2,
AudioFormat * format) AudioFormat * format)
{ {
mpd_sint32 temp32; mpd_sint32 temp32;
mpd_sint8 *buffer8_1 = (mpd_sint8 *) buffer1; mpd_sint8 *buffer8_1 = (mpd_sint8 *) buffer1;
@ -139,7 +139,7 @@ static void pcm_add(char *buffer1, char *buffer2, size_t bufferSize1,
} }
void pcm_mix(char *buffer1, char *buffer2, size_t bufferSize1, void pcm_mix(char *buffer1, char *buffer2, size_t bufferSize1,
size_t bufferSize2, AudioFormat * format, float portion1) size_t bufferSize2, AudioFormat * format, float portion1)
{ {
int vol1; int vol1;
float s = sin(M_PI_2 * portion1); float s = sin(M_PI_2 * portion1);
@ -153,7 +153,8 @@ void pcm_mix(char *buffer1, char *buffer2, size_t bufferSize1,
} }
#ifdef HAVE_LIBSAMPLERATE #ifdef HAVE_LIBSAMPLERATE
static int pcm_getSamplerateConverter(void) { static int pcm_getSamplerateConverter(void)
{
const char *conf, *test; const char *conf, *test;
int convalgo = SRC_SINC_FASTEST; int convalgo = SRC_SINC_FASTEST;
int newalgo; int newalgo;
@ -185,8 +186,9 @@ static int pcm_getSamplerateConverter(void) {
#endif #endif
/* outFormat bits must be 16 and channels must be 2! */ /* outFormat bits must be 16 and channels must be 2! */
void pcm_convertAudioFormat(AudioFormat * inFormat, char *inBuffer, size_t void pcm_convertAudioFormat(AudioFormat * inFormat, char *inBuffer,
inSize, AudioFormat * outFormat, char *outBuffer) size_t inSize, AudioFormat * outFormat,
char *outBuffer)
{ {
static char *bitConvBuffer; static char *bitConvBuffer;
static int bitConvBufferLength; static int bitConvBufferLength;
@ -376,8 +378,8 @@ void pcm_convertAudioFormat(AudioFormat * inFormat, char *inBuffer, size_t
} }
size_t pcm_sizeOfOutputBufferForAudioFormatConversion(AudioFormat * inFormat, size_t pcm_sizeOfOutputBufferForAudioFormatConversion(AudioFormat * inFormat,
size_t inSize, size_t inSize,
AudioFormat * outFormat) AudioFormat * outFormat)
{ {
const int shift = sizeof(mpd_sint16) * outFormat->channels; const int shift = sizeof(mpd_sint16) * outFormat->channels;
size_t outSize = inSize; size_t outSize = inSize;
@ -404,7 +406,7 @@ size_t pcm_sizeOfOutputBufferForAudioFormatConversion(AudioFormat * inFormat,
} }
} }
outSize /= shift; outSize /= shift;
outSize = floor(0.5 + (double)outSize * outSize = floor(0.5 + (double)outSize *
((double)outFormat->sampleRate / (double)inFormat->sampleRate)); ((double)outFormat->sampleRate / (double)inFormat->sampleRate));
outSize *= shift; outSize *= shift;