diff options
| author | bjornv@webrtc.org <bjornv@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-06-11 06:39:03 +0000 |
|---|---|---|
| committer | bjornv@webrtc.org <bjornv@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-06-11 06:39:03 +0000 |
| commit | 6e6b951ca67c53e07b04174bb24cbae157d5afd8 (patch) | |
| tree | 9e6234412a8a0e4c8d6a1fb77af8a83a3fcf1ab2 /common_audio/signal_processing | |
| parent | b96d9c72c7286b3505e7a122e34d770377a46052 (diff) | |
| download | webrtc-6e6b951ca67c53e07b04174bb24cbae157d5afd8.tar.gz | |
common_audio/signal_processing: Moves WEBRTC_SPL_UMUL_16_16_RSFT16 to iSAC fix
This macro is only used by the fixed point version of iSAC. Replacing the (five) locations in arith_routines_logist.c, where it is used, with the actual operation.
BUG=3348,3353
TESTED=trybots and manually
R=kwiberg@webrtc.org, tina.legrand@webrtc.org, turaj@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/14659004
git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@6392 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'common_audio/signal_processing')
| -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 ce84ec85..3966c2f5 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) \ diff --git a/common_audio/signal_processing/signal_processing_unittest.cc b/common_audio/signal_processing/signal_processing_unittest.cc index 90e116f3..26225b5f 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)); |