diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2014-06-16 14:43:57 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2014-06-16 14:43:57 +0000 |
| commit | c7fcada57f3f930a6efb5d57ff2931e8d9c12041 (patch) | |
| tree | bc596392a83217f709460f6da21b33625825875b /common_audio | |
| parent | adda09e50de65c9a17d8d24dbbb421d39da1fe00 (diff) | |
| parent | 5fcef2b6df45ceab39ee96a616ab0a4d3c63b83a (diff) | |
| download | webrtc-c7fcada57f3f930a6efb5d57ff2931e8d9c12041.tar.gz | |
Merge third_party/webrtc from https://chromium.googlesource.com/external/webrtc/trunk/webrtc.git at 5fcef2b6df45ceab39ee96a616ab0a4d3c63b83a
This commit was generated by merge_from_chromium.py.
Change-Id: I58be5a5957c0a6b1be9beac86538af8d38058e9e
Diffstat (limited to 'common_audio')
| -rw-r--r-- | common_audio/OWNERS | 2 | ||||
| -rw-r--r-- | common_audio/signal_processing/include/signal_processing_library.h | 3 | ||||
| -rw-r--r-- | common_audio/signal_processing/signal_processing_unittest.cc | 2 |
3 files changed, 2 insertions, 5 deletions
diff --git a/common_audio/OWNERS b/common_audio/OWNERS index d6bbd0e2..83d774b2 100644 --- a/common_audio/OWNERS +++ b/common_audio/OWNERS @@ -3,6 +3,8 @@ tina.legrand@webrtc.org jan.skoglund@webrtc.org andrew@webrtc.org +per-file *.isolate=kjellander@webrtc.org + # These are for the common case of adding or renaming files. If you're doing # structural changes, please get a review from a reviewer in this file. per-file *.gyp=* diff --git a/common_audio/signal_processing/include/signal_processing_library.h b/common_audio/signal_processing/include/signal_processing_library.h index ce84ec85..69023b26 100644 --- a/common_audio/signal_processing/include/signal_processing_library.h +++ b/common_audio/signal_processing/include/signal_processing_library.h @@ -55,8 +55,6 @@ ((uint32_t) ((uint32_t)(a) * (uint32_t)(b))) #define WEBRTC_SPL_UMUL_16_16(a, b) \ ((uint32_t) (uint16_t)(a) * (uint16_t)(b)) -#define WEBRTC_SPL_UMUL_16_16_RSFT16(a, b) \ - (((uint32_t) (uint16_t)(a) * (uint16_t)(b)) >> 16) #define WEBRTC_SPL_UMUL_32_16(a, b) \ ((uint32_t) ((uint32_t)(a) * (uint16_t)(b))) #define WEBRTC_SPL_UMUL_32_16_RSFT16(a, b) \ @@ -125,7 +123,6 @@ #define WEBRTC_SPL_RSHIFT_W32(x, c) ((x) >> (c)) #define WEBRTC_SPL_LSHIFT_W32(x, c) ((x) << (c)) -#define WEBRTC_SPL_RSHIFT_U16(x, c) ((uint16_t)(x) >> (c)) #define WEBRTC_SPL_LSHIFT_U16(x, c) ((uint16_t)(x) << (c)) #define WEBRTC_SPL_RSHIFT_U32(x, c) ((uint32_t)(x) >> (c)) #define WEBRTC_SPL_LSHIFT_U32(x, c) ((uint32_t)(x) << (c)) diff --git a/common_audio/signal_processing/signal_processing_unittest.cc b/common_audio/signal_processing/signal_processing_unittest.cc index 90e116f3..48f6eb3a 100644 --- a/common_audio/signal_processing/signal_processing_unittest.cc +++ b/common_audio/signal_processing/signal_processing_unittest.cc @@ -47,7 +47,6 @@ TEST_F(SplTest, MacroTest) { EXPECT_EQ(2147483651u, WEBRTC_SPL_UMUL(a, b)); b = WEBRTC_SPL_WORD16_MAX >> 1; EXPECT_EQ(1073627139u, WEBRTC_SPL_UMUL_16_16(a, b)); - EXPECT_EQ(16382u, WEBRTC_SPL_UMUL_16_16_RSFT16(a, b)); EXPECT_EQ(4294918147u, WEBRTC_SPL_UMUL_32_16(a, b)); EXPECT_EQ(65535u, WEBRTC_SPL_UMUL_32_16_RSFT16(a, b)); EXPECT_EQ(-49149, WEBRTC_SPL_MUL_16_U16(a, b)); @@ -90,7 +89,6 @@ TEST_F(SplTest, MacroTest) { EXPECT_EQ(8191, WEBRTC_SPL_RSHIFT_W32(a, 1)); EXPECT_EQ(32766, WEBRTC_SPL_LSHIFT_W32(a, 1)); - EXPECT_EQ(8191, WEBRTC_SPL_RSHIFT_U16(a, 1)); EXPECT_EQ(32766, WEBRTC_SPL_LSHIFT_U16(a, 1)); EXPECT_EQ(8191u, WEBRTC_SPL_RSHIFT_U32(a, 1)); EXPECT_EQ(32766u, WEBRTC_SPL_LSHIFT_U32(a, 1)); |