Merge remote-tracking branch 'origin/normalization_fix'

altmp · Oct 26, 2023 · e49ec28 · e49ec28
2 parents bcebd84 + cf13427
commit e49ec28
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/src/CSoundInput.cpp b/src/CSoundInput.cpp
@@ -311,15 +311,13 @@ void CSoundInput::Normalize(void* buffer, DWORD sampleCount)
 	desiredGain = std::fmin(desiredGain, 10.0f);
 
 	// Smooth the transition of gain
-	static float currentGain = 1.0f;
-	float smoothingFactor = 0.05f;
-	currentNormalizationGain = (1 - smoothingFactor) * currentNormalizationGain + smoothingFactor * desiredGain;
+	currentNormalizationGain = (1 - NORMALIZE_SMOOTHING_FACTOR) * currentNormalizationGain + NORMALIZE_SMOOTHING_FACTOR * desiredGain;
 
-	const auto shortSamples = static_cast<short*>(buffer);
+	auto shortSamples = static_cast<short*>(buffer);
 
 	for (int i = 0; i < sampleCount; ++i)
 	{
-		float processedSample = (float)shortSamples[i] * currentGain;
+		float processedSample = (float)shortSamples[i] * currentNormalizationGain;
 		shortSamples[i] = static_cast<int16_t>(clampFloatSample(processedSample));
 	}
 }

diff --git a/src/CSoundInput.h b/src/CSoundInput.h
@@ -12,7 +12,8 @@ class CSoundInput : public ISoundInput
 {
 	static constexpr int RNNoiseFrameSize = 480;
 	static constexpr float MaxShortFloatValue = 32768.0f;
-	static constexpr int NORMALIZE_FRAME_COUNT = 20;
+	static constexpr int NORMALIZE_FRAME_COUNT = 50;
+	static constexpr float NORMALIZE_SMOOTHING_FACTOR = 0.05f;
 
 	HRECORD recordChannel = 0;
 	HSTREAM levelChannel = 0;