Index: webrtc/common_audio/signal_processing/include/signal_processing_library.h |
diff --git a/webrtc/common_audio/signal_processing/include/signal_processing_library.h b/webrtc/common_audio/signal_processing/include/signal_processing_library.h |
index f4fe8e86a4ed1ff1a115eb6633704f80ddfb915a..f1d605bb27d74defbd7b756bf700546b0e1c0d8a 100644 |
--- a/webrtc/common_audio/signal_processing/include/signal_processing_library.h |
+++ b/webrtc/common_audio/signal_processing/include/signal_processing_library.h |
@@ -15,8 +15,8 @@ |
* For specific function calls, see bottom of file. |
*/ |
-#ifndef WEBRTC_COMMON_AUDIO_SIGNAL_PROCESSING_INCLUDE_SIGNAL_PROCESSING_LIBRARY_H_ |
-#define WEBRTC_COMMON_AUDIO_SIGNAL_PROCESSING_INCLUDE_SIGNAL_PROCESSING_LIBRARY_H_ |
+#ifndef WEBRTC_SPL_SIGNAL_PROCESSING_LIBRARY_H_ |
+#define WEBRTC_SPL_SIGNAL_PROCESSING_LIBRARY_H_ |
#include <string.h> |
#include "webrtc/common_audio/signal_processing/dot_product_with_scale.h" |
@@ -60,13 +60,13 @@ |
#define WEBRTC_SPL_MUL_16_32_RSFT11(a, b) \ |
(WEBRTC_SPL_MUL_16_16(a, (b) >> 16) * (1 << 5) + \ |
- (((WEBRTC_SPL_MUL_16_U16(a, (uint16_t)(b)) >> 1) + 0x0200) >> 10)) |
+ (((WEBRTC_SPL_MUL_16_U16(a, (uint16_t)(b)) >> 1) + 0x0200) >> 10)) |
#define WEBRTC_SPL_MUL_16_32_RSFT14(a, b) \ |
(WEBRTC_SPL_MUL_16_16(a, (b) >> 16) * (1 << 2) + \ |
- (((WEBRTC_SPL_MUL_16_U16(a, (uint16_t)(b)) >> 1) + 0x1000) >> 13)) |
+ (((WEBRTC_SPL_MUL_16_U16(a, (uint16_t)(b)) >> 1) + 0x1000) >> 13)) |
#define WEBRTC_SPL_MUL_16_32_RSFT15(a, b) \ |
((WEBRTC_SPL_MUL_16_16(a, (b) >> 16) * (1 << 1)) + \ |
- (((WEBRTC_SPL_MUL_16_U16(a, (uint16_t)(b)) >> 1) + 0x2000) >> 14)) |
+ (((WEBRTC_SPL_MUL_16_U16(a, (uint16_t)(b)) >> 1) + 0x2000) >> 14)) |
#define WEBRTC_SPL_MUL_16_16_RSFT(a, b, c) \ |
(WEBRTC_SPL_MUL_16_16(a, b) >> (c)) |
@@ -77,7 +77,7 @@ |
// C + the 32 most significant bits of A * B |
#define WEBRTC_SPL_SCALEDIFF32(A, B, C) \ |
- (C + (B >> 16) * A + (((uint32_t)(B & 0x0000FFFF) * A) >> 16)) |
+ (C + (B >> 16) * A + (((uint32_t)(0x0000FFFF & B) * A) >> 16)) |
#define WEBRTC_SPL_SAT(a, b, c) (b > a ? a : b < c ? c : b) |
@@ -906,7 +906,7 @@ |
#ifdef __cplusplus |
} |
#endif // __cplusplus |
-#endif // WEBRTC_COMMON_AUDIO_SIGNAL_PROCESSING_INCLUDE_SIGNAL_PROCESSING_LIBRARY_H_ |
+#endif // WEBRTC_SPL_SIGNAL_PROCESSING_LIBRARY_H_ |
// |
// WebRtcSpl_AddSatW16(...) |