generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Landing for thakis. Original review here:

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/build/common.gypi
View File

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

1
src/modules/remote_bitrate_estimator/overuse_detector.cc
View File

@ -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),

1
src/modules/remote_bitrate_estimator/overuse_detector.h
View File

@ -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_;

1
src/modules/utility/source/file_recorder_impl.cc
View File

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

1
src/modules/utility/source/file_recorder_impl.h
View File

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

6
src/modules/video_coding/main/source/generic_encoder.cc
View File

@ -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");

2
src/modules/video_coding/main/source/generic_encoder.h
View File

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

4
src/modules/video_coding/main/source/video_coding_impl.cc
View File

@ -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_),

4
src/modules/video_coding/main/source/video_coding_impl.h
View File

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

1
src/voice_engine/main/source/transmit_mixer.cc
View File

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

1
src/voice_engine/main/source/transmit_mixer.h
View File

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