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
2012-06-19 14:56:50 +00:00 · 2012-06-19 14:56:50 +00:00 · 2259f855ea
commit 2259f855ea
parent 72e3a89b52
30 changed files with 7 additions and 40 deletions
--- 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() {}

--- 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
--- 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__);
--- 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
--- 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(),
--- 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];

--- 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),
--- 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;
--- 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),
--- 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;
--- 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();
--- 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;
--- 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),
--- 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;
--- 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)
--- 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;
--- 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),
--- 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;


--- 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)
 {
 }

--- 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;
 };

--- 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
--- 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;
--- 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),
--- 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_;
--- 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),
--- 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_;
--- 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) {
 }
--- 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_;
 };
--- 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),
--- 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_;