diff --git a/modules/video_coding/jitter_estimator.cc b/modules/video_coding/jitter_estimator.cc index 87848aec06..38ce35b61e 100644 --- a/modules/video_coding/jitter_estimator.cc +++ b/modules/video_coding/jitter_estimator.cc @@ -58,32 +58,6 @@ VCMJitterEstimator::VCMJitterEstimator(Clock* clock) VCMJitterEstimator::~VCMJitterEstimator() {} -VCMJitterEstimator& VCMJitterEstimator::operator=( - const VCMJitterEstimator& rhs) { - if (this != &rhs) { - memcpy(_thetaCov, rhs._thetaCov, sizeof(_thetaCov)); - memcpy(_Qcov, rhs._Qcov, sizeof(_Qcov)); - - _avgFrameSize = rhs._avgFrameSize; - _varFrameSize = rhs._varFrameSize; - _maxFrameSize = rhs._maxFrameSize; - _fsSum = rhs._fsSum; - _fsCount = rhs._fsCount; - _lastUpdateT = rhs._lastUpdateT; - _prevEstimate = rhs._prevEstimate; - _prevFrameSize = rhs._prevFrameSize; - _avgNoise = rhs._avgNoise; - _alphaCount = rhs._alphaCount; - _filterJitterEstimate = rhs._filterJitterEstimate; - _startupCount = rhs._startupCount; - _latestNackTimestamp = rhs._latestNackTimestamp; - _nackCount = rhs._nackCount; - _rttFilter = rhs._rttFilter; - clock_ = rhs.clock_; - } - return *this; -} - // Resets the JitterEstimate. void VCMJitterEstimator::Reset() { _theta[0] = 1 / (512e3 / 8); diff --git a/modules/video_coding/jitter_estimator.h b/modules/video_coding/jitter_estimator.h index 1d69b95769..ee8f264329 100644 --- a/modules/video_coding/jitter_estimator.h +++ b/modules/video_coding/jitter_estimator.h @@ -22,7 +22,8 @@ class VCMJitterEstimator { public: explicit VCMJitterEstimator(Clock* clock); virtual ~VCMJitterEstimator(); - VCMJitterEstimator& operator=(const VCMJitterEstimator& rhs); + VCMJitterEstimator(const VCMJitterEstimator&) = delete; + VCMJitterEstimator& operator=(const VCMJitterEstimator&) = delete; // Resets the estimate to the initial state. void Reset(); diff --git a/modules/video_coding/rtt_filter.cc b/modules/video_coding/rtt_filter.cc index 75813a46ad..773ff6867e 100644 --- a/modules/video_coding/rtt_filter.cc +++ b/modules/video_coding/rtt_filter.cc @@ -26,21 +26,6 @@ VCMRttFilter::VCMRttFilter() Reset(); } -VCMRttFilter& VCMRttFilter::operator=(const VCMRttFilter& rhs) { - if (this != &rhs) { - _gotNonZeroUpdate = rhs._gotNonZeroUpdate; - _avgRtt = rhs._avgRtt; - _varRtt = rhs._varRtt; - _maxRtt = rhs._maxRtt; - _filtFactCount = rhs._filtFactCount; - _jumpCount = rhs._jumpCount; - _driftCount = rhs._driftCount; - memcpy(_jumpBuf, rhs._jumpBuf, sizeof(_jumpBuf)); - memcpy(_driftBuf, rhs._driftBuf, sizeof(_driftBuf)); - } - return *this; -} - void VCMRttFilter::Reset() { _gotNonZeroUpdate = false; _avgRtt = 0; diff --git a/modules/video_coding/rtt_filter.h b/modules/video_coding/rtt_filter.h index 073fabb85b..bc4f56d2b9 100644 --- a/modules/video_coding/rtt_filter.h +++ b/modules/video_coding/rtt_filter.h @@ -18,8 +18,8 @@ namespace webrtc { class VCMRttFilter { public: VCMRttFilter(); - - VCMRttFilter& operator=(const VCMRttFilter& rhs); + VCMRttFilter(const VCMRttFilter&) = delete; + VCMRttFilter& operator=(const VCMRttFilter&) = delete; // Resets the filter. void Reset();