Merge third_party/webrtc from https://chromium.googlesource.com/external/webrtc/trunk/webrtc.git at 4a1b3e3a69d349b0d3e91f607f24e02d8b975688

This commit was generated by merge_from_chromium.py.

Change-Id: Iada7abd78f123301a98db982a6272cd9487de72f

1 files changed, 17 insertions, 4 deletions

diff --git a/modules/audio_coding/codecs/isac/fix/source/filterbank_internal.h b/modules/audio_coding/codecs/isac/fix/source/filterbank_internal.h
index 3fefc1a5..7a5f7462 100644
--- a/modules/audio_coding/codecs/isac/fix/source/filterbank_internal.h
+++ b/modules/audio_coding/codecs/isac/fix/source/filterbank_internal.h
@@ -23,10 +23,23 @@ extern "C" {
  *   coefficient: Input.
  *   state: Input/output, filter state, in Q4.
  */
-void WebRtcIsacfix_HighpassFilterFixDec32(int16_t *io,
-                                          int16_t len,
-                                          const int16_t *coefficient,
-                                          int32_t *state);
+typedef void (*HighpassFilterFixDec32)(int16_t* io,
+                                       int16_t len,
+                                       const int16_t* coefficient,
+                                       int32_t* state);
+extern HighpassFilterFixDec32 WebRtcIsacfix_HighpassFilterFixDec32;
+
+void WebRtcIsacfix_HighpassFilterFixDec32C(int16_t* io,
+                                           int16_t len,
+                                           const int16_t* coefficient,
+                                           int32_t* state);
+
+#if defined(MIPS_DSP_R1_LE)
+void WebRtcIsacfix_HighpassFilterFixDec32MIPS(int16_t* io,
+                                              int16_t len,
+                                              const int16_t* coefficient,
+                                              int32_t* state);
+#endif
 
 typedef void (*AllpassFilter2FixDec16)(
     int16_t *data_ch1,           // Input and output in channel 1, in Q0