| Index: webrtc/modules/audio_processing/aecm/include/echo_control_mobile.h
|
| diff --git a/webrtc/modules/audio_processing/aecm/include/echo_control_mobile.h b/webrtc/modules/audio_processing/aecm/include/echo_control_mobile.h
|
| index 7ae15c2a3d62d7fc7cf620110e61ac788cbe548a..b29f078bf7f3227843f2fee544fd30fa14e1b1ff 100644
|
| --- a/webrtc/modules/audio_processing/aecm/include/echo_control_mobile.h
|
| +++ b/webrtc/modules/audio_processing/aecm/include/echo_control_mobile.h
|
| @@ -66,7 +66,7 @@ void WebRtcAecm_Free(void* aecmInst);
|
| * Outputs Description
|
| * -------------------------------------------------------------------
|
| * int32_t return 0: OK
|
| - * -1: error
|
| + * 1200-12004,12100: error/warning
|
| */
|
| int32_t WebRtcAecm_Init(void* aecmInst, int32_t sampFreq);
|
|
|
| @@ -83,13 +83,32 @@ int32_t WebRtcAecm_Init(void* aecmInst, int32_t sampFreq);
|
| * Outputs Description
|
| * -------------------------------------------------------------------
|
| * int32_t return 0: OK
|
| - * -1: error
|
| + * 1200-12004,12100: error/warning
|
| */
|
| int32_t WebRtcAecm_BufferFarend(void* aecmInst,
|
| const int16_t* farend,
|
| size_t nrOfSamples);
|
|
|
| /*
|
| + * Reports any errors that would arise when buffering a farend buffer.
|
| + *
|
| + * Inputs Description
|
| + * -------------------------------------------------------------------
|
| + * void* aecmInst Pointer to the AECM instance
|
| + * int16_t* farend In buffer containing one frame of
|
| + * farend signal
|
| + * int16_t nrOfSamples Number of samples in farend buffer
|
| + *
|
| + * Outputs Description
|
| + * -------------------------------------------------------------------
|
| + * int32_t return 0: OK
|
| + * 1200-12004,12100: error/warning
|
| + */
|
| +int32_t WebRtcAecm_GetBufferFarendError(void* aecmInst,
|
| + const int16_t* farend,
|
| + size_t nrOfSamples);
|
| +
|
| +/*
|
| * Runs the AECM on an 80 or 160 sample blocks of data.
|
| *
|
| * Inputs Description
|
| @@ -112,7 +131,7 @@ int32_t WebRtcAecm_BufferFarend(void* aecmInst,
|
| * -------------------------------------------------------------------
|
| * int16_t* out Out buffer, one frame of processed nearend
|
| * int32_t return 0: OK
|
| - * -1: error
|
| + * 1200-12004,12100: error/warning
|
| */
|
| int32_t WebRtcAecm_Process(void* aecmInst,
|
| const int16_t* nearendNoisy,
|
| @@ -133,27 +152,11 @@ int32_t WebRtcAecm_Process(void* aecmInst,
|
| * Outputs Description
|
| * -------------------------------------------------------------------
|
| * int32_t return 0: OK
|
| - * -1: error
|
| + * 1200-12004,12100: error/warning
|
| */
|
| int32_t WebRtcAecm_set_config(void* aecmInst, AecmConfig config);
|
|
|
| /*
|
| - * This function enables the user to set certain parameters on-the-fly
|
| - *
|
| - * Inputs Description
|
| - * -------------------------------------------------------------------
|
| - * void* aecmInst Pointer to the AECM instance
|
| - *
|
| - * Outputs Description
|
| - * -------------------------------------------------------------------
|
| - * AecmConfig* config Pointer to the config instance that
|
| - * all properties will be written to
|
| - * int32_t return 0: OK
|
| - * -1: error
|
| - */
|
| -int32_t WebRtcAecm_get_config(void *aecmInst, AecmConfig *config);
|
| -
|
| -/*
|
| * This function enables the user to set the echo path on-the-fly.
|
| *
|
| * Inputs Description
|
| @@ -165,7 +168,7 @@ int32_t WebRtcAecm_get_config(void *aecmInst, AecmConfig *config);
|
| * Outputs Description
|
| * -------------------------------------------------------------------
|
| * int32_t return 0: OK
|
| - * -1: error
|
| + * 1200-12004,12100: error/warning
|
| */
|
| int32_t WebRtcAecm_InitEchoPath(void* aecmInst,
|
| const void* echo_path,
|
| @@ -184,7 +187,7 @@ int32_t WebRtcAecm_InitEchoPath(void* aecmInst,
|
| * Outputs Description
|
| * -------------------------------------------------------------------
|
| * int32_t return 0: OK
|
| - * -1: error
|
| + * 1200-12004,12100: error/warning
|
| */
|
| int32_t WebRtcAecm_GetEchoPath(void* aecmInst,
|
| void* echo_path,
|
| @@ -199,18 +202,6 @@ int32_t WebRtcAecm_GetEchoPath(void* aecmInst,
|
| */
|
| size_t WebRtcAecm_echo_path_size_bytes();
|
|
|
| -/*
|
| - * Gets the last error code.
|
| - *
|
| - * Inputs Description
|
| - * -------------------------------------------------------------------
|
| - * void* aecmInst Pointer to the AECM instance
|
| - *
|
| - * Outputs Description
|
| - * -------------------------------------------------------------------
|
| - * int32_t return 11000-11100: error code
|
| - */
|
| -int32_t WebRtcAecm_get_error_code(void *aecmInst);
|
|
|
| #ifdef __cplusplus
|
| }
|
|
|