generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

common_audio: Removes macro WEBRTC_SPL_SHIFT_W16

Browse Source 
We should avoid macros in general (see style guide). This shift macro is not a severe one, since there is a check for negativity.

BUG=3348,3353
TESTED=trybots and manually
R=kwiberg@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/15799004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6591 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
bjornv@webrtc.org 2014-07-03 13:38:53 +00:00
parent 38214d53db
commit c0ba4392f1
4 changed files with 28 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
webrtc/common_audio/signal_processing/include/signal_processing_library.h
View File

@ -111,8 +111,6 @@
// Shifting with negative numbers allowed // Shifting with negative numbers allowed
// Positive means left shift // Positive means left shift
#define WEBRTC_SPL_SHIFT_W16(x, c) \
(((c) >= 0) ? ((x) << (c)) : ((x) >> (-(c))))
#define WEBRTC_SPL_SHIFT_W32(x, c) \ #define WEBRTC_SPL_SHIFT_W32(x, c) \
(((c) >= 0) ? ((x) << (c)) : ((x) >> (-(c)))) (((c) >= 0) ? ((x) << (c)) : ((x) >> (-(c))))

1
webrtc/common_audio/signal_processing/signal_processing_unittest.cc
View File

@ -79,7 +79,6 @@ TEST_F(SplTest, MacroTest) {
// Shifting with negative numbers allowed // Shifting with negative numbers allowed
int shift_amount = 1; // Workaround compiler warning using variable here. int shift_amount = 1; // Workaround compiler warning using variable here.
// Positive means left shift // Positive means left shift
EXPECT_EQ(32766, WEBRTC_SPL_SHIFT_W16(a, shift_amount));
EXPECT_EQ(32766, WEBRTC_SPL_SHIFT_W32(a, shift_amount)); EXPECT_EQ(32766, WEBRTC_SPL_SHIFT_W32(a, shift_amount));
// Shifting with negative numbers not allowed // Shifting with negative numbers not allowed

33
webrtc/modules/audio_processing/aecm/aecm_core_c.c
View File

@ -328,7 +328,7 @@ int WebRtcAecm_ProcessBlock(AecmCore_t * aecm,
int16_t zeros32, zeros16; int16_t zeros32, zeros16;
int16_t zerosDBufNoisy, zerosDBufClean, zerosXBuf; int16_t zerosDBufNoisy, zerosDBufClean, zerosXBuf;
int far_q; int far_q;
int16_t resolutionDiff, qDomainDiff; int16_t resolutionDiff, qDomainDiff, dfa_clean_q_domain_diff;
const int kMinPrefBand = 4; const int kMinPrefBand = 4;
const int kMaxPrefBand = 24; const int kMaxPrefBand = 24;
@ -499,29 +499,28 @@ int WebRtcAecm_ProcessBlock(AecmCore_t * aecm,
} }
zeros16 = WebRtcSpl_NormW16(aecm->nearFilt[i]); zeros16 = WebRtcSpl_NormW16(aecm->nearFilt[i]);
if ((zeros16 < (aecm->dfaCleanQDomain - aecm->dfaCleanQDomainOld)) assert(zeros16 >= 0); // |zeros16| is a norm, hence non-negative.
& (aecm->nearFilt[i])) dfa_clean_q_domain_diff = aecm->dfaCleanQDomain - aecm->dfaCleanQDomainOld;
{ if (zeros16 < dfa_clean_q_domain_diff && aecm->nearFilt[i]) {
tmp16no1 = WEBRTC_SPL_SHIFT_W16(aecm->nearFilt[i], zeros16); tmp16no1 = aecm->nearFilt[i] << zeros16;
qDomainDiff = zeros16 - aecm->dfaCleanQDomain + aecm->dfaCleanQDomainOld; qDomainDiff = zeros16 - dfa_clean_q_domain_diff;
} else tmp16no2 = ptrDfaClean[i] >> -qDomainDiff;
{ } else {
tmp16no1 = WEBRTC_SPL_SHIFT_W16(aecm->nearFilt[i], tmp16no1 = dfa_clean_q_domain_diff < 0
aecm->dfaCleanQDomain - ? aecm->nearFilt[i] >> -dfa_clean_q_domain_diff
aecm->dfaCleanQDomainOld); : aecm->nearFilt[i] << dfa_clean_q_domain_diff;
qDomainDiff = 0; qDomainDiff = 0;
tmp16no2 = ptrDfaClean[i];
} }
tmp16no2 = WEBRTC_SPL_SHIFT_W16(ptrDfaClean[i], qDomainDiff);
tmp32no1 = (int32_t)(tmp16no2 - tmp16no1); tmp32no1 = (int32_t)(tmp16no2 - tmp16no1);
tmp16no2 = (int16_t)WEBRTC_SPL_RSHIFT_W32(tmp32no1, 4); tmp16no2 = (int16_t)WEBRTC_SPL_RSHIFT_W32(tmp32no1, 4);
tmp16no2 += tmp16no1; tmp16no2 += tmp16no1;
zeros16 = WebRtcSpl_NormW16(tmp16no2); zeros16 = WebRtcSpl_NormW16(tmp16no2);
if ((tmp16no2) & (-qDomainDiff > zeros16)) if ((tmp16no2) & (-qDomainDiff > zeros16)) {
{
aecm->nearFilt[i] = WEBRTC_SPL_WORD16_MAX; aecm->nearFilt[i] = WEBRTC_SPL_WORD16_MAX;
} else } else {
{ aecm->nearFilt[i] = qDomainDiff < 0 ? tmp16no2 << -qDomainDiff
aecm->nearFilt[i] = WEBRTC_SPL_SHIFT_W16(tmp16no2, -qDomainDiff); : tmp16no2 >> qDomainDiff;
} }
// Wiener filter coefficients, resulting hnl in Q14 // Wiener filter coefficients, resulting hnl in Q14

22
webrtc/modules/audio_processing/aecm/aecm_core_mips.c
View File

@ -836,7 +836,7 @@ int WebRtcAecm_ProcessBlock(AecmCore_t* aecm,
int16_t zeros32, zeros16; int16_t zeros32, zeros16;
int16_t zerosDBufNoisy, zerosDBufClean, zerosXBuf; int16_t zerosDBufNoisy, zerosDBufClean, zerosXBuf;
int far_q; int far_q;
int16_t resolutionDiff, qDomainDiff; int16_t resolutionDiff, qDomainDiff, dfa_clean_q_domain_diff;
const int kMinPrefBand = 4; const int kMinPrefBand = 4;
const int kMaxPrefBand = 24; const int kMaxPrefBand = 24;
@ -1002,15 +1002,16 @@ int WebRtcAecm_ProcessBlock(AecmCore_t* aecm,
} }
zeros16 = WebRtcSpl_NormW16(aecm->nearFilt[i]); zeros16 = WebRtcSpl_NormW16(aecm->nearFilt[i]);
if ((zeros16 < (aecm->dfaCleanQDomain - aecm->dfaCleanQDomainOld)) assert(zeros16 >= 0); // |zeros16| is a norm, hence non-negative.
& (aecm->nearFilt[i])) { dfa_clean_q_domain_diff = aecm->dfaCleanQDomain - aecm->dfaCleanQDomainOld;
tmp16no1 = WEBRTC_SPL_SHIFT_W16(aecm->nearFilt[i], zeros16); if (zeros16 < dfa_clean_q_domain_diff && aecm->nearFilt[i]) {
qDomainDiff = zeros16 - aecm->dfaCleanQDomain + aecm->dfaCleanQDomainOld; tmp16no1 = aecm->nearFilt[i] << zeros16;
tmp16no2 = WEBRTC_SPL_SHIFT_W16(ptrDfaClean[i], qDomainDiff); qDomainDiff = zeros16 - dfa_clean_q_domain_diff;
tmp16no2 = ptrDfaClean[i] >> -qDomainDiff;
} else { } else {
tmp16no1 = WEBRTC_SPL_SHIFT_W16(aecm->nearFilt[i], tmp16no1 = dfa_clean_q_domain_diff < 0
aecm->dfaCleanQDomain ? aecm->nearFilt[i] >> -dfa_clean_q_domain_diff
- aecm->dfaCleanQDomainOld); : aecm->nearFilt[i] << dfa_clean_q_domain_diff;
qDomainDiff = 0; qDomainDiff = 0;
tmp16no2 = ptrDfaClean[i]; tmp16no2 = ptrDfaClean[i];
} }
@ -1022,7 +1023,8 @@ int WebRtcAecm_ProcessBlock(AecmCore_t* aecm,
if ((tmp16no2) & (-qDomainDiff > zeros16)) { if ((tmp16no2) & (-qDomainDiff > zeros16)) {
aecm->nearFilt[i] = WEBRTC_SPL_WORD16_MAX; aecm->nearFilt[i] = WEBRTC_SPL_WORD16_MAX;
} else { } else {
aecm->nearFilt[i] = WEBRTC_SPL_SHIFT_W16(tmp16no2, -qDomainDiff); aecm->nearFilt[i] = qDomainDiff < 0 ? tmp16no2 << -qDomainDiff
: tmp16no2 >> qDomainDiff;
} }
// Wiener filter coefficients, resulting hnl in Q14 // Wiener filter coefficients, resulting hnl in Q14