From 2259f855ea24063fc47f8111b13114e033ec6d2c Mon Sep 17 00:00:00 2001 From: "wu@webrtc.org" Date: Tue, 19 Jun 2012 14:56:50 +0000 Subject: [PATCH] Remove unused member variables found by clang's -Wunused-private-field. No intended behavior change. On behavior of thakis@chromium.org. BUG= TEST= Review URL: https://webrtc-codereview.appspot.com/641011 git-svn-id: http://webrtc.googlecode.com/svn/trunk@2425 4adac7df-926f-26a2-2b94-8c16560cd09d --- src/modules/audio_coding/main/source/acm_dtmf_detection.cc | 3 +-- src/modules/audio_coding/main/source/acm_dtmf_detection.h | 1 - .../main/source/dummy/audio_device_utility_dummy.cc | 3 +-- .../main/source/dummy/audio_device_utility_dummy.h | 1 - src/modules/media_file/source/avi_file.cc | 1 - src/modules/media_file/source/avi_file.h | 1 - src/modules/utility/source/coder.cc | 3 +-- src/modules/utility/source/coder.h | 2 -- src/modules/utility/source/file_player_impl.cc | 1 - src/modules/utility/source/file_player_impl.h | 1 - src/modules/utility/source/video_coder.cc | 3 +-- src/modules/utility/source/video_coder.h | 1 - src/modules/video_coding/main/source/jitter_estimator.cc | 1 - src/modules/video_coding/main/source/jitter_estimator.h | 1 - src/modules/video_coding/main/source/media_opt_util.cc | 1 - src/modules/video_coding/main/source/media_opt_util.h | 1 - src/modules/video_coding/main/source/media_optimization.cc | 1 - src/modules/video_coding/main/source/media_optimization.h | 1 - .../main/source/external/video_render_external_impl.cc | 2 +- .../main/source/external/video_render_external_impl.h | 1 - src/modules/video_render/main/source/video_render_impl.cc | 5 ++--- src/modules/video_render/main/source/video_render_impl.h | 1 - src/video_engine/vie_channel_manager.cc | 1 - src/video_engine/vie_channel_manager.h | 1 - src/video_engine/vie_file_player.cc | 1 - src/video_engine/vie_file_player.h | 1 - src/video_engine/vie_performance_monitor.cc | 3 --- src/video_engine/vie_performance_monitor.h | 2 -- src/video_engine/vie_renderer.cc | 1 - src/video_engine/vie_renderer.h | 1 - 30 files changed, 7 insertions(+), 40 deletions(-) diff --git a/src/modules/audio_coding/main/source/acm_dtmf_detection.cc b/src/modules/audio_coding/main/source/acm_dtmf_detection.cc index 7669b0767b..1238e181f1 100644 --- a/src/modules/audio_coding/main/source/acm_dtmf_detection.cc +++ b/src/modules/audio_coding/main/source/acm_dtmf_detection.cc @@ -13,8 +13,7 @@ namespace webrtc { -ACMDTMFDetection::ACMDTMFDetection() - : _init(0) {} +ACMDTMFDetection::ACMDTMFDetection() {} ACMDTMFDetection::~ACMDTMFDetection() {} diff --git a/src/modules/audio_coding/main/source/acm_dtmf_detection.h b/src/modules/audio_coding/main/source/acm_dtmf_detection.h index 16aba8445c..6bedddbf26 100644 --- a/src/modules/audio_coding/main/source/acm_dtmf_detection.h +++ b/src/modules/audio_coding/main/source/acm_dtmf_detection.h @@ -35,7 +35,6 @@ class ACMDTMFDetection { private: ACMResampler _resampler; - bool _init; }; } // namespace webrtc diff --git a/src/modules/audio_device/main/source/dummy/audio_device_utility_dummy.cc b/src/modules/audio_device/main/source/dummy/audio_device_utility_dummy.cc index 4568182c93..816e67fedf 100644 --- a/src/modules/audio_device/main/source/dummy/audio_device_utility_dummy.cc +++ b/src/modules/audio_device/main/source/dummy/audio_device_utility_dummy.cc @@ -18,8 +18,7 @@ namespace webrtc AudioDeviceUtilityDummy::AudioDeviceUtilityDummy(const WebRtc_Word32 id) : _critSect(*CriticalSectionWrapper::CreateCriticalSection()), - _id(id), - _lastError(AudioDeviceModule::kAdmErrNone) + _id(id) { WEBRTC_TRACE(kTraceMemory, kTraceAudioDevice, id, "%s created", __FUNCTION__); diff --git a/src/modules/audio_device/main/source/dummy/audio_device_utility_dummy.h b/src/modules/audio_device/main/source/dummy/audio_device_utility_dummy.h index 601c4489e2..15ce10525d 100644 --- a/src/modules/audio_device/main/source/dummy/audio_device_utility_dummy.h +++ b/src/modules/audio_device/main/source/dummy/audio_device_utility_dummy.h @@ -29,7 +29,6 @@ public: private: CriticalSectionWrapper& _critSect; WebRtc_Word32 _id; - AudioDeviceModule::ErrorCode _lastError; }; } // namespace webrtc diff --git a/src/modules/media_file/source/avi_file.cc b/src/modules/media_file/source/avi_file.cc index 74f7908ff0..862922838b 100644 --- a/src/modules/media_file/source/avi_file.cc +++ b/src/modules/media_file/source/avi_file.cc @@ -148,7 +148,6 @@ AviFile::AviFile() _videoConfigParameters(), _videoConfigLength(0), _videoStreamName(), - _videoStreamNameLength(0), _audioConfigParameters(), _audioStreamName(), _videoStream(), diff --git a/src/modules/media_file/source/avi_file.h b/src/modules/media_file/source/avi_file.h index 0111a79c3f..fe7069258e 100644 --- a/src/modules/media_file/source/avi_file.h +++ b/src/modules/media_file/source/avi_file.h @@ -230,7 +230,6 @@ private: WebRtc_Word8 _videoConfigParameters[CODEC_CONFIG_LENGTH]; WebRtc_Word32 _videoConfigLength; WebRtc_Word8 _videoStreamName[STREAM_NAME_LENGTH]; - WebRtc_Word32 _videoStreamNameLength; WebRtc_Word8 _audioConfigParameters[CODEC_CONFIG_LENGTH]; WebRtc_Word8 _audioStreamName[STREAM_NAME_LENGTH]; diff --git a/src/modules/utility/source/coder.cc b/src/modules/utility/source/coder.cc index 00ff969c2b..31d528ddb7 100644 --- a/src/modules/utility/source/coder.cc +++ b/src/modules/utility/source/coder.cc @@ -21,8 +21,7 @@ namespace webrtc { AudioCoder::AudioCoder(WebRtc_UWord32 instanceID) - : _instanceID(instanceID), - _acm(AudioCodingModule::Create(instanceID)), + : _acm(AudioCodingModule::Create(instanceID)), _receiveCodec(), _encodeTimestamp(0), _encodedData(NULL), diff --git a/src/modules/utility/source/coder.h b/src/modules/utility/source/coder.h index e96f455ca8..e7cbfb8bbe 100644 --- a/src/modules/utility/source/coder.h +++ b/src/modules/utility/source/coder.h @@ -52,8 +52,6 @@ protected: const RTPFragmentationHeader* fragmentation); private: - WebRtc_UWord32 _instanceID; - AudioCodingModule* _acm; CodecInst _receiveCodec; diff --git a/src/modules/utility/source/file_player_impl.cc b/src/modules/utility/source/file_player_impl.cc index 8c456b2cf7..574fd7e4e2 100644 --- a/src/modules/utility/source/file_player_impl.cc +++ b/src/modules/utility/source/file_player_impl.cc @@ -64,7 +64,6 @@ FilePlayerImpl::FilePlayerImpl(const WebRtc_UWord32 instanceID, _fileFormat(fileFormat), _fileModule(*MediaFile::CreateMediaFile(instanceID)), _decodedLengthInMS(0), - _decodedAudioBuffer(), _audioDecoder(instanceID), _codec(), _numberOf10MsPerFrame(0), diff --git a/src/modules/utility/source/file_player_impl.h b/src/modules/utility/source/file_player_impl.h index 0d1e242171..9ae3838515 100644 --- a/src/modules/utility/source/file_player_impl.h +++ b/src/modules/utility/source/file_player_impl.h @@ -69,7 +69,6 @@ protected: WebRtc_UWord32 _decodedLengthInMS; private: - WebRtc_Word16 _decodedAudioBuffer[MAX_AUDIO_BUFFER_IN_SAMPLES]; AudioCoder _audioDecoder; CodecInst _codec; diff --git a/src/modules/utility/source/video_coder.cc b/src/modules/utility/source/video_coder.cc index e17c3e0498..06c7ffdf69 100644 --- a/src/modules/utility/source/video_coder.cc +++ b/src/modules/utility/source/video_coder.cc @@ -14,8 +14,7 @@ namespace webrtc { VideoCoder::VideoCoder(WebRtc_UWord32 instanceID) - : _instanceID( instanceID), - _vcm(VideoCodingModule::Create(instanceID)), + : _vcm(VideoCodingModule::Create(instanceID)), _decodedVideo(0) { _vcm->InitializeSender(); diff --git a/src/modules/utility/source/video_coder.h b/src/modules/utility/source/video_coder.h index 5c4b0aec8d..33174dd472 100644 --- a/src/modules/utility/source/video_coder.h +++ b/src/modules/utility/source/video_coder.h @@ -59,7 +59,6 @@ private: const RTPFragmentationHeader& /* fragmentationHeader*/, const RTPVideoHeader* rtpTypeHdr); - WebRtc_UWord32 _instanceID; VideoCodingModule* _vcm; VideoFrame* _decodedVideo; EncodedVideoData* _videoEncodedData; diff --git a/src/modules/video_coding/main/source/jitter_estimator.cc b/src/modules/video_coding/main/source/jitter_estimator.cc index 93c6ccb8f3..56bc689740 100644 --- a/src/modules/video_coding/main/source/jitter_estimator.cc +++ b/src/modules/video_coding/main/source/jitter_estimator.cc @@ -26,7 +26,6 @@ _receiverId(receiverId), _phi(0.97), _psi(0.9999), _alphaCountMax(400), -_beta(0.9994), _thetaLow(0.000001), _nackLimit(3), _numStdDevDelayOutlier(15), diff --git a/src/modules/video_coding/main/source/jitter_estimator.h b/src/modules/video_coding/main/source/jitter_estimator.h index 6fc47030a2..5c48d91c98 100644 --- a/src/modules/video_coding/main/source/jitter_estimator.h +++ b/src/modules/video_coding/main/source/jitter_estimator.h @@ -115,7 +115,6 @@ private: const double _phi; const double _psi; const WebRtc_UWord32 _alphaCountMax; - const double _beta; const double _thetaLow; const WebRtc_UWord32 _nackLimit; const WebRtc_Word32 _numStdDevDelayOutlier; diff --git a/src/modules/video_coding/main/source/media_opt_util.cc b/src/modules/video_coding/main/source/media_opt_util.cc index 063a84d2cc..762d8abecb 100644 --- a/src/modules/video_coding/main/source/media_opt_util.cc +++ b/src/modules/video_coding/main/source/media_opt_util.cc @@ -653,7 +653,6 @@ _shortMaxLossPr255(0), _packetsPerFrame(0.9999f), _packetsPerFrameKey(0.9999f), _residualPacketLossFec(0), -_boostRateKey(2), _codecWidth(0), _codecHeight(0), _numLayers(1) diff --git a/src/modules/video_coding/main/source/media_opt_util.h b/src/modules/video_coding/main/source/media_opt_util.h index c8d88a8299..7cf97fbf28 100644 --- a/src/modules/video_coding/main/source/media_opt_util.h +++ b/src/modules/video_coding/main/source/media_opt_util.h @@ -385,7 +385,6 @@ private: VCMExpFilter _packetsPerFrame; VCMExpFilter _packetsPerFrameKey; float _residualPacketLossFec; - WebRtc_UWord8 _boostRateKey; WebRtc_UWord16 _codecWidth; WebRtc_UWord16 _codecHeight; int _numLayers; diff --git a/src/modules/video_coding/main/source/media_optimization.cc b/src/modules/video_coding/main/source/media_optimization.cc index cf970d4703..381ea6d7c1 100644 --- a/src/modules/video_coding/main/source/media_optimization.cc +++ b/src/modules/video_coding/main/source/media_optimization.cc @@ -26,7 +26,6 @@ _sendCodecType(kVideoCodecUnknown), _codecWidth(0), _codecHeight(0), _userFrameRate(0), -_packetLossEnc(0), _fractionLost(0), _sendStatisticsZeroEncode(0), _maxPayloadSize(1460), diff --git a/src/modules/video_coding/main/source/media_optimization.h b/src/modules/video_coding/main/source/media_optimization.h index 7d87a6d041..3b6c978610 100644 --- a/src/modules/video_coding/main/source/media_optimization.h +++ b/src/modules/video_coding/main/source/media_optimization.h @@ -172,7 +172,6 @@ private: VCMFrameDropper* _frameDropper; VCMLossProtectionLogic* _lossProtLogic; - WebRtc_UWord8 _packetLossEnc; WebRtc_UWord8 _fractionLost; diff --git a/src/modules/video_render/main/source/external/video_render_external_impl.cc b/src/modules/video_render/main/source/external/video_render_external_impl.cc index 690be5a620..a460033764 100644 --- a/src/modules/video_render/main/source/external/video_render_external_impl.cc +++ b/src/modules/video_render/main/source/external/video_render_external_impl.cc @@ -18,7 +18,7 @@ VideoRenderExternalImpl::VideoRenderExternalImpl( void* window, const bool fullscreen) : _id(id), _critSect(*CriticalSectionWrapper::CreateCriticalSection()), - _window(window), _fullscreen(fullscreen) + _fullscreen(fullscreen) { } diff --git a/src/modules/video_render/main/source/external/video_render_external_impl.h b/src/modules/video_render/main/source/external/video_render_external_impl.h index e1374f4e8b..547c4105f7 100644 --- a/src/modules/video_render/main/source/external/video_render_external_impl.h +++ b/src/modules/video_render/main/source/external/video_render_external_impl.h @@ -124,7 +124,6 @@ public: private: WebRtc_Word32 _id; CriticalSectionWrapper& _critSect; - void* _window; bool _fullscreen; }; diff --git a/src/modules/video_render/main/source/video_render_impl.cc b/src/modules/video_render/main/source/video_render_impl.cc index 2ce0b915c5..1aaa2865f0 100644 --- a/src/modules/video_render/main/source/video_render_impl.cc +++ b/src/modules/video_render/main/source/video_render_impl.cc @@ -103,9 +103,8 @@ ModuleVideoRenderImpl::ModuleVideoRenderImpl( void* window, const bool fullscreen) : _id(id), _moduleCrit(*CriticalSectionWrapper::CreateCriticalSection()), - _ptrWindow(window), _renderType(videoRenderType), - _fullScreen(fullscreen), _ptrRenderer(NULL), - _streamRenderMap(*(new MapWrapper())) + _ptrWindow(window), _fullScreen(fullscreen), _ptrRenderer(NULL), + _streamRenderMap(*(new MapWrapper())) { // Create platform specific renderer diff --git a/src/modules/video_render/main/source/video_render_impl.h b/src/modules/video_render/main/source/video_render_impl.h index 16f934edf0..ac500922d1 100644 --- a/src/modules/video_render/main/source/video_render_impl.h +++ b/src/modules/video_render/main/source/video_render_impl.h @@ -217,7 +217,6 @@ private: WebRtc_Word32 _id; CriticalSectionWrapper& _moduleCrit; void* _ptrWindow; - VideoRenderType _renderType; bool _fullScreen; IVideoRender* _ptrRenderer; diff --git a/src/video_engine/vie_channel_manager.cc b/src/video_engine/vie_channel_manager.cc index c51f527df6..5eb4863693 100644 --- a/src/video_engine/vie_channel_manager.cc +++ b/src/video_engine/vie_channel_manager.cc @@ -31,7 +31,6 @@ ViEChannelManager::ViEChannelManager( : channel_id_critsect_(CriticalSectionWrapper::CreateCriticalSection()), engine_id_(engine_id), number_of_cores_(number_of_cores), - vie_performance_monitor_(vie_performance_monitor), free_channel_ids_(new bool[kViEMaxNumberOfChannels]), free_channel_ids_size_(kViEMaxNumberOfChannels), voice_sync_interface_(NULL), diff --git a/src/video_engine/vie_channel_manager.h b/src/video_engine/vie_channel_manager.h index e61e741317..ec241eee03 100644 --- a/src/video_engine/vie_channel_manager.h +++ b/src/video_engine/vie_channel_manager.h @@ -109,7 +109,6 @@ class ViEChannelManager: private ViEManagerBase { CriticalSectionWrapper* channel_id_critsect_; int engine_id_; int number_of_cores_; - ViEPerformanceMonitor& vie_performance_monitor_; // TODO(mflodman) Make part of channel group. ChannelMap channel_map_; diff --git a/src/video_engine/vie_file_player.cc b/src/video_engine/vie_file_player.cc index b6461fa768..eff1542ba8 100644 --- a/src/video_engine/vie_file_player.cc +++ b/src/video_engine/vie_file_player.cc @@ -47,7 +47,6 @@ ViEFilePlayer::ViEFilePlayer(int Id, ViEInputManager& input_manager) : ViEFrameProviderBase(Id, engine_id), play_back_started_(false), - input_manager_(input_manager), feedback_cs_(NULL), audio_cs_(NULL), file_player_(NULL), diff --git a/src/video_engine/vie_file_player.h b/src/video_engine/vie_file_player.h index 845e16b2da..1a907725f5 100644 --- a/src/video_engine/vie_file_player.h +++ b/src/video_engine/vie_file_player.h @@ -95,7 +95,6 @@ class ViEFilePlayer private: static const int kMaxDecodedAudioLength = 320; bool play_back_started_; - ViEInputManager& input_manager_; CriticalSectionWrapper* feedback_cs_; CriticalSectionWrapper* audio_cs_; diff --git a/src/video_engine/vie_performance_monitor.cc b/src/video_engine/vie_performance_monitor.cc index 43ae056749..917fb7dad0 100644 --- a/src/video_engine/vie_performance_monitor.cc +++ b/src/video_engine/vie_performance_monitor.cc @@ -22,15 +22,12 @@ namespace webrtc { enum { kVieMonitorPeriodMs = 975 }; -enum { kVieCpuStartValue = 75 }; ViEPerformanceMonitor::ViEPerformanceMonitor(int engine_id) : engine_id_(engine_id), pointer_cs_(CriticalSectionWrapper::CreateCriticalSection()), monitor_thread_(NULL), monitor_event_(*EventWrapper::Create()), - average_application_cpu_(kVieCpuStartValue), - average_system_cpu_(kVieCpuStartValue), cpu_(NULL), vie_base_observer_(NULL) { } diff --git a/src/video_engine/vie_performance_monitor.h b/src/video_engine/vie_performance_monitor.h index c3ea931cf6..2b47c0e118 100644 --- a/src/video_engine/vie_performance_monitor.h +++ b/src/video_engine/vie_performance_monitor.h @@ -45,8 +45,6 @@ class ViEPerformanceMonitor { CriticalSectionWrapper* pointer_cs_; ThreadWrapper* monitor_thread_; EventWrapper& monitor_event_; - int average_application_cpu_; - int average_system_cpu_; CpuWrapper* cpu_; ViEBaseObserver* vie_base_observer_; }; diff --git a/src/video_engine/vie_renderer.cc b/src/video_engine/vie_renderer.cc index 7e56b7a7c4..4d044a6012 100644 --- a/src/video_engine/vie_renderer.cc +++ b/src/video_engine/vie_renderer.cc @@ -104,7 +104,6 @@ ViERenderer::ViERenderer(const WebRtc_Word32 render_id, VideoRender& render_module, ViERenderManager& render_manager) : render_id_(render_id), - engine_id_(engine_id), render_module_(render_module), render_manager_(render_manager), render_callback_(NULL), diff --git a/src/video_engine/vie_renderer.h b/src/video_engine/vie_renderer.h index 028d72b058..498b9bde21 100644 --- a/src/video_engine/vie_renderer.h +++ b/src/video_engine/vie_renderer.h @@ -105,7 +105,6 @@ class ViERenderer: public ViEFrameCallback { virtual void ProviderDestroyed(int id); WebRtc_UWord32 render_id_; - WebRtc_Word32 engine_id_; VideoRender& render_module_; ViERenderManager& render_manager_; VideoRenderCallback* render_callback_;