From 8ecd9aa0c04d024506ea7c6631b0fa92fde05251 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Fri, 21 Mar 2014 17:16:54 -0700 Subject: [PATCH 1/2] change audibility delta to 2%, don't hit 1.0 --- assignment-client/src/audio/AudioMixer.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/assignment-client/src/audio/AudioMixer.cpp b/assignment-client/src/audio/AudioMixer.cpp index f2c766460a..e95dcb0ec3 100644 --- a/assignment-client/src/audio/AudioMixer.cpp +++ b/assignment-client/src/audio/AudioMixer.cpp @@ -379,7 +379,7 @@ void AudioMixer::run() { const float STRUGGLE_TRIGGER_SLEEP_PERCENTAGE_THRESHOLD = 0.10f; const float BACK_OFF_TRIGGER_SLEEP_PERCENTAGE_THRESHOLD = 0.20f; const float CUTOFF_EPSILON = 0.0001f; - const float CUTOFF_DELTA = 0.05; + const float CUTOFF_DELTA = 0.02; const float CURRENT_FRAME_RATIO = 1.0f / TRAILING_AVERAGE_FRAMES; const float PREVIOUS_FRAMES_RATIO = 1.0f - CURRENT_FRAME_RATIO; @@ -399,8 +399,8 @@ void AudioMixer::run() { // we're struggling - change our min required loudness to reduce some load audabilityCutoffRatio += CUTOFF_DELTA; - if (audabilityCutoffRatio > 1) { - audabilityCutoffRatio = 1; + if (audabilityCutoffRatio >= 1) { + audabilityCutoffRatio = 1 - CUTOFF_DELTA; } qDebug() << "Mixer is struggling, sleeping" << _trailingSleepRatio * 100 << "% of frame time. Old cutoff was" From 88b91b9eb70673c219c6297b5ff9a11fa5f1ceaa Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Fri, 21 Mar 2014 17:17:11 -0700 Subject: [PATCH 2/2] change an int to a float --- assignment-client/src/audio/AudioMixer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assignment-client/src/audio/AudioMixer.cpp b/assignment-client/src/audio/AudioMixer.cpp index e95dcb0ec3..bb60abacc0 100644 --- a/assignment-client/src/audio/AudioMixer.cpp +++ b/assignment-client/src/audio/AudioMixer.cpp @@ -379,7 +379,7 @@ void AudioMixer::run() { const float STRUGGLE_TRIGGER_SLEEP_PERCENTAGE_THRESHOLD = 0.10f; const float BACK_OFF_TRIGGER_SLEEP_PERCENTAGE_THRESHOLD = 0.20f; const float CUTOFF_EPSILON = 0.0001f; - const float CUTOFF_DELTA = 0.02; + const float CUTOFF_DELTA = 0.02f; const float CURRENT_FRAME_RATIO = 1.0f / TRAILING_AVERAGE_FRAMES; const float PREVIOUS_FRAMES_RATIO = 1.0f - CURRENT_FRAME_RATIO;