Split pcm_convertAudioFormat into separate functions for bitrate, channel,

and samplerate conversion. This makes the code much easier to read, and fixes a few bugs that were previously there. git-svn-id: https://svn.musicpd.org/mpd/trunk@6224 09075e82-0dd4-0310-85a5-a0d7c8717e4f

Split pcm_convertAudioFormat into separate functions for bitrate, channel,
407497c4 · J. Alexander Treuman · e6d7663b · 407497c4 · 407497c4 · 407497c4
Commit 407497c4 authored May 22, 2007 by J. Alexander Treuman
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 18 deletions

audioOutput.c src/audioOutput.c +3 -5

outputBuffer.c src/outputBuffer.c +2 -7

pcm_utils.c src/pcm_utils.c +0 -0

pcm_utils.h src/pcm_utils.h +5 -6

No files found.
--- a/src/audioOutput.c
+++ b/src/audioOutput.c
@@ -194,11 +194,9 @@ int openAudioOutput(AudioOutput * audioOutput, AudioFormat * audioFormat)
 static void convertAudioFormat(AudioOutput * audioOutput, char **chunkArgPtr,
 			       int *sizeArgPtr)
 {
-	int size =
+	int size = pcm_sizeOfConvBuffer(&(audioOutput->inAudioFormat),
-		pcm_sizeOfOutputBufferForAudioFormatConversion(
+                                        *sizeArgPtr,
-				&(audioOutput->inAudioFormat),
+                                        &(audioOutput->outAudioFormat));
-				*sizeArgPtr,
-				&(audioOutput->outAudioFormat));
 	if (size > audioOutput->convBufferLen) {
 		audioOutput->convBuffer =

--- a/src/outputBuffer.c
+++ b/src/outputBuffer.c
@@ -82,13 +82,8 @@ int sendDataToOutputBuffer(OutputBuffer * cb, InputStream * inStream,
 		data = dataIn;
 		datalen = dataInLen;
 	} else {
-		datalen =
+		datalen = pcm_sizeOfConvBuffer(&(dc->audioFormat), dataInLen,
-		    pcm_sizeOfOutputBufferForAudioFormatConversion(&
+		                               &(cb->audioFormat));
-								   (dc->
-								    audioFormat),
-								   dataInLen,
-								   &(cb->
-								     audioFormat));
 		if (datalen > convBufferLen) {
 			convBuffer = xrealloc(convBuffer, datalen);
 			convBufferLen = datalen;

--- a/src/pcm_utils.c
+++ b/src/pcm_utils.c
--- a/src/pcm_utils.h
+++ b/src/pcm_utils.h
@@ -26,15 +26,14 @@
 #include <stdlib.h>
 void pcm_volumeChange(char *buffer, int bufferSize, AudioFormat * format,
-		      int volume);
+                      int volume);
 void pcm_mix(char *buffer1, char *buffer2, size_t bufferSize1,
-	     size_t bufferSize2, AudioFormat * format, float portion1);
+             size_t bufferSize2, AudioFormat * format, float portion1);
 void pcm_convertAudioFormat(AudioFormat * inFormat, char *inBuffer, size_t
-			    inSize, AudioFormat * outFormat, char *outBuffer);
+                            inSize, AudioFormat * outFormat, char *outBuffer);
-size_t pcm_sizeOfOutputBufferForAudioFormatConversion(AudioFormat * inFormat,
+size_t pcm_sizeOfConvBuffer(AudioFormat * inFormat, size_t inSize,
-						      size_t inSize,
+                            AudioFormat * outFormat);
-						      AudioFormat * outFormat);
 #endif