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

Fix a name collision with Android libc++

Browse Source 
The Android libc++ has a symbol called '_P'
This CL renames a property called _P in webrtc.

BUG=chromium:427718
R=andrew@webrtc.org

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

Patch from Fabrice de Gans-Riberi <fdegans@chromium.org>.

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7579 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
andrew@webrtc.org 2014-10-31 16:01:25 +00:00
parent b7ed7799e7
commit cc476aa038
2 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
webrtc/system_wrappers/interface/timestamp_extrapolator.h
View File

@ -31,7 +31,7 @@ private:
bool DelayChangeDetection(double error);
RWLockWrapper* _rwLock;
double _w[2];
double _P[2][2];
double _pP[2][2];
int64_t _startMs;
int64_t _prevMs;
uint32_t _firstTimestamp;
@ -48,7 +48,7 @@ private:
const double _alarmThreshold;
const double _accDrift;
const double _accMaxError;
const double _P11;
const double _pP11;
};
} // namespace webrtc

30
webrtc/system_wrappers/source/timestamp_extrapolator.cc
View File

@ -30,7 +30,7 @@ TimestampExtrapolator::TimestampExtrapolator(int64_t start_ms)
_alarmThreshold(60e3),
_accDrift(6600), // in timestamp ticks, i.e. 15 ms
_accMaxError(7000),
_P11(1e10) {
_pP11(1e10) {
Reset(start_ms);
}
@ -47,9 +47,9 @@ void TimestampExtrapolator::Reset(int64_t start_ms)
_firstTimestamp = 0;
_w[0] = 90.0;
_w[1] = 0;
_P[0][0] = 1;
_P[1][1] = _P11;
_P[0][1] = _P[1][0] = 0;
_pP[0][0] = 1;
_pP[1][1] = _pP11;
_pP[0][1] = _pP[1][0] = 0;
_firstAfterReset = true;
_prevUnwrappedTimestamp = -1;
_prevWrapTimestamp = -1;
@ -112,14 +112,14 @@ TimestampExtrapolator::Update(int64_t tMs, uint32_t ts90khz)
// A sudden change of average network delay has been detected.
// Force the filter to adjust its offset parameter by changing
// the offset uncertainty. Don't do this during startup.
_P[1][1] = _P11;
_pP[1][1] = _pP11;
}
//T = [t(k) 1]';
//that = T'*w;
//K = P*T/(lambda + T'*P*T);
double K[2];
K[0] = _P[0][0] * tMs + _P[0][1];
K[1] = _P[1][0] * tMs + _P[1][1];
K[0] = _pP[0][0] * tMs + _pP[0][1];
K[1] = _pP[1][0] * tMs + _pP[1][1];
double TPT = _lambda + tMs * K[0] + K[1];
K[0] /= TPT;
K[1] /= TPT;
@ -127,12 +127,16 @@ TimestampExtrapolator::Update(int64_t tMs, uint32_t ts90khz)
_w[0] = _w[0] + K[0] * residual;
_w[1] = _w[1] + K[1] * residual;
//P = 1/lambda*(P - K*T'*P);
double p00 = 1 / _lambda * (_P[0][0] - (K[0] * tMs * _P[0][0] + K[0] * _P[1][0]));
double p01 = 1 / _lambda * (_P[0][1] - (K[0] * tMs * _P[0][1] + K[0] * _P[1][1]));
_P[1][0] = 1 / _lambda * (_P[1][0] - (K[1] * tMs * _P[0][0] + K[1] * _P[1][0]));
_P[1][1] = 1 / _lambda * (_P[1][1] - (K[1] * tMs * _P[0][1] + K[1] * _P[1][1]));
_P[0][0] = p00;
_P[0][1] = p01;
double p00 = 1 / _lambda *
(_pP[0][0] - (K[0] * tMs * _pP[0][0] + K[0] * _pP[1][0]));
double p01 = 1 / _lambda *
(_pP[0][1] - (K[0] * tMs * _pP[0][1] + K[0] * _pP[1][1]));
_pP[1][0] = 1 / _lambda *
(_pP[1][0] - (K[1] * tMs * _pP[0][0] + K[1] * _pP[1][0]));
_pP[1][1] = 1 / _lambda *
(_pP[1][1] - (K[1] * tMs * _pP[0][1] + K[1] * _pP[1][1]));
_pP[0][0] = p00;
_pP[0][1] = p01;
_prevUnwrappedTimestamp = unwrapped_ts90khz;
if (_packetCount < _startUpFilterDelayInPackets)
{