Misc. small cleanups

webrtc/modules/audio_device/dummy/file_audio_device.cc

 /*
  *  Copyright (c) 2014 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.
  */
 #include "webrtc/base/platform_thread.h"
 #include "webrtc/modules/audio_device/dummy/file_audio_device.h"
 #include "webrtc/system_wrappers/include/sleep.h"
 
 namespace webrtc {
 
 const int kRecordingFixedSampleRate = 48000;
 const int kRecordingNumChannels = 2;
 const int kPlayoutFixedSampleRate = 48000;
 const int kPlayoutNumChannels = 2;
-const int kPlayoutBufferSize = kPlayoutFixedSampleRate / 100
-                               * kPlayoutNumChannels * 2;
-const int kRecordingBufferSize = kRecordingFixedSampleRate / 100
-                                 * kRecordingNumChannels * 2;
+const size_t kPlayoutBufferSize =
+    kPlayoutFixedSampleRate / 100 * kPlayoutNumChannels * 2;
+const size_t kRecordingBufferSize =
+    kRecordingFixedSampleRate / 100 * kRecordingNumChannels * 2;
 
 FileAudioDevice::FileAudioDevice(const int32_t id,
                                  const char* inputFilename,
                                  const char* outputFilename):
     _ptrAudioBuffer(NULL),
     _recordingBuffer(NULL),
     _playoutBuffer(NULL),
     _recordingFramesLeft(0),
     _playoutFramesLeft(0),
     _critSect(*CriticalSectionWrapper::CreateCriticalSection()),
@@ skipping 153 matching lines @@
 int32_t FileAudioDevice::StartPlayout() {
   if (_playing) {
       return 0;
   }
 
   _playoutFramesIn10MS = static_cast<size_t>(kPlayoutFixedSampleRate / 100);
   _playing = true;
   _playoutFramesLeft = 0;
 
   if (!_playoutBuffer) {
-      _playoutBuffer = new int8_t[2 *
-                                  kPlayoutNumChannels *
-                                  kPlayoutFixedSampleRate/100];
+      _playoutBuffer = new int8_t[kPlayoutBufferSize];
   }
   if (!_playoutBuffer) {
     _playing = false;
     return -1;
   }
 
   // PLAYOUT
   if (!_outputFilename.empty() && _outputFile.OpenFile(
         _outputFilename.c_str(), false, false, false) == -1) {
     printf("Failed to open playout file %s!\n", _outputFilename.c_str());
@@ skipping 328 matching lines @@
 
     uint64_t deltaTimeMillis = _clock->CurrentNtpInMilliseconds() - currentTime;
     if(deltaTimeMillis < 10) {
       SleepMs(10 - deltaTimeMillis);
     }
 
     return true;
 }
 
 }  // namespace webrtc