From 9b0693d8ef564b16d1cff70588baf86a24d41d82 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Sun, 12 Oct 2008 12:02:54 +0200 Subject: [PATCH] pcm_utils: support any number of channels in pcm_sizeOfConvBuffer() When calculating the conversion buffer size, don't hard-code the formulas for only mono<->stereo. --- src/pcm_utils.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/src/pcm_utils.c b/src/pcm_utils.c index cb6f93f63..200c657de 100644 --- a/src/pcm_utils.c +++ b/src/pcm_utils.c @@ -568,17 +568,8 @@ size_t pcm_sizeOfConvBuffer(const struct audio_format *inFormat, size_t inSize, } if (inFormat->channels != outFormat->channels) { - switch (inFormat->channels) { - case 1: - outSize = (outSize >> 1) << 2; - break; - case 2: - outSize >>= 1; - break; - default: - FATAL("only 1 or 2 channels are supported " - "for conversion!\n"); - } + outSize /= inFormat->channels; + outSize *= outFormat->channels; } outSize /= shift;