Roll chromium_revision 7a4fb8d..f527e86 (370025:370073)

webrtc/modules/audio_device/win/audio_device_wave_win.cc

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 2719 matching lines @@
             // Avoid adjusting when there is 32-bit wrap-around since that is
             // something neccessary.
             //
             WEBRTC_TRACE(kTraceDebug, kTraceUtility, _id, "msecleft() => wrap around occured: %d bits used by sound card)", (i+1));
 
             _writtenSamples = _writtenSamples - POW2(i + 1);
             writtenSamples = _writtenSamples;
             msecInPlayoutBuffer = ((writtenSamples - playedSamples)/nSamplesPerMs);
         }
     }
-    else if ((_writtenSamplesOld > POW2(31)) && (writtenSamples < 96000))
+    else if ((_writtenSamplesOld > (unsigned long)POW2(31)) && (writtenSamples < 96000))
     {
         // Wrap around as expected after having used all 32 bits. (But we still
         // test if the wrap around happened earlier which it should not)
 
         i = 31;
         while (_writtenSamplesOld <= (unsigned long)POW2(i)) {
             i--;
         }
 
         WEBRTC_TRACE(kTraceDebug, kTraceUtility, _id, "  msecleft() (wrap around occured after having used all 32 bits)");
 
         _writtenSamplesOld = writtenSamples;
         _playedSamplesOld = playedSamples;
         msecInPlayoutBuffer = (int)((writtenSamples + POW2(i + 1) - playedSamples)/nSamplesPerMs);
 
     }
-    else if ((writtenSamples < 96000) && (playedSamples > POW2(31)))
+    else if ((writtenSamples < 96000) && (playedSamples > (unsigned long)POW2(31)))
     {
         // Wrap around has, as expected, happened for written_sampels before
         // playedSampels so we have to adjust for this until also playedSampels
         // has had wrap around.
 
         WEBRTC_TRACE(kTraceDebug, kTraceUtility, _id, "  msecleft() (wrap around occured: correction of output is done)");
 
         _writtenSamplesOld = writtenSamples;
         _playedSamplesOld = playedSamples;
         msecInPlayoutBuffer = (int)((writtenSamples + POW2(32) - playedSamples)/nSamplesPerMs);
@@ skipping 178 matching lines @@
             readSamples = _read_samples;
             _wrapCounter++;
         } else {
             WEBRTC_TRACE (kTraceWarning, kTraceUtility, -1,"AEC (_rec_samples_old %d recSamples %d)",_rec_samples_old, recSamples);
         }
     }
 
     if((_wrapCounter>200)){
         // Do nothing, handled later
     }
-    else if((_rec_samples_old > POW2(31)) && (recSamples < 96000)) {
+    else if((_rec_samples_old > (unsigned long)POW2(31)) && (recSamples < 96000)) {
         WEBRTC_TRACE (kTraceDebug, kTraceUtility, -1,"WRAP 2 (_rec_samples_old %d recSamples %d)",_rec_samples_old, recSamples);
         // Wrap around as expected after having used all 32 bits.
         _read_samples_old = readSamples;
         _rec_samples_old = recSamples;
         _wrapCounter++;
         return (int)((recSamples + POW2(32) - readSamples)/nSamplesPerMs);
 
 
-    } else if((recSamples < 96000) && (readSamples > POW2(31))) {
+    } else if((recSamples < 96000) && (readSamples > (unsigned long)POW2(31))) {
         WEBRTC_TRACE (kTraceDebug, kTraceUtility, -1,"WRAP 3 (readSamples %d recSamples %d)",readSamples, recSamples);
         // Wrap around has, as expected, happened for rec_sampels before
         // readSampels so we have to adjust for this until also readSampels
         // has had wrap around.
         _read_samples_old = readSamples;
         _rec_samples_old = recSamples;
         _wrapCounter++;
         return (int)((recSamples + POW2(32) - readSamples)/nSamplesPerMs);
     }
 
@@ skipping 747 matching lines @@
 bool AudioDeviceWindowsWave::KeyPressed() const{
 
   int key_down = 0;
   for (int key = VK_SPACE; key < VK_NUMLOCK; key++) {
     short res = GetAsyncKeyState(key);
     key_down |= res & 0x1; // Get the LSB
   }
   return (key_down > 0);
 }
 }  // namespace webrtc