From fb933bdb2642b4f0e4f1e73517a85f5decf93801 Mon Sep 17 00:00:00 2001 From: "tommi@webrtc.org" Date: Tue, 3 Jul 2012 08:19:12 +0000 Subject: [PATCH] Landing: https://webrtc-codereview.appspot.com/680005/ Fix more -Wunused-private-field violations. Review URL: https://webrtc-codereview.appspot.com/668010 git-svn-id: http://webrtc.googlecode.com/svn/trunk@2484 4adac7df-926f-26a2-2b94-8c16560cd09d --- src/modules/remote_bitrate_estimator/overuse_detector.cc | 7 +++++-- src/modules/remote_bitrate_estimator/overuse_detector.h | 2 ++ src/modules/rtp_rtcp/source/rtp_receiver_video.cc | 1 - src/modules/rtp_rtcp/source/rtp_receiver_video.h | 1 - 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/modules/remote_bitrate_estimator/overuse_detector.cc b/src/modules/remote_bitrate_estimator/overuse_detector.cc index f0b9832cdd..133614f7c0 100644 --- a/src/modules/remote_bitrate_estimator/overuse_detector.cc +++ b/src/modules/remote_bitrate_estimator/overuse_detector.cc @@ -44,8 +44,11 @@ OverUseDetector::OverUseDetector(const OverUseDetectorOptions& options) prev_offset_(0.0), time_over_using_(-1), over_use_counter_(0), - hypothesis_(kBwNormal), - plots_() { + hypothesis_(kBwNormal) +#ifdef WEBRTC_BWE_MATLAB + , plots_() +#endif + { memcpy(E_, options_.initial_e, sizeof(E_)); memcpy(process_noise_, options_.initial_process_noise, sizeof(process_noise_)); diff --git a/src/modules/remote_bitrate_estimator/overuse_detector.h b/src/modules/remote_bitrate_estimator/overuse_detector.h index c3a5a3c877..ba4c0dcdaf 100644 --- a/src/modules/remote_bitrate_estimator/overuse_detector.h +++ b/src/modules/remote_bitrate_estimator/overuse_detector.h @@ -90,7 +90,9 @@ class OverUseDetector { double time_over_using_; uint16_t over_use_counter_; BandwidthUsage hypothesis_; +#ifdef WEBRTC_BWE_MATLAB DebugPlots plots_; +#endif }; } // namespace webrtc diff --git a/src/modules/rtp_rtcp/source/rtp_receiver_video.cc b/src/modules/rtp_rtcp/source/rtp_receiver_video.cc index 807a52cfcf..2fc3258be8 100644 --- a/src/modules/rtp_rtcp/source/rtp_receiver_video.cc +++ b/src/modules/rtp_rtcp/source/rtp_receiver_video.cc @@ -30,7 +30,6 @@ RTPReceiverVideo::RTPReceiverVideo(const WebRtc_Word32 id, RemoteBitrateEstimator* remote_bitrate, ModuleRtpRtcpImpl* owner) : _id(id), - _rtpRtcp(owner), _criticalSectionReceiverVideo( CriticalSectionWrapper::CreateCriticalSection()), _currentFecFrameDecoded(false), diff --git a/src/modules/rtp_rtcp/source/rtp_receiver_video.h b/src/modules/rtp_rtcp/source/rtp_receiver_video.h index 1405630740..e50ef60948 100644 --- a/src/modules/rtp_rtcp/source/rtp_receiver_video.h +++ b/src/modules/rtp_rtcp/source/rtp_receiver_video.h @@ -98,7 +98,6 @@ class RTPReceiverVideo { private: WebRtc_Word32 _id; - ModuleRtpRtcpImpl* _rtpRtcp; CriticalSectionWrapper* _criticalSectionReceiverVideo;