diff options
| author | bjornv@webrtc.org <bjornv@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-08-15 05:17:20 +0000 |
|---|---|---|
| committer | bjornv@webrtc.org <bjornv@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-08-15 05:17:20 +0000 |
| commit | ee3ec04c59454acde8eb5d072cbe07157f58c27b (patch) | |
| tree | 56327026d78c1022448bc315f99ebf1f7fe50dc5 /common_audio | |
| parent | c1696da9a74c7ed4ed793ce993352bd370cfc414 (diff) | |
| download | webrtc-ee3ec04c59454acde8eb5d072cbe07157f58c27b.tar.gz | |
common_audio/signal_processing: Remove macro WEBRTC_SPL_UMUL_32_16_RSFT16
Macros should in general be avoided. WEBRTC_SPL_UMUL_32_16_RSFT16 is only used in iSAC fixed point as part of multiplying with LSB and MSB. A better approach is to have one function for that complete operation in iSAC.
This CL removes the macro and replace the operation locally.
BUG=3148, 3353
TESTED=locally on Linux and trybots
R=tina.legrand@webrtc.org, turaj@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/16349004
git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@6907 4adac7df-926f-26a2-2b94-8c16560cd09d
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 72a5388f..2d9fff7c 100644 --- a/common_audio/signal_processing/include/signal_processing_library.h +++ b/common_audio/signal_processing/include/signal_processing_library.h @@ -57,8 +57,6 @@ ((uint32_t) (uint16_t)(a) * (uint16_t)(b)) #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) \ - ((uint32_t) ((uint32_t)(a) * (uint16_t)(b)) >> 16) #define WEBRTC_SPL_MUL_16_U16(a, b) \ ((int32_t)(int16_t)(a) * (uint16_t)(b)) #define WEBRTC_SPL_DIV(a, b) \ diff --git a/common_audio/signal_processing/signal_processing_unittest.cc b/common_audio/signal_processing/signal_processing_unittest.cc index 603294be..17d8d037 100644 --- a/common_audio/signal_processing/signal_processing_unittest.cc +++ b/common_audio/signal_processing/signal_processing_unittest.cc @@ -48,7 +48,6 @@ TEST_F(SplTest, MacroTest) { b = WEBRTC_SPL_WORD16_MAX >> 1; EXPECT_EQ(1073627139u, WEBRTC_SPL_UMUL_16_16(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)); a = b; |