From 0ffdd2607f4ce56e4a35e959d1f5adcc07959320 Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Tue, 29 Jan 2013 23:24:51 -0600 Subject: Fix the majority of the compiler warnings unearthed by the addition of the new warning flags. --- Source/Core/AudioCommon/Src/DPL2Decoder.cpp | 70 ++++++++++++++--------------- 1 file changed, 35 insertions(+), 35 deletions(-) (limited to 'Source/Core/AudioCommon/Src/DPL2Decoder.cpp') diff --git a/Source/Core/AudioCommon/Src/DPL2Decoder.cpp b/Source/Core/AudioCommon/Src/DPL2Decoder.cpp index a5d2720878..6a63f696de 100644 --- a/Source/Core/AudioCommon/Src/DPL2Decoder.cpp +++ b/Source/Core/AudioCommon/Src/DPL2Decoder.cpp @@ -232,70 +232,70 @@ float passive_lock(float x) void matrix_decode(const float *in, const int k, const int il, const int ir, bool decode_rear, - const int dlbuflen, - float l_fwr, float r_fwr, - float lpr_fwr, float lmr_fwr, - float *adapt_l_gain, float *adapt_r_gain, - float *adapt_lpr_gain, float *adapt_lmr_gain, - float *lf, float *rf, float *lr, - float *rr, float *cf) + const int _dlbuflen, + float _l_fwr, float _r_fwr, + float _lpr_fwr, float _lmr_fwr, + float *_adapt_l_gain, float *_adapt_r_gain, + float *_adapt_lpr_gain, float *_adapt_lmr_gain, + float *_lf, float *_rf, float *_lr, + float *_rr, float *_cf) { static const float M9_03DB = 0.3535533906f; static const float MATAGCTRIG = 8.0f; /* (Fuzzy) AGC trigger */ static const float MATAGCDECAY = 1.0f; /* AGC baseline decay rate (1/samp.) */ static const float MATCOMPGAIN = 0.37f; /* Cross talk compensation gain, 0.50 - 0.55 is full cancellation. */ - const int kr = (k + olddelay) % dlbuflen; - float l_gain = (l_fwr + r_fwr) / (1 + l_fwr + l_fwr); - float r_gain = (l_fwr + r_fwr) / (1 + r_fwr + r_fwr); + const int kr = (k + olddelay) % _dlbuflen; + float l_gain = (_l_fwr + _r_fwr) / (1 + _l_fwr + _l_fwr); + float r_gain = (_l_fwr + _r_fwr) / (1 + _r_fwr + _r_fwr); /* The 2nd axis has strong gain fluctuations, and therefore require limits. The factor corresponds to the 1 / amplification of (Lt - Rt) when (Lt, Rt) is strongly correlated. (e.g. during dialogues). It should be bigger than -12 dB to prevent distortion. */ - float lmr_lim_fwr = lmr_fwr > M9_03DB * lpr_fwr ? lmr_fwr : M9_03DB * lpr_fwr; - float lpr_gain = (lpr_fwr + lmr_lim_fwr) / (1 + lpr_fwr + lpr_fwr); - float lmr_gain = (lpr_fwr + lmr_lim_fwr) / (1 + lmr_lim_fwr + lmr_lim_fwr); - float lmr_unlim_gain = (lpr_fwr + lmr_fwr) / (1 + lmr_fwr + lmr_fwr); + float lmr_lim_fwr = _lmr_fwr > M9_03DB * _lpr_fwr ? _lmr_fwr : M9_03DB * _lpr_fwr; + float lpr_gain = (_lpr_fwr + lmr_lim_fwr) / (1 + _lpr_fwr + _lpr_fwr); + float lmr_gain = (_lpr_fwr + lmr_lim_fwr) / (1 + lmr_lim_fwr + lmr_lim_fwr); + float lmr_unlim_gain = (_lpr_fwr + _lmr_fwr) / (1 + _lmr_fwr + _lmr_fwr); float lpr, lmr; float l_agc, r_agc, lpr_agc, lmr_agc; float f, d_gain, c_gain, c_agc_cfk; /*** AXIS NO. 1: (Lt, Rt) -> (C, Ls, Rs) ***/ /* AGC adaption */ - d_gain = (fabs(l_gain - *adapt_l_gain) + fabs(r_gain - *adapt_r_gain)) * 0.5f; + d_gain = (fabs(l_gain - *_adapt_l_gain) + fabs(r_gain - *_adapt_r_gain)) * 0.5f; f = d_gain * (1.0f / MATAGCTRIG); f = MATAGCDECAY - MATAGCDECAY / (1 + f * f); - *adapt_l_gain = (1 - f) * *adapt_l_gain + f * l_gain; - *adapt_r_gain = (1 - f) * *adapt_r_gain + f * r_gain; + *_adapt_l_gain = (1 - f) * *_adapt_l_gain + f * l_gain; + *_adapt_r_gain = (1 - f) * *_adapt_r_gain + f * r_gain; /* Matrix */ - l_agc = in[il] * passive_lock(*adapt_l_gain); - r_agc = in[ir] * passive_lock(*adapt_r_gain); - cf[k] = (l_agc + r_agc) * (float)M_SQRT1_2; + l_agc = in[il] * passive_lock(*_adapt_l_gain); + r_agc = in[ir] * passive_lock(*_adapt_r_gain); + _cf[k] = (l_agc + r_agc) * (float)M_SQRT1_2; if (decode_rear) { - lr[kr] = rr[kr] = (l_agc - r_agc) * (float)M_SQRT1_2; + _lr[kr] = _rr[kr] = (l_agc - r_agc) * (float)M_SQRT1_2; /* Stereo rear channel is steered with the same AGC steering as the decoding matrix. Note this requires a fast updating AGC at the order of 20 ms (which is the case here). */ - lr[kr] *= (l_fwr + l_fwr) / (1 + l_fwr + r_fwr); - rr[kr] *= (r_fwr + r_fwr) / (1 + l_fwr + r_fwr); + _lr[kr] *= (_l_fwr + _l_fwr) / (1 + _l_fwr + _r_fwr); + _rr[kr] *= (_r_fwr + _r_fwr) / (1 + _l_fwr + _r_fwr); } /*** AXIS NO. 2: (Lt + Rt, Lt - Rt) -> (L, R) ***/ lpr = (in[il] + in[ir]) * (float)M_SQRT1_2; lmr = (in[il] - in[ir]) * (float)M_SQRT1_2; /* AGC adaption */ - d_gain = fabs(lmr_unlim_gain - *adapt_lmr_gain); + d_gain = fabs(lmr_unlim_gain - *_adapt_lmr_gain); f = d_gain * (1.0f / MATAGCTRIG); f = MATAGCDECAY - MATAGCDECAY / (1 + f * f); - *adapt_lpr_gain = (1 - f) * *adapt_lpr_gain + f * lpr_gain; - *adapt_lmr_gain = (1 - f) * *adapt_lmr_gain + f * lmr_gain; + *_adapt_lpr_gain = (1 - f) * *_adapt_lpr_gain + f * lpr_gain; + *_adapt_lmr_gain = (1 - f) * *_adapt_lmr_gain + f * lmr_gain; /* Matrix */ - lpr_agc = lpr * passive_lock(*adapt_lpr_gain); - lmr_agc = lmr * passive_lock(*adapt_lmr_gain); - lf[k] = (lpr_agc + lmr_agc) * (float)M_SQRT1_2; - rf[k] = (lpr_agc - lmr_agc) * (float)M_SQRT1_2; + lpr_agc = lpr * passive_lock(*_adapt_lpr_gain); + lmr_agc = lmr * passive_lock(*_adapt_lmr_gain); + _lf[k] = (lpr_agc + lmr_agc) * (float)M_SQRT1_2; + _rf[k] = (lpr_agc - lmr_agc) * (float)M_SQRT1_2; /*** CENTER FRONT CANCELLATION ***/ /* A heuristic approach exploits that Lt + Rt gain contains the @@ -303,16 +303,16 @@ void matrix_decode(const float *in, const int k, const int il, the front and rear "cones" to concentrate Lt + Rt to C and introduce Lt - Rt in L, R. */ /* 0.67677 is the empirical lower bound for lpr_gain. */ - c_gain = 8 * (*adapt_lpr_gain - 0.67677f); + c_gain = 8 * (*_adapt_lpr_gain - 0.67677f); c_gain = c_gain > 0 ? c_gain : 0; /* c_gain should not be too high, not even reaching full cancellation (~ 0.50 - 0.55 at current AGC implementation), or the center will sound too narrow. */ c_gain = MATCOMPGAIN / (1 + c_gain * c_gain); - c_agc_cfk = c_gain * cf[k]; - lf[k] -= c_agc_cfk; - rf[k] -= c_agc_cfk; - cf[k] += c_agc_cfk + c_agc_cfk; + c_agc_cfk = c_gain * _cf[k]; + _lf[k] -= c_agc_cfk; + _rf[k] -= c_agc_cfk; + _cf[k] += c_agc_cfk + c_agc_cfk; } void dpl2decode(float *samples, int numsamples, float *out) -- cgit v1.2.3 From edd9d0e0ef6898a0528ac6389e93e9fca6132ff6 Mon Sep 17 00:00:00 2001 From: lioncash Date: Tue, 19 Mar 2013 21:51:12 -0400 Subject: Clean up more space/tab mismatches in AudioCommon, Common, and VideoCommon. Not planning to touch Core since it's the most actively changed part of the project. --- Source/Core/AudioCommon/Src/DPL2Decoder.cpp | 52 ++++++++++++++--------------- 1 file changed, 26 insertions(+), 26 deletions(-) (limited to 'Source/Core/AudioCommon/Src/DPL2Decoder.cpp') diff --git a/Source/Core/AudioCommon/Src/DPL2Decoder.cpp b/Source/Core/AudioCommon/Src/DPL2Decoder.cpp index 6a63f696de..c33333fb47 100644 --- a/Source/Core/AudioCommon/Src/DPL2Decoder.cpp +++ b/Source/Core/AudioCommon/Src/DPL2Decoder.cpp @@ -130,15 +130,15 @@ returns 0 if OK, -1 if fail */ float* design_fir(unsigned int *n, float* fc, float opt) { - unsigned int o = *n & 1; // Indicator for odd filter length - unsigned int end = ((*n + 1) >> 1) - o; // Loop end - unsigned int i; // Loop index + unsigned int o = *n & 1; // Indicator for odd filter length + unsigned int end = ((*n + 1) >> 1) - o; // Loop end + unsigned int i; // Loop index - float k1 = 2 * float(M_PI); // 2*pi*fc1 - float k2 = 0.5f * (float)(1 - o);// Constant used if the filter has even length - float g = 0.0f; // Gain - float t1; // Temporary variables - float fc1; // Cutoff frequencies + float k1 = 2 * float(M_PI); // 2*pi*fc1 + float k2 = 0.5f * (float)(1 - o); // Constant used if the filter has even length + float g = 0.0f; // Gain + float t1; // Temporary variables + float fc1; // Cutoff frequencies // Sanity check if(*n==0) return NULL; @@ -241,18 +241,18 @@ void matrix_decode(const float *in, const int k, const int il, float *_rr, float *_cf) { static const float M9_03DB = 0.3535533906f; - static const float MATAGCTRIG = 8.0f; /* (Fuzzy) AGC trigger */ - static const float MATAGCDECAY = 1.0f; /* AGC baseline decay rate (1/samp.) */ + static const float MATAGCTRIG = 8.0f; /* (Fuzzy) AGC trigger */ + static const float MATAGCDECAY = 1.0f; /* AGC baseline decay rate (1/samp.) */ static const float MATCOMPGAIN = 0.37f; /* Cross talk compensation gain, 0.50 - 0.55 is full cancellation. */ const int kr = (k + olddelay) % _dlbuflen; float l_gain = (_l_fwr + _r_fwr) / (1 + _l_fwr + _l_fwr); float r_gain = (_l_fwr + _r_fwr) / (1 + _r_fwr + _r_fwr); - /* The 2nd axis has strong gain fluctuations, and therefore require - limits. The factor corresponds to the 1 / amplification of (Lt - - Rt) when (Lt, Rt) is strongly correlated. (e.g. during - dialogues). It should be bigger than -12 dB to prevent - distortion. */ + // The 2nd axis has strong gain fluctuations, and therefore require + // limits. The factor corresponds to the 1 / amplification of (Lt + // - Rt) when (Lt, Rt) is strongly correlated. (e.g. during + // dialogues). It should be bigger than -12 dB to prevent + // distortion. float lmr_lim_fwr = _lmr_fwr > M9_03DB * _lpr_fwr ? _lmr_fwr : M9_03DB * _lpr_fwr; float lpr_gain = (_lpr_fwr + lmr_lim_fwr) / (1 + _lpr_fwr + _lpr_fwr); float lmr_gain = (_lpr_fwr + lmr_lim_fwr) / (1 + lmr_lim_fwr + lmr_lim_fwr); @@ -275,9 +275,9 @@ void matrix_decode(const float *in, const int k, const int il, if (decode_rear) { _lr[kr] = _rr[kr] = (l_agc - r_agc) * (float)M_SQRT1_2; - /* Stereo rear channel is steered with the same AGC steering as - the decoding matrix. Note this requires a fast updating AGC - at the order of 20 ms (which is the case here). */ + // Stereo rear channel is steered with the same AGC steering as + // the decoding matrix. Note this requires a fast updating AGC + // at the order of 20 ms (which is the case here). _lr[kr] *= (_l_fwr + _l_fwr) / (1 + _l_fwr + _r_fwr); _rr[kr] *= (_r_fwr + _r_fwr) / (1 + _l_fwr + _r_fwr); } @@ -298,16 +298,16 @@ void matrix_decode(const float *in, const int k, const int il, _rf[k] = (lpr_agc - lmr_agc) * (float)M_SQRT1_2; /*** CENTER FRONT CANCELLATION ***/ - /* A heuristic approach exploits that Lt + Rt gain contains the - information about Lt, Rt correlation. This effectively reshapes - the front and rear "cones" to concentrate Lt + Rt to C and - introduce Lt - Rt in L, R. */ + // A heuristic approach exploits that Lt + Rt gain contains the + // information about Lt, Rt correlation. This effectively reshapes + // the front and rear "cones" to concentrate Lt + Rt to C and + // introduce Lt - Rt in L, R. /* 0.67677 is the empirical lower bound for lpr_gain. */ c_gain = 8 * (*_adapt_lpr_gain - 0.67677f); c_gain = c_gain > 0 ? c_gain : 0; - /* c_gain should not be too high, not even reaching full - cancellation (~ 0.50 - 0.55 at current AGC implementation), or - the center will sound too narrow. */ + // c_gain should not be too high, not even reaching full + // cancellation (~ 0.50 - 0.55 at current AGC implementation), or + // the center will sound too narrow. */ c_gain = MATCOMPGAIN / (1 + c_gain * c_gain); c_agc_cfk = c_gain * _cf[k]; _lf[k] -= c_agc_cfk; @@ -317,7 +317,7 @@ void matrix_decode(const float *in, const int k, const int il, void dpl2decode(float *samples, int numsamples, float *out) { - static const unsigned int FWRDURATION = 240; /* FWR average duration (samples) */ + static const unsigned int FWRDURATION = 240; // FWR average duration (samples) static const int cfg_delay = 0; static const unsigned int fmt_freq = 48000; static const unsigned int fmt_nchannels = 2; // input channels -- cgit v1.2.3