diff options
author | Kinsey Moore <kmoore@digium.com> | 2012-03-22 19:51:16 +0000 |
---|---|---|
committer | Kinsey Moore <kmoore@digium.com> | 2012-03-22 19:51:16 +0000 |
commit | c5b3db1956a3db2446b0310b3a7d59961fe3e089 (patch) | |
tree | 530b55034f5adfb0c7106ae1194679a031afc888 /main/ulaw.c | |
parent | 1d1c28ac4b09df2b663123e55239e411b8f5ad26 (diff) |
Kill off red blobs in most of main/*
Everything still compiled after making these changes, so I assume these
whitespace-only changes didn't break anything (and shouldn't have).
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@360190 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/ulaw.c')
-rw-r--r-- | main/ulaw.c | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/main/ulaw.c b/main/ulaw.c index 650b0da36..215790ecc 100644 --- a/main/ulaw.c +++ b/main/ulaw.c @@ -20,7 +20,7 @@ * * \brief u-Law to Signed linear conversion * - * \author Mark Spencer <markster@digium.com> + * \author Mark Spencer <markster@digium.com> */ #include "asterisk.h" @@ -68,25 +68,25 @@ static unsigned char linear2ulaw(short sample) 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7 }; int sign, exponent, mantissa; unsigned char ulawbyte; - + /* Get the sample into sign-magnitude. */ sign = (sample >> 8) & 0x80; /* set aside the sign */ if (sign != 0) sample = -sample; /* get magnitude */ if (sample > CLIP) sample = CLIP; /* clip the magnitude */ - + /* Convert from 16 bit linear to ulaw. */ sample = sample + BIAS; exponent = exp_lut[(sample >> 7) & 0xFF]; mantissa = (sample >> (exponent + 3)) & 0x0F; ulawbyte = ~(sign | (exponent << 4) | mantissa); - + #ifdef ZEROTRAP if (ulawbyte == 0) ulawbyte = 0x02; /* optional CCITT trap */ #endif - + return ulawbyte; } @@ -116,23 +116,23 @@ static unsigned char linear2ulaw(short sample, int full_coding) 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7 }; unsigned sign, exponent, mantissa, mag; unsigned char ulawbyte; - + /* Get the sample into sign-magnitude. */ ast_ulaw_get_sign_mag(sample, &sign, &mag); if (mag > CLIP) mag = CLIP; /* clip the magnitude */ - + sign = (sample >> 8) & 0x80; /* set aside the sign */ - if (sign != 0) + if (sign != 0) sample = -sample; /* get magnitude */ if (sample > CLIP) sample = CLIP; /* clip the magnitude */ - + /* Convert from 16 bit linear to ulaw. */ mag += BIAS; exponent = exp_lut[(mag >> 7) & 0xFF]; mantissa = (mag >> (exponent + 3)) & 0x0F; - + if (full_coding) { /* full encoding, with sign and xform */ ulawbyte = ~(sign | (exponent << 4) | mantissa); @@ -147,13 +147,13 @@ static unsigned char linear2ulaw(short sample, int full_coding) return ulawbyte; } - + static inline short ulaw2linear(unsigned char ulawbyte) { unsigned exponent, mantissa; short sample; static const short etab[]={0,132,396,924,1980,4092,8316,16764}; - + ulawbyte = ~ulawbyte; exponent = (ulawbyte & 0x70) >> 4; mantissa = ulawbyte & 0x0f; @@ -171,7 +171,7 @@ static inline short ulaw2linear(unsigned char ulawbyte) void ast_ulaw_init(void) { int i; - + /* * Set up mu-law conversion table */ @@ -179,7 +179,7 @@ void ast_ulaw_init(void) for (i = 0;i < 256;i++) { short mu,e,f,y; static const short etab[]={0,132,396,924,1980,4092,8316,16764}; - + mu = 255-i; e = (mu & 0x70)/16; f = mu & 0x0f; @@ -193,7 +193,7 @@ void ast_ulaw_init(void) __ast_lin2mu[((unsigned short)i) >> 2] = linear2ulaw(i); } #else - + for (i = 0; i < 256; i++) { __ast_mulaw[i] = ulaw2linear(i); } @@ -202,7 +202,7 @@ void ast_ulaw_init(void) AST_LIN2MU_LOOKUP(i) = linear2ulaw(i, 0 /* half-cooked */); } #endif - + #ifdef TEST_CODING_TABLES for (i = -32768; i < 32768; ++i) { #ifndef G711_NEW_ALGORITHM @@ -214,7 +214,7 @@ void ast_ulaw_init(void) unsigned char e2 = AST_LIN2MU(i); short d2 = ulaw2linear(e2); short d3 = AST_MULAW(e1); - + if (e1 != e2 || d1 != d3 || d2 != d3) { ast_log(LOG_WARNING, "u-Law coding tables test failed on %d: e1=%u, e2=%u, d1=%d, d2=%d\n", i, (unsigned)e1, (unsigned)e2, (int)d1, (int)d2); @@ -222,7 +222,7 @@ void ast_ulaw_init(void) } ast_log(LOG_NOTICE, "u-Law coding table test complete.\n"); #endif /* TEST_CODING_TABLES */ - + #ifdef TEST_TANDEM_TRANSCODING /* tandem transcoding test */ for (i = -32768; i < 32768; ++i) { @@ -232,10 +232,10 @@ void ast_ulaw_init(void) short d2 = AST_MULAW(e2); unsigned char e3 = AST_LIN2MU(d2); short d3 = AST_MULAW(e3); - + if (i < 0 && e1 == 0x7f && e2 == 0xff && e3 == 0xff) continue; /* known and normal negative 0 case */ - + if (e1 != e2 || e2 != e3 || d1 != d2 || d2 != d3) { ast_log(LOG_WARNING, "u-Law tandem transcoding test failed on %d: e1=%u, e2=%u, d1=%d, d2=%d, d3=%d\n", i, (unsigned)e1, (unsigned)e2, (int)d1, (int)d2, (int)d3); |