From 5eb997a2fdd161a09b160baed7c9e0167b8f0e59 Mon Sep 17 00:00:00 2001
From: "andrew@webrtc.org"
 <andrew@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>
Date: Thu, 12 Sep 2013 01:01:42 +0000
Subject: [PATCH] Fix unsigned/signed comparison error due to r4729.

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
---
 webrtc/modules/audio_device/audio_device_buffer.cc |  4 ++--
 webrtc/modules/audio_device/audio_device_buffer.h  | 13 ++++++-------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/webrtc/modules/audio_device/audio_device_buffer.cc b/webrtc/modules/audio_device/audio_device_buffer.cc
index e6cde5d746..62d1961396 100644
--- a/webrtc/modules/audio_device/audio_device_buffer.cc
+++ b/webrtc/modules/audio_device/audio_device_buffer.cc
@@ -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 {
diff --git a/webrtc/modules/audio_device/audio_device_buffer.h b/webrtc/modules/audio_device/audio_device_buffer.h
index 86f4d6d7a3..08b9bb0ce4 100644
--- a/webrtc/modules/audio_device/audio_device_buffer.h
+++ b/webrtc/modules/audio_device/audio_device_buffer.h
@@ -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_;
 };