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
This commit is contained in:
parent
72e3a89b52
commit
2259f855ea
@ -13,8 +13,7 @@
|
|||||||
|
|
||||||
namespace webrtc {
|
namespace webrtc {
|
||||||
|
|
||||||
ACMDTMFDetection::ACMDTMFDetection()
|
ACMDTMFDetection::ACMDTMFDetection() {}
|
||||||
: _init(0) {}
|
|
||||||
|
|
||||||
ACMDTMFDetection::~ACMDTMFDetection() {}
|
ACMDTMFDetection::~ACMDTMFDetection() {}
|
||||||
|
|
||||||
|
@ -35,7 +35,6 @@ class ACMDTMFDetection {
|
|||||||
|
|
||||||
private:
|
private:
|
||||||
ACMResampler _resampler;
|
ACMResampler _resampler;
|
||||||
bool _init;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace webrtc
|
} // namespace webrtc
|
||||||
|
@ -18,8 +18,7 @@ namespace webrtc
|
|||||||
|
|
||||||
AudioDeviceUtilityDummy::AudioDeviceUtilityDummy(const WebRtc_Word32 id) :
|
AudioDeviceUtilityDummy::AudioDeviceUtilityDummy(const WebRtc_Word32 id) :
|
||||||
_critSect(*CriticalSectionWrapper::CreateCriticalSection()),
|
_critSect(*CriticalSectionWrapper::CreateCriticalSection()),
|
||||||
_id(id),
|
_id(id)
|
||||||
_lastError(AudioDeviceModule::kAdmErrNone)
|
|
||||||
{
|
{
|
||||||
WEBRTC_TRACE(kTraceMemory, kTraceAudioDevice, id,
|
WEBRTC_TRACE(kTraceMemory, kTraceAudioDevice, id,
|
||||||
"%s created", __FUNCTION__);
|
"%s created", __FUNCTION__);
|
||||||
|
@ -29,7 +29,6 @@ public:
|
|||||||
private:
|
private:
|
||||||
CriticalSectionWrapper& _critSect;
|
CriticalSectionWrapper& _critSect;
|
||||||
WebRtc_Word32 _id;
|
WebRtc_Word32 _id;
|
||||||
AudioDeviceModule::ErrorCode _lastError;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace webrtc
|
} // namespace webrtc
|
||||||
|
@ -148,7 +148,6 @@ AviFile::AviFile()
|
|||||||
_videoConfigParameters(),
|
_videoConfigParameters(),
|
||||||
_videoConfigLength(0),
|
_videoConfigLength(0),
|
||||||
_videoStreamName(),
|
_videoStreamName(),
|
||||||
_videoStreamNameLength(0),
|
|
||||||
_audioConfigParameters(),
|
_audioConfigParameters(),
|
||||||
_audioStreamName(),
|
_audioStreamName(),
|
||||||
_videoStream(),
|
_videoStream(),
|
||||||
|
@ -230,7 +230,6 @@ private:
|
|||||||
WebRtc_Word8 _videoConfigParameters[CODEC_CONFIG_LENGTH];
|
WebRtc_Word8 _videoConfigParameters[CODEC_CONFIG_LENGTH];
|
||||||
WebRtc_Word32 _videoConfigLength;
|
WebRtc_Word32 _videoConfigLength;
|
||||||
WebRtc_Word8 _videoStreamName[STREAM_NAME_LENGTH];
|
WebRtc_Word8 _videoStreamName[STREAM_NAME_LENGTH];
|
||||||
WebRtc_Word32 _videoStreamNameLength;
|
|
||||||
WebRtc_Word8 _audioConfigParameters[CODEC_CONFIG_LENGTH];
|
WebRtc_Word8 _audioConfigParameters[CODEC_CONFIG_LENGTH];
|
||||||
WebRtc_Word8 _audioStreamName[STREAM_NAME_LENGTH];
|
WebRtc_Word8 _audioStreamName[STREAM_NAME_LENGTH];
|
||||||
|
|
||||||
|
@ -21,8 +21,7 @@
|
|||||||
|
|
||||||
namespace webrtc {
|
namespace webrtc {
|
||||||
AudioCoder::AudioCoder(WebRtc_UWord32 instanceID)
|
AudioCoder::AudioCoder(WebRtc_UWord32 instanceID)
|
||||||
: _instanceID(instanceID),
|
: _acm(AudioCodingModule::Create(instanceID)),
|
||||||
_acm(AudioCodingModule::Create(instanceID)),
|
|
||||||
_receiveCodec(),
|
_receiveCodec(),
|
||||||
_encodeTimestamp(0),
|
_encodeTimestamp(0),
|
||||||
_encodedData(NULL),
|
_encodedData(NULL),
|
||||||
|
@ -52,8 +52,6 @@ protected:
|
|||||||
const RTPFragmentationHeader* fragmentation);
|
const RTPFragmentationHeader* fragmentation);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
WebRtc_UWord32 _instanceID;
|
|
||||||
|
|
||||||
AudioCodingModule* _acm;
|
AudioCodingModule* _acm;
|
||||||
|
|
||||||
CodecInst _receiveCodec;
|
CodecInst _receiveCodec;
|
||||||
|
@ -64,7 +64,6 @@ FilePlayerImpl::FilePlayerImpl(const WebRtc_UWord32 instanceID,
|
|||||||
_fileFormat(fileFormat),
|
_fileFormat(fileFormat),
|
||||||
_fileModule(*MediaFile::CreateMediaFile(instanceID)),
|
_fileModule(*MediaFile::CreateMediaFile(instanceID)),
|
||||||
_decodedLengthInMS(0),
|
_decodedLengthInMS(0),
|
||||||
_decodedAudioBuffer(),
|
|
||||||
_audioDecoder(instanceID),
|
_audioDecoder(instanceID),
|
||||||
_codec(),
|
_codec(),
|
||||||
_numberOf10MsPerFrame(0),
|
_numberOf10MsPerFrame(0),
|
||||||
|
@ -69,7 +69,6 @@ protected:
|
|||||||
WebRtc_UWord32 _decodedLengthInMS;
|
WebRtc_UWord32 _decodedLengthInMS;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
WebRtc_Word16 _decodedAudioBuffer[MAX_AUDIO_BUFFER_IN_SAMPLES];
|
|
||||||
AudioCoder _audioDecoder;
|
AudioCoder _audioDecoder;
|
||||||
|
|
||||||
CodecInst _codec;
|
CodecInst _codec;
|
||||||
|
@ -14,8 +14,7 @@
|
|||||||
|
|
||||||
namespace webrtc {
|
namespace webrtc {
|
||||||
VideoCoder::VideoCoder(WebRtc_UWord32 instanceID)
|
VideoCoder::VideoCoder(WebRtc_UWord32 instanceID)
|
||||||
: _instanceID( instanceID),
|
: _vcm(VideoCodingModule::Create(instanceID)),
|
||||||
_vcm(VideoCodingModule::Create(instanceID)),
|
|
||||||
_decodedVideo(0)
|
_decodedVideo(0)
|
||||||
{
|
{
|
||||||
_vcm->InitializeSender();
|
_vcm->InitializeSender();
|
||||||
|
@ -59,7 +59,6 @@ private:
|
|||||||
const RTPFragmentationHeader& /* fragmentationHeader*/,
|
const RTPFragmentationHeader& /* fragmentationHeader*/,
|
||||||
const RTPVideoHeader* rtpTypeHdr);
|
const RTPVideoHeader* rtpTypeHdr);
|
||||||
|
|
||||||
WebRtc_UWord32 _instanceID;
|
|
||||||
VideoCodingModule* _vcm;
|
VideoCodingModule* _vcm;
|
||||||
VideoFrame* _decodedVideo;
|
VideoFrame* _decodedVideo;
|
||||||
EncodedVideoData* _videoEncodedData;
|
EncodedVideoData* _videoEncodedData;
|
||||||
|
@ -26,7 +26,6 @@ _receiverId(receiverId),
|
|||||||
_phi(0.97),
|
_phi(0.97),
|
||||||
_psi(0.9999),
|
_psi(0.9999),
|
||||||
_alphaCountMax(400),
|
_alphaCountMax(400),
|
||||||
_beta(0.9994),
|
|
||||||
_thetaLow(0.000001),
|
_thetaLow(0.000001),
|
||||||
_nackLimit(3),
|
_nackLimit(3),
|
||||||
_numStdDevDelayOutlier(15),
|
_numStdDevDelayOutlier(15),
|
||||||
|
@ -115,7 +115,6 @@ private:
|
|||||||
const double _phi;
|
const double _phi;
|
||||||
const double _psi;
|
const double _psi;
|
||||||
const WebRtc_UWord32 _alphaCountMax;
|
const WebRtc_UWord32 _alphaCountMax;
|
||||||
const double _beta;
|
|
||||||
const double _thetaLow;
|
const double _thetaLow;
|
||||||
const WebRtc_UWord32 _nackLimit;
|
const WebRtc_UWord32 _nackLimit;
|
||||||
const WebRtc_Word32 _numStdDevDelayOutlier;
|
const WebRtc_Word32 _numStdDevDelayOutlier;
|
||||||
|
@ -653,7 +653,6 @@ _shortMaxLossPr255(0),
|
|||||||
_packetsPerFrame(0.9999f),
|
_packetsPerFrame(0.9999f),
|
||||||
_packetsPerFrameKey(0.9999f),
|
_packetsPerFrameKey(0.9999f),
|
||||||
_residualPacketLossFec(0),
|
_residualPacketLossFec(0),
|
||||||
_boostRateKey(2),
|
|
||||||
_codecWidth(0),
|
_codecWidth(0),
|
||||||
_codecHeight(0),
|
_codecHeight(0),
|
||||||
_numLayers(1)
|
_numLayers(1)
|
||||||
|
@ -385,7 +385,6 @@ private:
|
|||||||
VCMExpFilter _packetsPerFrame;
|
VCMExpFilter _packetsPerFrame;
|
||||||
VCMExpFilter _packetsPerFrameKey;
|
VCMExpFilter _packetsPerFrameKey;
|
||||||
float _residualPacketLossFec;
|
float _residualPacketLossFec;
|
||||||
WebRtc_UWord8 _boostRateKey;
|
|
||||||
WebRtc_UWord16 _codecWidth;
|
WebRtc_UWord16 _codecWidth;
|
||||||
WebRtc_UWord16 _codecHeight;
|
WebRtc_UWord16 _codecHeight;
|
||||||
int _numLayers;
|
int _numLayers;
|
||||||
|
@ -26,7 +26,6 @@ _sendCodecType(kVideoCodecUnknown),
|
|||||||
_codecWidth(0),
|
_codecWidth(0),
|
||||||
_codecHeight(0),
|
_codecHeight(0),
|
||||||
_userFrameRate(0),
|
_userFrameRate(0),
|
||||||
_packetLossEnc(0),
|
|
||||||
_fractionLost(0),
|
_fractionLost(0),
|
||||||
_sendStatisticsZeroEncode(0),
|
_sendStatisticsZeroEncode(0),
|
||||||
_maxPayloadSize(1460),
|
_maxPayloadSize(1460),
|
||||||
|
@ -172,7 +172,6 @@ private:
|
|||||||
|
|
||||||
VCMFrameDropper* _frameDropper;
|
VCMFrameDropper* _frameDropper;
|
||||||
VCMLossProtectionLogic* _lossProtLogic;
|
VCMLossProtectionLogic* _lossProtLogic;
|
||||||
WebRtc_UWord8 _packetLossEnc;
|
|
||||||
WebRtc_UWord8 _fractionLost;
|
WebRtc_UWord8 _fractionLost;
|
||||||
|
|
||||||
|
|
||||||
|
@ -18,7 +18,7 @@ VideoRenderExternalImpl::VideoRenderExternalImpl(
|
|||||||
void* window,
|
void* window,
|
||||||
const bool fullscreen) :
|
const bool fullscreen) :
|
||||||
_id(id), _critSect(*CriticalSectionWrapper::CreateCriticalSection()),
|
_id(id), _critSect(*CriticalSectionWrapper::CreateCriticalSection()),
|
||||||
_window(window), _fullscreen(fullscreen)
|
_fullscreen(fullscreen)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -124,7 +124,6 @@ public:
|
|||||||
private:
|
private:
|
||||||
WebRtc_Word32 _id;
|
WebRtc_Word32 _id;
|
||||||
CriticalSectionWrapper& _critSect;
|
CriticalSectionWrapper& _critSect;
|
||||||
void* _window;
|
|
||||||
bool _fullscreen;
|
bool _fullscreen;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -103,8 +103,7 @@ ModuleVideoRenderImpl::ModuleVideoRenderImpl(
|
|||||||
void* window,
|
void* window,
|
||||||
const bool fullscreen) :
|
const bool fullscreen) :
|
||||||
_id(id), _moduleCrit(*CriticalSectionWrapper::CreateCriticalSection()),
|
_id(id), _moduleCrit(*CriticalSectionWrapper::CreateCriticalSection()),
|
||||||
_ptrWindow(window), _renderType(videoRenderType),
|
_ptrWindow(window), _fullScreen(fullscreen), _ptrRenderer(NULL),
|
||||||
_fullScreen(fullscreen), _ptrRenderer(NULL),
|
|
||||||
_streamRenderMap(*(new MapWrapper()))
|
_streamRenderMap(*(new MapWrapper()))
|
||||||
{
|
{
|
||||||
|
|
||||||
|
@ -217,7 +217,6 @@ private:
|
|||||||
WebRtc_Word32 _id;
|
WebRtc_Word32 _id;
|
||||||
CriticalSectionWrapper& _moduleCrit;
|
CriticalSectionWrapper& _moduleCrit;
|
||||||
void* _ptrWindow;
|
void* _ptrWindow;
|
||||||
VideoRenderType _renderType;
|
|
||||||
bool _fullScreen;
|
bool _fullScreen;
|
||||||
|
|
||||||
IVideoRender* _ptrRenderer;
|
IVideoRender* _ptrRenderer;
|
||||||
|
@ -31,7 +31,6 @@ ViEChannelManager::ViEChannelManager(
|
|||||||
: channel_id_critsect_(CriticalSectionWrapper::CreateCriticalSection()),
|
: channel_id_critsect_(CriticalSectionWrapper::CreateCriticalSection()),
|
||||||
engine_id_(engine_id),
|
engine_id_(engine_id),
|
||||||
number_of_cores_(number_of_cores),
|
number_of_cores_(number_of_cores),
|
||||||
vie_performance_monitor_(vie_performance_monitor),
|
|
||||||
free_channel_ids_(new bool[kViEMaxNumberOfChannels]),
|
free_channel_ids_(new bool[kViEMaxNumberOfChannels]),
|
||||||
free_channel_ids_size_(kViEMaxNumberOfChannels),
|
free_channel_ids_size_(kViEMaxNumberOfChannels),
|
||||||
voice_sync_interface_(NULL),
|
voice_sync_interface_(NULL),
|
||||||
|
@ -109,7 +109,6 @@ class ViEChannelManager: private ViEManagerBase {
|
|||||||
CriticalSectionWrapper* channel_id_critsect_;
|
CriticalSectionWrapper* channel_id_critsect_;
|
||||||
int engine_id_;
|
int engine_id_;
|
||||||
int number_of_cores_;
|
int number_of_cores_;
|
||||||
ViEPerformanceMonitor& vie_performance_monitor_;
|
|
||||||
|
|
||||||
// TODO(mflodman) Make part of channel group.
|
// TODO(mflodman) Make part of channel group.
|
||||||
ChannelMap channel_map_;
|
ChannelMap channel_map_;
|
||||||
|
@ -47,7 +47,6 @@ ViEFilePlayer::ViEFilePlayer(int Id,
|
|||||||
ViEInputManager& input_manager)
|
ViEInputManager& input_manager)
|
||||||
: ViEFrameProviderBase(Id, engine_id),
|
: ViEFrameProviderBase(Id, engine_id),
|
||||||
play_back_started_(false),
|
play_back_started_(false),
|
||||||
input_manager_(input_manager),
|
|
||||||
feedback_cs_(NULL),
|
feedback_cs_(NULL),
|
||||||
audio_cs_(NULL),
|
audio_cs_(NULL),
|
||||||
file_player_(NULL),
|
file_player_(NULL),
|
||||||
|
@ -95,7 +95,6 @@ class ViEFilePlayer
|
|||||||
private:
|
private:
|
||||||
static const int kMaxDecodedAudioLength = 320;
|
static const int kMaxDecodedAudioLength = 320;
|
||||||
bool play_back_started_;
|
bool play_back_started_;
|
||||||
ViEInputManager& input_manager_;
|
|
||||||
|
|
||||||
CriticalSectionWrapper* feedback_cs_;
|
CriticalSectionWrapper* feedback_cs_;
|
||||||
CriticalSectionWrapper* audio_cs_;
|
CriticalSectionWrapper* audio_cs_;
|
||||||
|
@ -22,15 +22,12 @@
|
|||||||
namespace webrtc {
|
namespace webrtc {
|
||||||
|
|
||||||
enum { kVieMonitorPeriodMs = 975 };
|
enum { kVieMonitorPeriodMs = 975 };
|
||||||
enum { kVieCpuStartValue = 75 };
|
|
||||||
|
|
||||||
ViEPerformanceMonitor::ViEPerformanceMonitor(int engine_id)
|
ViEPerformanceMonitor::ViEPerformanceMonitor(int engine_id)
|
||||||
: engine_id_(engine_id),
|
: engine_id_(engine_id),
|
||||||
pointer_cs_(CriticalSectionWrapper::CreateCriticalSection()),
|
pointer_cs_(CriticalSectionWrapper::CreateCriticalSection()),
|
||||||
monitor_thread_(NULL),
|
monitor_thread_(NULL),
|
||||||
monitor_event_(*EventWrapper::Create()),
|
monitor_event_(*EventWrapper::Create()),
|
||||||
average_application_cpu_(kVieCpuStartValue),
|
|
||||||
average_system_cpu_(kVieCpuStartValue),
|
|
||||||
cpu_(NULL),
|
cpu_(NULL),
|
||||||
vie_base_observer_(NULL) {
|
vie_base_observer_(NULL) {
|
||||||
}
|
}
|
||||||
|
@ -45,8 +45,6 @@ class ViEPerformanceMonitor {
|
|||||||
CriticalSectionWrapper* pointer_cs_;
|
CriticalSectionWrapper* pointer_cs_;
|
||||||
ThreadWrapper* monitor_thread_;
|
ThreadWrapper* monitor_thread_;
|
||||||
EventWrapper& monitor_event_;
|
EventWrapper& monitor_event_;
|
||||||
int average_application_cpu_;
|
|
||||||
int average_system_cpu_;
|
|
||||||
CpuWrapper* cpu_;
|
CpuWrapper* cpu_;
|
||||||
ViEBaseObserver* vie_base_observer_;
|
ViEBaseObserver* vie_base_observer_;
|
||||||
};
|
};
|
||||||
|
@ -104,7 +104,6 @@ ViERenderer::ViERenderer(const WebRtc_Word32 render_id,
|
|||||||
VideoRender& render_module,
|
VideoRender& render_module,
|
||||||
ViERenderManager& render_manager)
|
ViERenderManager& render_manager)
|
||||||
: render_id_(render_id),
|
: render_id_(render_id),
|
||||||
engine_id_(engine_id),
|
|
||||||
render_module_(render_module),
|
render_module_(render_module),
|
||||||
render_manager_(render_manager),
|
render_manager_(render_manager),
|
||||||
render_callback_(NULL),
|
render_callback_(NULL),
|
||||||
|
@ -105,7 +105,6 @@ class ViERenderer: public ViEFrameCallback {
|
|||||||
virtual void ProviderDestroyed(int id);
|
virtual void ProviderDestroyed(int id);
|
||||||
|
|
||||||
WebRtc_UWord32 render_id_;
|
WebRtc_UWord32 render_id_;
|
||||||
WebRtc_Word32 engine_id_;
|
|
||||||
VideoRender& render_module_;
|
VideoRender& render_module_;
|
||||||
ViERenderManager& render_manager_;
|
ViERenderManager& render_manager_;
|
||||||
VideoRenderCallback* render_callback_;
|
VideoRenderCallback* render_callback_;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user