zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor audio_processing: Free functions return void

Browse Source 
There is no point in returning an error when Free() fails. In fact it can only happen if we have a null pointer as object. There is further no place where the return value is used.

Affected components are
- aec
- aecm
- agc
- ns

BUG=441
R=kwiberg@webrtc.org

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

Cr-Commit-Position: refs/heads/master@{#8966}
This commit is contained in:
Bjorn Volcker
2015-04-10 07:56:57 +02:00
parent 0666a9b28b
commit f6a99e63b6
18 changed files with 31 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
webrtc/modules/audio_processing/aecm/aecm_core.c
View File

@ -546,10 +546,9 @@ int WebRtcAecm_Control(AecmCore* aecm, int delay, int nlpFlag) {
return 0;
}
int WebRtcAecm_FreeCore(AecmCore* aecm) {
if (aecm == NULL)
{
return -1;
void WebRtcAecm_FreeCore(AecmCore* aecm) {
if (aecm == NULL) {
return;
}
WebRtc_FreeBuffer(aecm->farFrameBuf);
@ -562,8 +561,6 @@ int WebRtcAecm_FreeCore(AecmCore* aecm) {
WebRtcSpl_FreeRealFFT(aecm->real_fft);
free(aecm);
return 0;
}
int WebRtcAecm_ProcessFrame(AecmCore* aecm,

6
webrtc/modules/audio_processing/aecm/aecm_core.h
View File

@ -174,11 +174,7 @@ int WebRtcAecm_InitCore(AecmCore* const aecm, int samplingFreq);
// Input:
// - aecm : Pointer to the AECM instance
//
// Return value : 0 - Ok
// -1 - Error
// 11001-11016: Error
//
int WebRtcAecm_FreeCore(AecmCore* aecm);
void WebRtcAecm_FreeCore(AecmCore* aecm);
int WebRtcAecm_Control(AecmCore* aecm, int delay, int nlpFlag);

10
webrtc/modules/audio_processing/aecm/echo_control_mobile.c
View File

@ -130,13 +130,11 @@ int32_t WebRtcAecm_Create(void **aecmInst)
return 0;
}
int32_t WebRtcAecm_Free(void *aecmInst)
{
void WebRtcAecm_Free(void* aecmInst) {
AecMobile* aecm = aecmInst;
if (aecm == NULL)
{
return -1;
if (aecm == NULL) {
return;
}
#ifdef AEC_DEBUG
@ -153,8 +151,6 @@ int32_t WebRtcAecm_Free(void *aecmInst)
WebRtcAecm_FreeCore(aecm->aecmCore);
WebRtc_FreeBuffer(aecm->farendBuf);
free(aecm);
return 0;
}
int32_t WebRtcAecm_Init(void *aecmInst, int32_t sampFreq)

7
webrtc/modules/audio_processing/aecm/include/echo_control_mobile.h
View File

@ -61,13 +61,8 @@ int32_t WebRtcAecm_Create(void **aecmInst);
* Inputs Description
* -------------------------------------------------------------------
* void* aecmInst Pointer to the AECM instance
*
* Outputs Description
* -------------------------------------------------------------------
* int32_t return 0: OK
* -1: error
*/
int32_t WebRtcAecm_Free(void *aecmInst);
void WebRtcAecm_Free(void* aecmInst);
/*
* Initializes an AECM instance.