Index: webrtc/modules/audio_processing/aecm/echo_control_mobile.cc |
diff --git a/webrtc/modules/audio_processing/aecm/echo_control_mobile.cc b/webrtc/modules/audio_processing/aecm/echo_control_mobile.cc |
index a81466e678e681901221a8a181b6f47bb7e3b935..7cc3bc4a35cb71fbdff61a38e0bfed8a01ff1be5 100644 |
--- a/webrtc/modules/audio_processing/aecm/echo_control_mobile.cc |
+++ b/webrtc/modules/audio_processing/aecm/echo_control_mobile.cc |
@@ -88,7 +88,7 @@ void* WebRtcAecm_Create() { |
aecm->aecmCore = WebRtcAecm_CreateCore(); |
if (!aecm->aecmCore) { |
WebRtcAecm_Free(aecm); |
- return NULL; |
+ return nullptr; |
} |
aecm->farendBuf = WebRtc_CreateBuffer(kBufSizeSamp, |
@@ -96,7 +96,7 @@ void* WebRtcAecm_Create() { |
if (!aecm->farendBuf) |
{ |
WebRtcAecm_Free(aecm); |
- return NULL; |
+ return nullptr; |
} |
aecm->initFlag = 0; |
@@ -118,8 +118,8 @@ void* WebRtcAecm_Create() { |
void WebRtcAecm_Free(void* aecmInst) { |
AecMobile* aecm = static_cast<AecMobile*>(aecmInst); |
- if (aecm == NULL) { |
- return; |
+ if (aecm == nullptr) { |
+ return; |
} |
#ifdef AEC_DEBUG |
@@ -143,9 +143,8 @@ int32_t WebRtcAecm_Init(void *aecmInst, int32_t sampFreq) |
AecMobile* aecm = static_cast<AecMobile*>(aecmInst); |
AecmConfig aecConfig; |
- if (aecm == NULL) |
- { |
- return -1; |
+ if (aecm == nullptr) { |
+ return -1; |
} |
if (sampFreq != 8000 && sampFreq != 16000) |
@@ -200,10 +199,10 @@ int32_t WebRtcAecm_GetBufferFarendError(void *aecmInst, const int16_t *farend, |
size_t nrOfSamples) { |
AecMobile* aecm = static_cast<AecMobile*>(aecmInst); |
- if (aecm == NULL) |
+ if (aecm == nullptr) |
return -1; |
- if (farend == NULL) |
+ if (farend == nullptr) |
return AECM_NULL_POINTER_ERROR; |
if (aecm->initFlag != kInitCheck) |
@@ -251,19 +250,16 @@ int32_t WebRtcAecm_Process(void *aecmInst, const int16_t *nearendNoisy, |
short msInAECBuf; |
#endif |
- if (aecm == NULL) |
- { |
- return -1; |
+ if (aecm == nullptr) { |
+ return -1; |
} |
- if (nearendNoisy == NULL) |
- { |
- return AECM_NULL_POINTER_ERROR; |
+ if (nearendNoisy == nullptr) { |
+ return AECM_NULL_POINTER_ERROR; |
} |
- if (out == NULL) |
- { |
- return AECM_NULL_POINTER_ERROR; |
+ if (out == nullptr) { |
+ return AECM_NULL_POINTER_ERROR; |
} |
if (aecm->initFlag != kInitCheck) |
@@ -293,12 +289,10 @@ int32_t WebRtcAecm_Process(void *aecmInst, const int16_t *nearendNoisy, |
if (aecm->ECstartup) |
{ |
- if (nearendClean == NULL) |
- { |
- if (out != nearendNoisy) |
- { |
- memcpy(out, nearendNoisy, sizeof(short) * nrOfSamples); |
- } |
+ if (nearendClean == nullptr) { |
+ if (out != nearendNoisy) { |
+ memcpy(out, nearendNoisy, sizeof(short) * nrOfSamples); |
+ } |
} else if (out != nearendClean) |
{ |
memcpy(out, nearendClean, sizeof(short) * nrOfSamples); |
@@ -382,7 +376,7 @@ int32_t WebRtcAecm_Process(void *aecmInst, const int16_t *nearendNoisy, |
for (i = 0; i < nFrames; i++) |
{ |
int16_t farend[FRAME_LEN]; |
- const int16_t* farend_ptr = NULL; |
+ const int16_t* farend_ptr = nullptr; |
nmbrOfFilledBuffers = |
(short) WebRtc_available_read(aecm->farendBuf) / FRAME_LEN; |
@@ -414,14 +408,11 @@ int32_t WebRtcAecm_Process(void *aecmInst, const int16_t *nearendNoisy, |
// Call the AECM |
/*WebRtcAecm_ProcessFrame(aecm->aecmCore, farend, &nearend[FRAME_LEN * i], |
&out[FRAME_LEN * i], aecm->knownDelay);*/ |
- if (WebRtcAecm_ProcessFrame(aecm->aecmCore, |
- farend_ptr, |
- &nearendNoisy[FRAME_LEN * i], |
- (nearendClean |
- ? &nearendClean[FRAME_LEN * i] |
- : NULL), |
- &out[FRAME_LEN * i]) == -1) |
- return -1; |
+ if (WebRtcAecm_ProcessFrame( |
+ aecm->aecmCore, farend_ptr, &nearendNoisy[FRAME_LEN * i], |
+ (nearendClean ? &nearendClean[FRAME_LEN * i] : nullptr), |
+ &out[FRAME_LEN * i]) == -1) |
+ return -1; |
} |
} |
@@ -439,9 +430,8 @@ int32_t WebRtcAecm_set_config(void *aecmInst, AecmConfig config) |
{ |
AecMobile* aecm = static_cast<AecMobile*>(aecmInst); |
- if (aecm == NULL) |
- { |
- return -1; |
+ if (aecm == nullptr) { |
+ return -1; |
} |
if (aecm->initFlag != kInitCheck) |
@@ -521,10 +511,10 @@ int32_t WebRtcAecm_InitEchoPath(void* aecmInst, |
AecMobile* aecm = static_cast<AecMobile*>(aecmInst); |
const int16_t* echo_path_ptr = static_cast<const int16_t*>(echo_path); |
- if (aecmInst == NULL) { |
+ if (aecmInst == nullptr) { |
return -1; |
} |
- if (echo_path == NULL) { |
+ if (echo_path == nullptr) { |
return AECM_NULL_POINTER_ERROR; |
} |
if (size_bytes != WebRtcAecm_echo_path_size_bytes()) |
@@ -549,10 +539,10 @@ int32_t WebRtcAecm_GetEchoPath(void* aecmInst, |
AecMobile* aecm = static_cast<AecMobile*>(aecmInst); |
int16_t* echo_path_ptr = static_cast<int16_t*>(echo_path); |
- if (aecmInst == NULL) { |
+ if (aecmInst == nullptr) { |
return -1; |
} |
- if (echo_path == NULL) { |
+ if (echo_path == nullptr) { |
return AECM_NULL_POINTER_ERROR; |
} |
if (size_bytes != WebRtcAecm_echo_path_size_bytes()) |