From a66ef851ba41a86eee6aaa4f295fdc9243845e20 Mon Sep 17 00:00:00 2001 From: Michael Jerris Date: Thu, 29 Dec 2005 02:28:32 +0000 Subject: [PATCH] fix linefeeds git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@234 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- src/mod/mod_rawaudio/mod_rawaudio.c | 48 ++++++++++++++--------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/src/mod/mod_rawaudio/mod_rawaudio.c b/src/mod/mod_rawaudio/mod_rawaudio.c index 79449b14fc..fc5b4945b8 100644 --- a/src/mod/mod_rawaudio/mod_rawaudio.c +++ b/src/mod/mod_rawaudio/mod_rawaudio.c @@ -34,13 +34,13 @@ static const char modname[] = "mod_rawaudio"; -#ifndef MIN -#define MIN(a,b) ((a) < (b) ? (a) : (b)) -#endif - -#ifndef MAX -#define MAX(a,b) ((a) > (b) ? (a) : (b)) -#endif +#ifndef MIN +#define MIN(a,b) ((a) < (b) ? (a) : (b)) +#endif + +#ifndef MAX +#define MAX(a,b) ((a) > (b) ? (a) : (b)) +#endif struct raw_context { void *enc_resampler; @@ -54,23 +54,23 @@ struct raw_context { }; -static int resample(void *handle, double factor, float *src, int srclen, float *dst, int dstlen, int last) -{ - int o=0, srcused=0, srcpos=0, out=0; - - for(;;) { - int srcBlock = MIN(srclen-srcpos, srclen); - int lastFlag = (last && (srcBlock == srclen-srcpos)); - printf("resampling %d/%d (%d)\n", srcpos, srclen, MIN(dstlen-out, dstlen)); - o = resample_process(handle, factor, &src[srcpos], srcBlock, lastFlag, &srcused, &dst[out], dstlen-out); - srcpos += srcused; - if (o >= 0) - out += o; - if (o < 0 || (o == 0 && srcpos == srclen)) - break; - } - return out; -} +static int resample(void *handle, double factor, float *src, int srclen, float *dst, int dstlen, int last) +{ + int o=0, srcused=0, srcpos=0, out=0; + + for(;;) { + int srcBlock = MIN(srclen-srcpos, srclen); + int lastFlag = (last && (srcBlock == srclen-srcpos)); + printf("resampling %d/%d (%d)\n", srcpos, srclen, MIN(dstlen-out, dstlen)); + o = resample_process(handle, factor, &src[srcpos], srcBlock, lastFlag, &srcused, &dst[out], dstlen-out); + srcpos += srcused; + if (o >= 0) + out += o; + if (o < 0 || (o == 0 && srcpos == srclen)) + break; + } + return out; +} static switch_status switch_raw_init(switch_codec *codec, switch_codec_flag flags, const struct switch_codec_settings *codec_settings)