admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix unsigned/signed comparison error due to r4729.

Browse Source 
Fix it for real by switching to ints rather than casting.

TBR=xians

Review URL: https://webrtc-codereview.appspot.com/2191009

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4730 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
andrew@webrtc.org 2013-09-12 01:01:42 +00:00
parent 8f94013651
commit 5eb997a2fd
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
webrtc/modules/audio_device/audio_device_buffer.cc
View File

@ -292,8 +292,8 @@ uint32_t AudioDeviceBuffer::NewMicLevel() const
// SetVQEData
// ----------------------------------------------------------------------------
void AudioDeviceBuffer::SetVQEData(uint32_t playDelayMs, uint32_t recDelayMs,
int32_t clockDrift) {
void AudioDeviceBuffer::SetVQEData(int playDelayMs, int recDelayMs,
int clockDrift) {
if (high_delay_counter_ < kLogHighDelayIntervalFrames) {
++high_delay_counter_;
} else {

13
webrtc/modules/audio_device/audio_device_buffer.h
View File

@ -54,9 +54,9 @@ public:
int32_t SetRecordedBuffer(const void* audioBuffer, uint32_t nSamples);
int32_t SetCurrentMicLevel(uint32_t level);
void SetVQEData(uint32_t playDelayMS,
uint32_t recDelayMS,
int32_t clockDrift);
void SetVQEData(int playDelayMS,
int recDelayMS,
int clockDrift);
int32_t DeliverRecordedData();
uint32_t NewMicLevel() const;
@ -114,10 +114,9 @@ private:
bool _typingStatus;
uint32_t _playDelayMS;
uint32_t _recDelayMS;
int32_t _clockDrift;
int _playDelayMS;
int _recDelayMS;
int _clockDrift;
int high_delay_counter_;
};