Index: webrtc/modules/audio_device/audio_device_buffer.h |
diff --git a/webrtc/modules/audio_device/audio_device_buffer.h b/webrtc/modules/audio_device/audio_device_buffer.h |
index a89927f711b0cb8c2bac1f778a3ab6a6083f3d7c..63a05ef82ac964bf60e08e63b7ca6c806d99d283 100644 |
--- a/webrtc/modules/audio_device/audio_device_buffer.h |
+++ b/webrtc/modules/audio_device/audio_device_buffer.h |
@@ -19,7 +19,7 @@ namespace webrtc { |
class CriticalSectionWrapper; |
const uint32_t kPulsePeriodMs = 1000; |
-const uint32_t kMaxBufferSizeBytes = 3840; // 10ms in stereo @ 96kHz |
+const size_t kMaxBufferSizeBytes = 3840; // 10ms in stereo @ 96kHz |
class AudioDeviceObserver; |
@@ -50,7 +50,7 @@ public: |
AudioDeviceModule::ChannelType& channel) const; |
virtual int32_t SetRecordedBuffer(const void* audioBuffer, |
- uint32_t nSamples); |
+ size_t nSamples); |
int32_t SetCurrentMicLevel(uint32_t level); |
virtual void SetVQEData(int playDelayMS, |
int recDelayMS, |
@@ -58,7 +58,7 @@ public: |
virtual int32_t DeliverRecordedData(); |
uint32_t NewMicLevel() const; |
- virtual int32_t RequestPlayoutData(uint32_t nSamples); |
+ virtual int32_t RequestPlayoutData(size_t nSamples); |
virtual int32_t GetPlayoutData(void* audioBuffer); |
int32_t StartInputFileRecording( |
@@ -87,22 +87,22 @@ private: |
AudioDeviceModule::ChannelType _recChannel; |
// 2 or 4 depending on mono or stereo |
- uint8_t _recBytesPerSample; |
- uint8_t _playBytesPerSample; |
+ size_t _recBytesPerSample; |
+ size_t _playBytesPerSample; |
// 10ms in stereo @ 96kHz |
int8_t _recBuffer[kMaxBufferSizeBytes]; |
// one sample <=> 2 or 4 bytes |
- uint32_t _recSamples; |
- uint32_t _recSize; // in bytes |
+ size_t _recSamples; |
+ size_t _recSize; // in bytes |
// 10ms in stereo @ 96kHz |
int8_t _playBuffer[kMaxBufferSizeBytes]; |
// one sample <=> 2 or 4 bytes |
- uint32_t _playSamples; |
- uint32_t _playSize; // in bytes |
+ size_t _playSamples; |
+ size_t _playSize; // in bytes |
FileWrapper& _recFile; |
FileWrapper& _playFile; |