diff options
| author | bjornv@webrtc.org <bjornv@webrtc.org> | 2014-08-28 12:57:32 +0000 |
|---|---|---|
| committer | bjornv@webrtc.org <bjornv@webrtc.org> | 2014-08-28 12:57:32 +0000 |
| commit | 5b3e14c36bf3cf2a0cda2e25895f61b6e3df922d (patch) | |
| tree | 97ac6734a2119ea7601ae7da36ac0ca3ce978683 /common_audio | |
| parent | ec0c58c6bf4c5c5950023731eea5d024e3fa5743 (diff) | |
| download | webrtc-5b3e14c36bf3cf2a0cda2e25895f61b6e3df922d.tar.gz | |
common_audio: Removed macro WEBRTC_SPL_DIV
The macro has no built-in divide by zero check. The only thing that is done is casting to int32_t.
In addition a bug was discovered where it was supposed to do a division with rounding, but instead did a division with truncation + addition by 2. This is corrected in this CL.
BUG=3348,3353
TESTED=locally on Linux
R=kwiberg@webrtc.org, tina.legrand@webrtc.org, turaj@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/19129004
git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@6998 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 a9cf3842..56bbbe66 100644 --- a/common_audio/signal_processing/include/signal_processing_library.h +++ b/common_audio/signal_processing/include/signal_processing_library.h @@ -46,8 +46,6 @@ ((uint32_t) ((uint32_t)(a) * (uint16_t)(b))) #define WEBRTC_SPL_MUL_16_U16(a, b) \ ((int32_t)(int16_t)(a) * (uint16_t)(b)) -#define WEBRTC_SPL_DIV(a, b) \ - ((int32_t) ((int32_t)(a) / (int32_t)(b))) #ifndef WEBRTC_ARCH_ARM_V7 // For ARMv7 platforms, these are inline functions in spl_inl_armv7.h diff --git a/common_audio/signal_processing/signal_processing_unittest.cc b/common_audio/signal_processing/signal_processing_unittest.cc index 5d07f16e..6a70a02e 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) { a = b; b = -3; - EXPECT_EQ(-5461, WEBRTC_SPL_DIV(a, b)); EXPECT_EQ(-1, WEBRTC_SPL_MUL_16_32_RSFT16(a, b)); EXPECT_EQ(-1, WEBRTC_SPL_MUL_16_32_RSFT15(a, b)); |