Merge third_party/webrtc from https://chromium.googlesource.com/external/webrtc/trunk/webrtc.git at 4415bacc16e429ee132e9759ba6880043b61cbdd

This commit was generated by merge_from_chromium.py.

Change-Id: Ie6289bc4dd0cfeaac35bf8fe39e6bb03ce057148

5 files changed, 0 insertions, 46 deletions

diff --git a/common_audio/BUILD.gn b/common_audio/BUILD.gn
index 9091c42a..455e5279 100644
--- a/common_audio/BUILD.gn
+++ b/common_audio/BUILD.gn
@@ -66,7 +66,6 @@ source_set("common_audio") {
     "signal_processing/resample_fractional.c",
     "signal_processing/spl_init.c",
     "signal_processing/spl_sqrt.c",
-    "signal_processing/spl_version.c",
     "signal_processing/splitting_filter.c",
     "signal_processing/sqrt_of_one_minus_x_squared.c",
     "signal_processing/vector_scaling_operations.c",
diff --git a/common_audio/common_audio.gyp b/common_audio/common_audio.gyp
index 9378f729..66ab7779 100644
--- a/common_audio/common_audio.gyp
+++ b/common_audio/common_audio.gyp
@@ -80,7 +80,6 @@
         'signal_processing/spl_init.c',
         'signal_processing/spl_sqrt.c',
         'signal_processing/spl_sqrt_floor.c',
-        'signal_processing/spl_version.c',
         'signal_processing/splitting_filter.c',
         'signal_processing/sqrt_of_one_minus_x_squared.c',
         'signal_processing/vector_scaling_operations.c',
diff --git a/common_audio/signal_processing/include/signal_processing_library.h b/common_audio/signal_processing/include/signal_processing_library.h
index ad95386f..e3a29ae5 100644
--- a/common_audio/signal_processing/include/signal_processing_library.h
+++ b/common_audio/signal_processing/include/signal_processing_library.h
@@ -117,9 +117,6 @@ extern "C" {
 // functions.
 void WebRtcSpl_Init();
 
-// Get SPL Version
-int16_t WebRtcSpl_get_version(char* version, int16_t length_in_bytes);
-
 int16_t WebRtcSpl_GetScalingSquare(int16_t* in_vector,
                                    int in_vector_length,
                                    int times);
@@ -1684,16 +1681,3 @@ void WebRtcSpl_SynthesisQMF(const int16_t* low_band,
 //
 // Return Value: The value of a * b + c.
 //
-
-// int16_t WebRtcSpl_get_version(...)
-//
-// This function gives the version string of the Signal Processing Library.
-//
-// Input:
-//      - length_in_bytes : The size of Allocated space (in Bytes) where
-//                          the version number is written to (in string format).
-//
-// Output:
-//      - version         : Pointer to a buffer where the version number is
-//                          written to.
-//
diff --git a/common_audio/signal_processing/signal_processing_unittest.cc b/common_audio/signal_processing/signal_processing_unittest.cc
index 09518a9d..3d9f6054 100644
--- a/common_audio/signal_processing/signal_processing_unittest.cc
+++ b/common_audio/signal_processing/signal_processing_unittest.cc
@@ -96,7 +96,6 @@ TEST_F(SplTest, InlineTest) {
     int16_t b16 = -17;
     int32_t a32 = 111121;
     int32_t b32 = -1711;
-    char bVersion[8];
 
     EXPECT_EQ(17, WebRtcSpl_GetSizeInBits(a32));
 
@@ -136,8 +135,6 @@ TEST_F(SplTest, InlineTest) {
     a32 = 0x80000000;
     b32 = 0x7fffffff;
     EXPECT_EQ(static_cast<int>(0x80000000), WebRtcSpl_SubSatW32(a32, b32));
-
-    EXPECT_EQ(0, WebRtcSpl_get_version(bVersion, 8));
 }
 
 TEST_F(SplTest, MathOperationsTest) {
diff --git a/common_audio/signal_processing/spl_version.c b/common_audio/signal_processing/spl_version.c
deleted file mode 100644
index e0708512..00000000
--- a/common_audio/signal_processing/spl_version.c
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-
-/*
- * This file contains the function WebRtcSpl_get_version().
- * The description header can be found in signal_processing_library.h
- *
- */
-
-#include <string.h>
-#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h"
-
-int16_t WebRtcSpl_get_version(char* version, int16_t length_in_bytes)
-{
-    strncpy(version, "1.2.0", length_in_bytes);
-    return 0;
-}