From bc5f55d6b555a82eb1b770509ccde0f41ade0d0a Mon Sep 17 00:00:00 2001 From: "Steinar H. Gunderson" Date: Sat, 7 Nov 2015 00:37:25 +0100 Subject: [PATCH] Rename compressor to level_compressor. --- mixer.cpp | 4 ++-- mixer.h | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/mixer.cpp b/mixer.cpp index 43e39b6..6f9bf05 100644 --- a/mixer.cpp +++ b/mixer.cpp @@ -69,7 +69,7 @@ Mixer::Mixer(const QSurfaceFormat &format, unsigned num_cards) num_cards(num_cards), mixer_surface(create_surface(format)), h264_encoder_surface(create_surface(format)), - compressor(48000.0f) + level_compressor(48000.0f) { httpd.start(9095); @@ -555,7 +555,7 @@ void Mixer::process_audio_one_frame() float attack_time = 0.1f; float release_time = 10.0f; float makeup_gain = pow(10.0f, 28.0f / 20.0f); // +28 dB takes us to -12 dBFS. - compressor.process(samples_out.data(), samples_out.size() / 2, threshold, ratio, attack_time, release_time, makeup_gain); + level_compressor.process(samples_out.data(), samples_out.size() / 2, threshold, ratio, attack_time, release_time, makeup_gain); #if 0 printf("level=%f (%+5.2f dBFS) attenuation=%f (%+5.2f dB) end_result=%+5.2f dB\n", diff --git a/mixer.h b/mixer.h index 8ac322f..cdc6f1c 100644 --- a/mixer.h +++ b/mixer.h @@ -205,7 +205,8 @@ private: // TODO: Implement oversampled peak detection. float peak = 0.0f; - StereoCompressor compressor; + // First compressor; takes us up to about -12 dBFS. + StereoCompressor level_compressor; }; extern Mixer *global_mixer; -- 2.39.5