diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2014-07-09 15:00:07 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2014-07-09 15:00:07 +0000 |
| commit | 10b9861436e47694b29da87b7890287041a95a74 (patch) | |
| tree | 64d09be0638cccd20e1ca345ff522372b708ab67 /common_audio | |
| parent | 3ded5808c2dec22ec97b3b0c855f1bcb75c1db09 (diff) | |
| parent | 138adbb0bcdab60afda25a8727e5a071abc4ae36 (diff) | |
| download | webrtc-10b9861436e47694b29da87b7890287041a95a74.tar.gz | |
Merge third_party/webrtc from https://chromium.googlesource.com/external/webrtc/trunk/webrtc.git at 138adbb0bcdab60afda25a8727e5a071abc4ae36
This commit was generated by merge_from_chromium.py.
Change-Id: Iffa5413ebfb78de36b84b4e85d94adc093f912df
Diffstat (limited to 'common_audio')
| -rw-r--r-- | common_audio/signal_processing/include/signal_processing_library.h | 2 | ||||
| -rw-r--r-- | common_audio/signal_processing/signal_processing_unittest.cc | 1 |
2 files changed, 0 insertions, 3 deletions
diff --git a/common_audio/signal_processing/include/signal_processing_library.h b/common_audio/signal_processing/include/signal_processing_library.h index 3a5d51cc..a658645d 100644 --- a/common_audio/signal_processing/include/signal_processing_library.h +++ b/common_audio/signal_processing/include/signal_processing_library.h @@ -111,8 +111,6 @@ // Shifting with negative numbers allowed // Positive means left shift -#define WEBRTC_SPL_SHIFT_W16(x, c) \ - (((c) >= 0) ? ((x) << (c)) : ((x) >> (-(c)))) #define WEBRTC_SPL_SHIFT_W32(x, c) \ (((c) >= 0) ? ((x) << (c)) : ((x) >> (-(c)))) diff --git a/common_audio/signal_processing/signal_processing_unittest.cc b/common_audio/signal_processing/signal_processing_unittest.cc index 81ca3694..a68840e8 100644 --- a/common_audio/signal_processing/signal_processing_unittest.cc +++ b/common_audio/signal_processing/signal_processing_unittest.cc @@ -79,7 +79,6 @@ TEST_F(SplTest, MacroTest) { // Shifting with negative numbers allowed int shift_amount = 1; // Workaround compiler warning using variable here. // Positive means left shift - EXPECT_EQ(32766, WEBRTC_SPL_SHIFT_W16(a, shift_amount)); EXPECT_EQ(32766, WEBRTC_SPL_SHIFT_W32(a, shift_amount)); // Shifting with negative numbers not allowed |