diff options
author | Yu-Hsuan Hsu <yuhsuan@chromium.org> | 2021-03-08 17:18:44 +0800 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2021-03-09 07:03:49 +0000 |
commit | 5dd2c24a30c08118bc889ce04a35973f05cac38d (patch) | |
tree | a5afe45b52782fed9f79b3c7d35100b25e887297 | |
parent | a7ea3afab29f4376039a4ff6f6f7d3432754053f (diff) | |
download | adhd-5dd2c24a30c08118bc889ce04a35973f05cac38d.tar.gz |
adhd: Replace the use of master_linear_gain to main_linear_gain
Ableist language like master should be removed.
Replace the use of master_linear_gain to main_linear_gain.
BUG=b:167649426
TEST=Built and run cras successfully.
Change-Id: Ib90a0717fbbafb3cf99f9967b24e2c20beb2a2b2
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/adhd/+/2739022
Reviewed-by: En-Shuo Hsu <enshuo@chromium.org>
Reviewed-by: Cheng-Yi Chiang <cychiang@chromium.org>
Commit-Queue: Yu-Hsuan Hsu <yuhsuan@chromium.org>
Tested-by: Yu-Hsuan Hsu <yuhsuan@chromium.org>
-rw-r--r-- | cras/src/dsp/drc.c | 2 | ||||
-rw-r--r-- | cras/src/dsp/drc_kernel.c | 24 | ||||
-rw-r--r-- | cras/src/dsp/drc_kernel.h | 2 | ||||
-rw-r--r-- | scripts/audio_tuning/frontend/audio.js | 8 |
4 files changed, 18 insertions, 18 deletions
diff --git a/cras/src/dsp/drc.c b/cras/src/dsp/drc.c index 1b2639a0..e6098419 100644 --- a/cras/src/dsp/drc.c +++ b/cras/src/dsp/drc.c @@ -104,7 +104,7 @@ static void set_default_parameters(struct drc *drc) param[PARAM_RELEASE_ZONE3] = 0.42f; param[PARAM_RELEASE_ZONE4] = 0.98f; - /* This is effectively a master volume on the compressed + /* This is effectively a main volume on the compressed * signal */ param[PARAM_POST_GAIN] = 0; /* dB */ param[PARAM_ENABLED] = 0; diff --git a/cras/src/dsp/drc_kernel.c b/cras/src/dsp/drc_kernel.c index c0eb100b..8c3404fc 100644 --- a/cras/src/dsp/drc_kernel.c +++ b/cras/src/dsp/drc_kernel.c @@ -257,7 +257,7 @@ void dk_set_parameters(struct drc_kernel *dk, float db_threshold, float db_knee, /* Empirical/perceptual tuning. */ full_range_makeup_gain = powf(full_range_makeup_gain, 0.6f); - dk->master_linear_gain = + dk->main_linear_gain = decibels_to_linear(db_post_gain) * full_range_makeup_gain; /* Attack parameters. */ @@ -566,7 +566,7 @@ static void dk_update_detector_average(struct drc_kernel *dk) #include <arm_neon.h> static void dk_compress_output(struct drc_kernel *dk) { - const float master_linear_gain = dk->master_linear_gain; + const float main_linear_gain = dk->main_linear_gain; const float envelope_rate = dk->envelope_rate; const float scaled_desired_gain = dk->scaled_desired_gain; const float compressor_gain = dk->compressor_gain; @@ -638,7 +638,7 @@ static void dk_compress_output(struct drc_kernel *dk) [A7]"w"(A7), [base]"w"(vdupq_n_f32(scaled_desired_gain)), [r4]"w"(vdupq_n_f32(r*r*r*r)), - [g]"w"(vdupq_n_f32(master_linear_gain)) + [g]"w"(vdupq_n_f32(main_linear_gain)) : /* clobber */ "memory", "cc"); // clang-format on @@ -698,7 +698,7 @@ static void dk_compress_output(struct drc_kernel *dk) [A7]"w"(A7), [one]"w"(vdupq_n_f32(1)), [r4]"w"(vdupq_n_f32(r*r*r*r)), - [g]"w"(vdupq_n_f32(master_linear_gain)) + [g]"w"(vdupq_n_f32(main_linear_gain)) : /* clobber */ "memory", "cc"); // clang-format on @@ -709,7 +709,7 @@ static void dk_compress_output(struct drc_kernel *dk) #include <emmintrin.h> static void dk_compress_output(struct drc_kernel *dk) { - const float master_linear_gain = dk->master_linear_gain; + const float main_linear_gain = dk->main_linear_gain; const float envelope_rate = dk->envelope_rate; const float scaled_desired_gain = dk->scaled_desired_gain; const float compressor_gain = dk->compressor_gain; @@ -789,7 +789,7 @@ static void dk_compress_output(struct drc_kernel *dk) [A7]"x"(A7), [base]"x"(_mm_set1_ps(scaled_desired_gain)), [r4]"x"(_mm_set1_ps(r*r*r*r)), - [g]"x"(_mm_set1_ps(master_linear_gain)) + [g]"x"(_mm_set1_ps(main_linear_gain)) : /* clobber */ "memory", "cc"); // clang-format on @@ -862,7 +862,7 @@ static void dk_compress_output(struct drc_kernel *dk) [A7]"x"(A7), [one]"x"(_mm_set1_ps(1)), [r4]"x"(_mm_set1_ps(r*r*r*r)), - [g]"x"(_mm_set1_ps(master_linear_gain)) + [g]"x"(_mm_set1_ps(main_linear_gain)) : /* clobber */ "memory", "cc"); // clang-format on @@ -872,7 +872,7 @@ static void dk_compress_output(struct drc_kernel *dk) #else static void dk_compress_output(struct drc_kernel *dk) { - const float master_linear_gain = dk->master_linear_gain; + const float main_linear_gain = dk->main_linear_gain; const float envelope_rate = dk->envelope_rate; const float scaled_desired_gain = dk->scaled_desired_gain; const float compressor_gain = dk->compressor_gain; @@ -902,8 +902,8 @@ static void dk_compress_output(struct drc_kernel *dk) float post_warp_compressor_gain = warp_sinf(x[j] + base); - /* Calculate total gain using master gain. */ - float total_gain = master_linear_gain * + /* Calculate total gain using main gain. */ + float total_gain = main_linear_gain * post_warp_compressor_gain; /* Apply final gain. */ @@ -936,8 +936,8 @@ static void dk_compress_output(struct drc_kernel *dk) float post_warp_compressor_gain = warp_sinf(x[j]); - /* Calculate total gain using master gain. */ - float total_gain = master_linear_gain * + /* Calculate total gain using main gain. */ + float total_gain = main_linear_gain * post_warp_compressor_gain; /* Apply final gain. */ diff --git a/cras/src/dsp/drc_kernel.h b/cras/src/dsp/drc_kernel.h index 1157f225..2ed9956e 100644 --- a/cras/src/dsp/drc_kernel.h +++ b/cras/src/dsp/drc_kernel.h @@ -67,7 +67,7 @@ struct drc_kernel { float kA, kB, kC, kD, kE; /* Calculated parameters */ - float master_linear_gain; + float main_linear_gain; float attack_frames; float sat_release_frames_inv_neg; float sat_release_rate_at_neg_two_db; diff --git a/scripts/audio_tuning/frontend/audio.js b/scripts/audio_tuning/frontend/audio.js index b90be953..98870cdd 100644 --- a/scripts/audio_tuning/frontend/audio.js +++ b/scripts/audio_tuning/frontend/audio.js @@ -1570,7 +1570,7 @@ function DrcDrawer(canvas) { var kneeThresholdDb; var kneeThreshold; var ykneeThresholdDb; - var masterLinearGain; + var mainLinearGain; var maxOutputDb = 6; var minOutputDb = -36; @@ -1662,10 +1662,10 @@ function DrcDrawer(canvas) { kneeThreshold = dBToLinear(kneeThresholdDb); ykneeThresholdDb = linearToDb(kneeCurve(kneeThreshold, curve_k)); - /* Calculate masterLinearGain */ + /* Calculate mainLinearGain */ var fullRangeGain = saturate(1, curve_k); var fullRangeMakeupGain = Math.pow(1 / fullRangeGain, 0.6); - masterLinearGain = dBToLinear(boost) * fullRangeMakeupGain; + mainLinearGain = dBToLinear(boost) * fullRangeMakeupGain; /* Clear canvas */ var width = canvas.width; @@ -1725,7 +1725,7 @@ function DrcDrawer(canvas) { var inputDb = xpixelToDb(x); var inputLinear = dBToLinear(inputDb); var outputLinear = saturate(inputLinear, curve_k); - outputLinear *= masterLinearGain; + outputLinear *= mainLinearGain; var outputDb = linearToDb(outputLinear); var y = dBToYPixel(outputDb); |