generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make local functions static and dropWebRtcNs_ in ns_core

Browse Source 
This is only to make the code more readable and maintainable.
It generates bit-exact output.

BUG=webrtc:3811
R=bjornv@webrtc.org, kwiberg@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/31809004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7548 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
aluebs@webrtc.org 2014-10-28 21:06:57 +00:00
parent 28b54671cb
commit 8b1b23f8f8
1 changed files with 38 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
webrtc/modules/audio_processing/ns/ns_core.c
View File

@ -20,7 +20,7 @@
#include "webrtc/modules/audio_processing/utility/fft4g.h" #include "webrtc/modules/audio_processing/utility/fft4g.h"
// Set Feature Extraction Parameters. // Set Feature Extraction Parameters.
void WebRtcNs_set_feature_extraction_parameters(NSinst_t* inst) { static void set_feature_extraction_parameters(NSinst_t* inst) {
// Bin size of histogram. // Bin size of histogram.
inst->featureExtractionParams.binSizeLrt = 0.1f; inst->featureExtractionParams.binSizeLrt = 0.1f;
inst->featureExtractionParams.binSizeSpecFlat = 0.05f; inst->featureExtractionParams.binSizeSpecFlat = 0.05f;
@ -208,7 +208,7 @@ int WebRtcNs_InitCore(NSinst_t* inst, uint32_t fs) {
inst->pinkNoiseNumerator = 0.0; inst->pinkNoiseNumerator = 0.0;
inst->pinkNoiseExp = 0.0; inst->pinkNoiseExp = 0.0;
WebRtcNs_set_feature_extraction_parameters(inst); set_feature_extraction_parameters(inst);
// Default mode. // Default mode.
WebRtcNs_set_policy_core(inst, 0); WebRtcNs_set_policy_core(inst, 0);
@ -217,38 +217,8 @@ int WebRtcNs_InitCore(NSinst_t* inst, uint32_t fs) {
return 0; return 0;
} }
int WebRtcNs_set_policy_core(NSinst_t* inst, int mode) {
// Allow for modes: 0, 1, 2, 3.
if (mode < 0 || mode > 3) {
return (-1);
}
inst->aggrMode = mode;
if (mode == 0) {
inst->overdrive = 1.f;
inst->denoiseBound = 0.5f;
inst->gainmap = 0;
} else if (mode == 1) {
// inst->overdrive = 1.25f;
inst->overdrive = 1.f;
inst->denoiseBound = 0.25f;
inst->gainmap = 1;
} else if (mode == 2) {
// inst->overdrive = 1.25f;
inst->overdrive = 1.1f;
inst->denoiseBound = 0.125f;
inst->gainmap = 1;
} else if (mode == 3) {
// inst->overdrive = 1.3f;
inst->overdrive = 1.25f;
inst->denoiseBound = 0.09f;
inst->gainmap = 1;
}
return 0;
}
// Estimate noise. // Estimate noise.
void WebRtcNs_NoiseEstimation(NSinst_t* inst, float* magn, float* noise) { static void NoiseEstimation(NSinst_t* inst, float* magn, float* noise) {
int i, s, offset; int i, s, offset;
float lmagn[HALF_ANAL_BLOCKL], delta; float lmagn[HALF_ANAL_BLOCKL], delta;
@ -1037,6 +1007,40 @@ static void ComputeDdBasedWienerFilter(const NSinst_t* const self,
} // End of loop over frequencies. } // End of loop over frequencies.
} }
// Changes the aggressiveness of the noise suppression method.
// |mode| = 0 is mild (6dB), |mode| = 1 is medium (10dB) and |mode| = 2 is
// aggressive (15dB).
// Returns 0 on success and -1 otherwise.
int WebRtcNs_set_policy_core(NSinst_t* inst, int mode) {
// Allow for modes: 0, 1, 2, 3.
if (mode < 0 || mode > 3) {
return (-1);
}
inst->aggrMode = mode;
if (mode == 0) {
inst->overdrive = 1.f;
inst->denoiseBound = 0.5f;
inst->gainmap = 0;
} else if (mode == 1) {
// inst->overdrive = 1.25f;
inst->overdrive = 1.f;
inst->denoiseBound = 0.25f;
inst->gainmap = 1;
} else if (mode == 2) {
// inst->overdrive = 1.25f;
inst->overdrive = 1.1f;
inst->denoiseBound = 0.125f;
inst->gainmap = 1;
} else if (mode == 3) {
// inst->overdrive = 1.3f;
inst->overdrive = 1.25f;
inst->denoiseBound = 0.09f;
inst->gainmap = 1;
}
return 0;
}
int WebRtcNs_AnalyzeCore(NSinst_t* inst, float* speechFrame) { int WebRtcNs_AnalyzeCore(NSinst_t* inst, float* speechFrame) {
int i; int i;
const int kStartBand = 5; // Skip first frequency bins during estimation. const int kStartBand = 5; // Skip first frequency bins during estimation.
@ -1103,7 +1107,7 @@ int WebRtcNs_AnalyzeCore(NSinst_t* inst, float* speechFrame) {
inst->sumMagn = sumMagn; inst->sumMagn = sumMagn;
// Quantile noise estimate. // Quantile noise estimate.
WebRtcNs_NoiseEstimation(inst, magn, noise); NoiseEstimation(inst, magn, noise);
// Compute simplified noise model during startup. // Compute simplified noise model during startup.
if (inst->blockInd < END_STARTUP_SHORT) { if (inst->blockInd < END_STARTUP_SHORT) {
// Estimate White noise. // Estimate White noise.