diff options
| author | Torne (Richard Coles) <torne@google.com> | 2014-11-06 11:12:39 +0000 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2014-11-06 11:12:39 +0000 |
| commit | 77155b05052120107f7496d7c424ee24e6420550 (patch) | |
| tree | 5013368c038081fc9d542ad65efe3ec381540eb2 /common_audio/signal_processing/splitting_filter.c | |
| parent | 401138990c86cc095df3bac0acaf3951b393e32e (diff) | |
| parent | b44eb8f9b54e77b4ac5c426ea947f72a6ad74aad (diff) | |
| download | webrtc-77155b05052120107f7496d7c424ee24e6420550.tar.gz | |
Merge from Chromium at DEPS revision db3f05efe0f9
This commit was generated by merge_to_master.py.
Change-Id: Ibb07e7633f0f96e925c9bd5cdcb91747ad656b6e
Diffstat (limited to 'common_audio/signal_processing/splitting_filter.c')
| -rw-r--r-- | common_audio/signal_processing/splitting_filter.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/common_audio/signal_processing/splitting_filter.c b/common_audio/signal_processing/splitting_filter.c index 4f6430c2..15c37240 100644 --- a/common_audio/signal_processing/splitting_filter.c +++ b/common_audio/signal_processing/splitting_filter.c @@ -156,12 +156,10 @@ void WebRtcSpl_AnalysisQMF(const int16_t* in_data, int in_data_length, // branches to get upper & lower band. for (i = 0; i < band_length; i++) { - tmp = filter1[i] + filter2[i] + 1024; - tmp = WEBRTC_SPL_RSHIFT_W32(tmp, 11); + tmp = (filter1[i] + filter2[i] + 1024) >> 11; low_band[i] = WebRtcSpl_SatW32ToW16(tmp); - tmp = filter1[i] - filter2[i] + 1024; - tmp = WEBRTC_SPL_RSHIFT_W32(tmp, 11); + tmp = (filter1[i] - filter2[i] + 1024) >> 11; high_band[i] = WebRtcSpl_SatW32ToW16(tmp); } } @@ -200,10 +198,10 @@ void WebRtcSpl_SynthesisQMF(const int16_t* low_band, const int16_t* high_band, // saturation. for (i = 0, k = 0; i < band_length; i++) { - tmp = WEBRTC_SPL_RSHIFT_W32(filter2[i] + 512, 10); + tmp = (filter2[i] + 512) >> 10; out_data[k++] = WebRtcSpl_SatW32ToW16(tmp); - tmp = WEBRTC_SPL_RSHIFT_W32(filter1[i] + 512, 10); + tmp = (filter1[i] + 512) >> 10; out_data[k++] = WebRtcSpl_SatW32ToW16(tmp); } |