Landing for thakis. Original review here:

https://webrtc-codereview.appspot.com/667013/
Review URL: https://webrtc-codereview.appspot.com/701004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@2522 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
tommi@webrtc.org 2012-07-20 11:17:23 +00:00
parent 8495915442
commit a9da4c55ef
11 changed files with 14 additions and 19 deletions

View File

@ -174,17 +174,6 @@
'WEBRTC_ANDROID_OPENSLES', '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 ], # conditions
}, # target_defaults }, # target_defaults
} }

View File

@ -29,7 +29,6 @@ extern MatlabEngine eng; // global variable defined elsewhere
namespace webrtc { namespace webrtc {
OverUseDetector::OverUseDetector(const OverUseDetectorOptions& options) OverUseDetector::OverUseDetector(const OverUseDetectorOptions& options)
: options_(options), : options_(options),
first_packet_(true),
current_frame_(), current_frame_(),
prev_frame_(), prev_frame_(),
num_of_deltas_(0), num_of_deltas_(0),

View File

@ -74,7 +74,6 @@ class OverUseDetector {
OverUseDetectorOptions options_; // Must be first member OverUseDetectorOptions options_; // Must be first member
// variable. Cannot be const // variable. Cannot be const
// because we need to be copyable. // because we need to be copyable.
bool first_packet_;
FrameSample current_frame_; FrameSample current_frame_;
FrameSample prev_frame_; FrameSample prev_frame_;
uint16_t num_of_deltas_; uint16_t num_of_deltas_;

View File

@ -65,7 +65,6 @@ FileRecorderImpl::FileRecorderImpl(WebRtc_UWord32 instanceID,
: _instanceID(instanceID), : _instanceID(instanceID),
_fileFormat(fileFormat), _fileFormat(fileFormat),
_moduleFile(MediaFile::CreateMediaFile(_instanceID)), _moduleFile(MediaFile::CreateMediaFile(_instanceID)),
_stream(NULL),
codec_info_(), codec_info_(),
_amrFormat(AMRFileStorage), _amrFormat(AMRFileStorage),
_audioBuffer(), _audioBuffer(),

View File

@ -93,7 +93,6 @@ protected:
MediaFile* _moduleFile; MediaFile* _moduleFile;
private: private:
OutStream* _stream;
CodecInst codec_info_; CodecInst codec_info_;
ACMAMRPackingFormat _amrFormat; ACMAMRPackingFormat _amrFormat;

View File

@ -151,8 +151,10 @@ _mediaOpt(NULL),
_encodedBytes(0), _encodedBytes(0),
_payloadType(0), _payloadType(0),
_codecType(kVideoCodecUnknown), _codecType(kVideoCodecUnknown),
_internalSource(false), _internalSource(false)
_bitStreamAfterEncoder(NULL) #ifdef DEBUG_ENCODER_BIT_STREAM
, _bitStreamAfterEncoder(NULL)
#endif
{ {
#ifdef DEBUG_ENCODER_BIT_STREAM #ifdef DEBUG_ENCODER_BIT_STREAM
_bitStreamAfterEncoder = fopen("encoderBitStream.bit", "wb"); _bitStreamAfterEncoder = fopen("encoderBitStream.bit", "wb");

View File

@ -67,7 +67,9 @@ private:
WebRtc_UWord8 _payloadType; WebRtc_UWord8 _payloadType;
VideoCodecType _codecType; VideoCodecType _codecType;
bool _internalSource; bool _internalSource;
#ifdef DEBUG_ENCODER_BIT_STREAM
FILE* _bitStreamAfterEncoder; FILE* _bitStreamAfterEncoder;
#endif
};// end of VCMEncodeFrameCallback class };// end of VCMEncodeFrameCallback class

View File

@ -64,7 +64,9 @@ _receiveStatsCallback(NULL),
_packetRequestCallback(NULL), _packetRequestCallback(NULL),
_decoder(NULL), _decoder(NULL),
_dualDecoder(NULL), _dualDecoder(NULL),
#ifdef DEBUG_DECODER_BIT_STREAM
_bitStreamBeforeDecoder(NULL), _bitStreamBeforeDecoder(NULL),
#endif
_frameFromFile(), _frameFromFile(),
_keyRequestMode(kKeyOnError), _keyRequestMode(kKeyOnError),
_scheduleKeyRequest(false), _scheduleKeyRequest(false),
@ -76,7 +78,9 @@ _nextFrameType(kVideoFrameDelta),
_mediaOpt(id, clock_), _mediaOpt(id, clock_),
_sendCodecType(kVideoCodecUnknown), _sendCodecType(kVideoCodecUnknown),
_sendStatsCallback(NULL), _sendStatsCallback(NULL),
#ifdef DEBUG_ENCODER_INPUT
_encoderInputFile(NULL), _encoderInputFile(NULL),
#endif
_codecDataBase(id), _codecDataBase(id),
_receiveStatsTimer(1000, clock_), _receiveStatsTimer(1000, clock_),

View File

@ -285,7 +285,9 @@ private:
VCMPacketRequestCallback* _packetRequestCallback; VCMPacketRequestCallback* _packetRequestCallback;
VCMGenericDecoder* _decoder; VCMGenericDecoder* _decoder;
VCMGenericDecoder* _dualDecoder; VCMGenericDecoder* _dualDecoder;
#ifdef DEBUG_DECODER_BIT_STREAM
FILE* _bitStreamBeforeDecoder; FILE* _bitStreamBeforeDecoder;
#endif
VCMFrameBuffer _frameFromFile; VCMFrameBuffer _frameFromFile;
VCMKeyRequestMode _keyRequestMode; VCMKeyRequestMode _keyRequestMode;
bool _scheduleKeyRequest; bool _scheduleKeyRequest;
@ -297,7 +299,9 @@ private:
VCMMediaOptimization _mediaOpt; VCMMediaOptimization _mediaOpt;
VideoCodecType _sendCodecType; VideoCodecType _sendCodecType;
VCMSendStatisticsCallback* _sendStatsCallback; VCMSendStatisticsCallback* _sendStatsCallback;
#ifdef DEBUG_ENCODER_INPUT
FILE* _encoderInputFile; FILE* _encoderInputFile;
#endif
VCMCodecDataBase _codecDataBase; VCMCodecDataBase _codecDataBase;
VCMProcessTimer _receiveStatsTimer; VCMProcessTimer _receiveStatsTimer;

View File

@ -205,7 +205,6 @@ TransmitMixer::TransmitMixer(const WebRtc_UWord32 instanceId) :
_mute(false), _mute(false),
_remainingMuteMicTimeMs(0), _remainingMuteMicTimeMs(0),
_mixingFrequency(0), _mixingFrequency(0),
_includeAudioLevelIndication(false),
stereo_codec_(false), stereo_codec_(false),
swap_stereo_channels_(false) swap_stereo_channels_(false)
{ {

View File

@ -233,7 +233,6 @@ private:
bool _mute; bool _mute;
WebRtc_Word32 _remainingMuteMicTimeMs; WebRtc_Word32 _remainingMuteMicTimeMs;
int _mixingFrequency; int _mixingFrequency;
bool _includeAudioLevelIndication;
bool stereo_codec_; bool stereo_codec_;
bool swap_stereo_channels_; bool swap_stereo_channels_;
}; };