diff --git a/src/build/common.gypi b/src/build/common.gypi index 5a550786e1..86b589053c 100644 --- a/src/build/common.gypi +++ b/src/build/common.gypi @@ -174,17 +174,6 @@ 'WEBRTC_ANDROID_OPENSLES', ], }], - ['clang==1', { - 'xcode_settings': { - 'WARNING_CFLAGS': [ - # TODO(thakis): Remove once all violations are fixed. - '-Wno-unused-private-field', - ], - }, - 'cflags': [ - '-Wno-unused-private-field', - ] - }], ], # conditions }, # target_defaults } diff --git a/src/modules/remote_bitrate_estimator/overuse_detector.cc b/src/modules/remote_bitrate_estimator/overuse_detector.cc index 133614f7c0..1c5bf9d831 100644 --- a/src/modules/remote_bitrate_estimator/overuse_detector.cc +++ b/src/modules/remote_bitrate_estimator/overuse_detector.cc @@ -29,7 +29,6 @@ extern MatlabEngine eng; // global variable defined elsewhere namespace webrtc { OverUseDetector::OverUseDetector(const OverUseDetectorOptions& options) : options_(options), - first_packet_(true), current_frame_(), prev_frame_(), num_of_deltas_(0), diff --git a/src/modules/remote_bitrate_estimator/overuse_detector.h b/src/modules/remote_bitrate_estimator/overuse_detector.h index ba4c0dcdaf..3fd3933626 100644 --- a/src/modules/remote_bitrate_estimator/overuse_detector.h +++ b/src/modules/remote_bitrate_estimator/overuse_detector.h @@ -74,7 +74,6 @@ class OverUseDetector { OverUseDetectorOptions options_; // Must be first member // variable. Cannot be const // because we need to be copyable. - bool first_packet_; FrameSample current_frame_; FrameSample prev_frame_; uint16_t num_of_deltas_; diff --git a/src/modules/utility/source/file_recorder_impl.cc b/src/modules/utility/source/file_recorder_impl.cc index ab4cbf3b34..b7ec08488a 100644 --- a/src/modules/utility/source/file_recorder_impl.cc +++ b/src/modules/utility/source/file_recorder_impl.cc @@ -65,7 +65,6 @@ FileRecorderImpl::FileRecorderImpl(WebRtc_UWord32 instanceID, : _instanceID(instanceID), _fileFormat(fileFormat), _moduleFile(MediaFile::CreateMediaFile(_instanceID)), - _stream(NULL), codec_info_(), _amrFormat(AMRFileStorage), _audioBuffer(), diff --git a/src/modules/utility/source/file_recorder_impl.h b/src/modules/utility/source/file_recorder_impl.h index 36841664d1..6e56972016 100644 --- a/src/modules/utility/source/file_recorder_impl.h +++ b/src/modules/utility/source/file_recorder_impl.h @@ -93,7 +93,6 @@ protected: MediaFile* _moduleFile; private: - OutStream* _stream; CodecInst codec_info_; ACMAMRPackingFormat _amrFormat; diff --git a/src/modules/video_coding/main/source/generic_encoder.cc b/src/modules/video_coding/main/source/generic_encoder.cc index fb02c996f7..f49297696d 100644 --- a/src/modules/video_coding/main/source/generic_encoder.cc +++ b/src/modules/video_coding/main/source/generic_encoder.cc @@ -151,8 +151,10 @@ _mediaOpt(NULL), _encodedBytes(0), _payloadType(0), _codecType(kVideoCodecUnknown), -_internalSource(false), -_bitStreamAfterEncoder(NULL) +_internalSource(false) +#ifdef DEBUG_ENCODER_BIT_STREAM +, _bitStreamAfterEncoder(NULL) +#endif { #ifdef DEBUG_ENCODER_BIT_STREAM _bitStreamAfterEncoder = fopen("encoderBitStream.bit", "wb"); diff --git a/src/modules/video_coding/main/source/generic_encoder.h b/src/modules/video_coding/main/source/generic_encoder.h index ce80f054db..c75339b7c2 100644 --- a/src/modules/video_coding/main/source/generic_encoder.h +++ b/src/modules/video_coding/main/source/generic_encoder.h @@ -67,7 +67,9 @@ private: WebRtc_UWord8 _payloadType; VideoCodecType _codecType; bool _internalSource; +#ifdef DEBUG_ENCODER_BIT_STREAM FILE* _bitStreamAfterEncoder; +#endif };// end of VCMEncodeFrameCallback class diff --git a/src/modules/video_coding/main/source/video_coding_impl.cc b/src/modules/video_coding/main/source/video_coding_impl.cc index 6ca8cd6c48..2c71c11d63 100644 --- a/src/modules/video_coding/main/source/video_coding_impl.cc +++ b/src/modules/video_coding/main/source/video_coding_impl.cc @@ -64,7 +64,9 @@ _receiveStatsCallback(NULL), _packetRequestCallback(NULL), _decoder(NULL), _dualDecoder(NULL), +#ifdef DEBUG_DECODER_BIT_STREAM _bitStreamBeforeDecoder(NULL), +#endif _frameFromFile(), _keyRequestMode(kKeyOnError), _scheduleKeyRequest(false), @@ -76,7 +78,9 @@ _nextFrameType(kVideoFrameDelta), _mediaOpt(id, clock_), _sendCodecType(kVideoCodecUnknown), _sendStatsCallback(NULL), +#ifdef DEBUG_ENCODER_INPUT _encoderInputFile(NULL), +#endif _codecDataBase(id), _receiveStatsTimer(1000, clock_), diff --git a/src/modules/video_coding/main/source/video_coding_impl.h b/src/modules/video_coding/main/source/video_coding_impl.h index 6278294af2..3228d44b5d 100644 --- a/src/modules/video_coding/main/source/video_coding_impl.h +++ b/src/modules/video_coding/main/source/video_coding_impl.h @@ -285,7 +285,9 @@ private: VCMPacketRequestCallback* _packetRequestCallback; VCMGenericDecoder* _decoder; VCMGenericDecoder* _dualDecoder; +#ifdef DEBUG_DECODER_BIT_STREAM FILE* _bitStreamBeforeDecoder; +#endif VCMFrameBuffer _frameFromFile; VCMKeyRequestMode _keyRequestMode; bool _scheduleKeyRequest; @@ -297,7 +299,9 @@ private: VCMMediaOptimization _mediaOpt; VideoCodecType _sendCodecType; VCMSendStatisticsCallback* _sendStatsCallback; +#ifdef DEBUG_ENCODER_INPUT FILE* _encoderInputFile; +#endif VCMCodecDataBase _codecDataBase; VCMProcessTimer _receiveStatsTimer; diff --git a/src/voice_engine/main/source/transmit_mixer.cc b/src/voice_engine/main/source/transmit_mixer.cc index db5a089c7f..913b7fee2b 100644 --- a/src/voice_engine/main/source/transmit_mixer.cc +++ b/src/voice_engine/main/source/transmit_mixer.cc @@ -205,7 +205,6 @@ TransmitMixer::TransmitMixer(const WebRtc_UWord32 instanceId) : _mute(false), _remainingMuteMicTimeMs(0), _mixingFrequency(0), - _includeAudioLevelIndication(false), stereo_codec_(false), swap_stereo_channels_(false) { diff --git a/src/voice_engine/main/source/transmit_mixer.h b/src/voice_engine/main/source/transmit_mixer.h index 54383e3889..da87218cd1 100644 --- a/src/voice_engine/main/source/transmit_mixer.h +++ b/src/voice_engine/main/source/transmit_mixer.h @@ -233,7 +233,6 @@ private: bool _mute; WebRtc_Word32 _remainingMuteMicTimeMs; int _mixingFrequency; - bool _includeAudioLevelIndication; bool stereo_codec_; bool swap_stereo_channels_; };