From d1ded7310a110b5977f6d3372047331de4e90d01 Mon Sep 17 00:00:00 2001 From: Paul B Mahol Date: Thu, 11 May 2023 20:10:57 +0200 Subject: [PATCH] avfilter/af_surround: reduce double usage --- libavfilter/af_surround.c | 54 +++++++++++++++++++-------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/libavfilter/af_surround.c b/libavfilter/af_surround.c index 925cb6e66c..bcc89053a4 100644 --- a/libavfilter/af_surround.c +++ b/libavfilter/af_surround.c @@ -330,16 +330,16 @@ static void angle_transform(float *x, float *y, float angle) if (angle == 90.f) return; - reference = angle * M_PI / 180.f; + reference = angle * (float)M_PI / 180.f; r = hypotf(*x, *y); a = atan2f(*x, *y); r /= r_distance(a); - if (fabsf(a) <= M_PI_4) - a *= reference / M_PI_2; + if (fabsf(a) <= (float)M_PI_4) + a *= reference / (float)M_PI_2; else - a = M_PI + (-2.f * M_PI + reference) * (M_PI - fabsf(a)) * FFDIFFSIGN(a, 0.f) / (3.f * M_PI_2); + a = (float)M_PI + (-2.f * (float)M_PI + reference) * ((float)M_PI - fabsf(a)) * FFDIFFSIGN(a, 0.f) / (3.f * (float)M_PI_2); r *= r_distance(a); @@ -366,16 +366,16 @@ static void focus_transform(float *x, float *y, float focus) static void stereo_position(float a, float p, float *x, float *y) { av_assert2(a >= -1.f && a <= 1.f); - av_assert2(p >= 0.f && p <= M_PI); - *x = av_clipf(a+a*fmaxf(0.f, p*p-M_PI_2), -1.f, 1.f); - *y = av_clipf(cosf(a*M_PI_2+M_PI)*cosf(M_PI_2-p/M_PI)*M_LN10+1.f, -1.f, 1.f); + av_assert2(p >= 0.f && p <= (float)M_PI); + *x = av_clipf(a+a*fmaxf(0.f, p*p-(float)M_PI_2), -1.f, 1.f); + *y = av_clipf(cosf(a*(float)M_PI_2+(float)M_PI)*cosf((float)M_PI_2-p/(float)M_PI)*(float)M_LN10+1.f, -1.f, 1.f); } static inline void get_lfe(int output_lfe, int n, float lowcut, float highcut, float *lfe_mag, float c_mag, float *mag_total, int lfe_mode) { if (output_lfe && n < highcut) { - *lfe_mag = n < lowcut ? 1.f : .5f*(1.f+cosf(M_PI*(lowcut-n)/(lowcut-highcut))); + *lfe_mag = n < lowcut ? 1.f : .5f*(1.f+cosf((float)M_PI*(lowcut-n)/(lowcut-highcut))); *lfe_mag *= c_mag; if (lfe_mode) *mag_total -= *lfe_mag; @@ -413,7 +413,7 @@ static void calculate_factors(AVFilterContext *ctx, int ch, int chan) break; case AV_CHAN_LOW_FREQUENCY: for (int n = 0; n < rdft_size; n++) - factor[n] = powf(1.f - fabsf(x[n]), f_x) * powf((1.f - fabs(y[n])), f_y); + factor[n] = powf(1.f - fabsf(x[n]), f_x) * powf((1.f - fabsf(y[n])), f_y); break; case AV_CHAN_BACK_CENTER: for (int n = 0; n < rdft_size; n++) @@ -777,8 +777,8 @@ static void filter_stereo(AVFilterContext *ctx) mag_sum = mag_sum < MIN_MAG_SUM ? 1.f : mag_sum; mag_dif = (l_mag - r_mag) / mag_sum; - if (phase_dif > M_PI) - phase_dif = 2.f * M_PI - phase_dif; + if (phase_dif > (float)M_PI) + phase_dif = 2.f * (float)M_PI - phase_dif; stereo_position(mag_dif, phase_dif, &x, &y); angle_transform(&x, &y, angle); @@ -832,8 +832,8 @@ static void filter_2_1(AVFilterContext *ctx) mag_sum = mag_sum < MIN_MAG_SUM ? 1.f : mag_sum; mag_dif = (l_mag - r_mag) / mag_sum; - if (phase_dif > M_PI) - phase_dif = 2.f * M_PI - phase_dif; + if (phase_dif > (float)M_PI) + phase_dif = 2.f * (float)M_PI - phase_dif; stereo_position(mag_dif, phase_dif, &x, &y); angle_transform(&x, &y, angle); @@ -889,8 +889,8 @@ static void filter_surround(AVFilterContext *ctx) mag_sum = mag_sum < MIN_MAG_SUM ? 1.f : mag_sum; mag_dif = (l_mag - r_mag) / mag_sum; - if (phase_dif > M_PI) - phase_dif = 2.f * M_PI - phase_dif; + if (phase_dif > (float)M_PI) + phase_dif = 2.f * (float)M_PI - phase_dif; stereo_position(mag_dif, phase_dif, &x, &y); angle_transform(&x, &y, angle); @@ -946,11 +946,11 @@ static void filter_5_0_side(AVFilterContext *ctx) float xl, yl; float xr, yr; - if (phase_difl > M_PI) - phase_difl = 2.f * M_PI - phase_difl; + if (phase_difl > (float)M_PI) + phase_difl = 2.f * (float)M_PI - phase_difl; - if (phase_difr > M_PI) - phase_difr = 2.f * M_PI - phase_difr; + if (phase_difr > (float)M_PI) + phase_difr = 2.f * (float)M_PI - phase_difr; stereo_position(mag_difl, phase_difl, &xl, &yl); stereo_position(mag_difr, phase_difr, &xr, &yr); @@ -1005,11 +1005,11 @@ static void filter_5_1_side(AVFilterContext *ctx) float xl, yl; float xr, yr; - if (phase_difl > M_PI) - phase_difl = 2.f * M_PI - phase_difl; + if (phase_difl > (float)M_PI) + phase_difl = 2.f * (float)M_PI - phase_difl; - if (phase_difr > M_PI) - phase_difr = 2.f * M_PI - phase_difr; + if (phase_difr > (float)M_PI) + phase_difr = 2.f * (float)M_PI - phase_difr; stereo_position(mag_difl, phase_difl, &xl, &yl); stereo_position(mag_difr, phase_difr, &xr, &yr); @@ -1064,11 +1064,11 @@ static void filter_5_1_back(AVFilterContext *ctx) float xl, yl; float xr, yr; - if (phase_difl > M_PI) - phase_difl = 2.f * M_PI - phase_difl; + if (phase_difl > (float)M_PI) + phase_difl = 2.f * (float)M_PI - phase_difl; - if (phase_difr > M_PI) - phase_difr = 2.f * M_PI - phase_difr; + if (phase_difr > (float)M_PI) + phase_difr = 2.f * (float)M_PI - phase_difr; stereo_position(mag_difl, phase_difl, &xl, &yl); stereo_position(mag_difr, phase_difr, &xr, &yr);