Index: webrtc/modules/audio_device/android/audio_device_unittest.cc |
diff --git a/webrtc/modules/audio_device/android/audio_device_unittest.cc b/webrtc/modules/audio_device/android/audio_device_unittest.cc |
index 2e613d45098fe13227854ea621cb51f99fe6dcb3..174e54b2cde35b2f6d96af142abce8957e4c4f62 100644 |
--- a/webrtc/modules/audio_device/android/audio_device_unittest.cc |
+++ b/webrtc/modules/audio_device/android/audio_device_unittest.cc |
@@ -383,7 +383,7 @@ class MockAudioTransport : public AudioTransport { |
int32_t(const void* audioSamples, |
const size_t nSamples, |
const size_t nBytesPerSample, |
- const uint8_t nChannels, |
+ const size_t nChannels, |
const uint32_t samplesPerSec, |
const uint32_t totalDelayMS, |
const int32_t clockDrift, |
@@ -393,7 +393,7 @@ class MockAudioTransport : public AudioTransport { |
MOCK_METHOD8(NeedMorePlayData, |
int32_t(const size_t nSamples, |
const size_t nBytesPerSample, |
- const uint8_t nChannels, |
+ const size_t nChannels, |
const uint32_t samplesPerSec, |
void* audioSamples, |
size_t& nSamplesOut, |
@@ -423,7 +423,7 @@ class MockAudioTransport : public AudioTransport { |
int32_t RealRecordedDataIsAvailable(const void* audioSamples, |
const size_t nSamples, |
const size_t nBytesPerSample, |
- const uint8_t nChannels, |
+ const size_t nChannels, |
const uint32_t samplesPerSec, |
const uint32_t totalDelayMS, |
const int32_t clockDrift, |
@@ -445,7 +445,7 @@ class MockAudioTransport : public AudioTransport { |
int32_t RealNeedMorePlayData(const size_t nSamples, |
const size_t nBytesPerSample, |
- const uint8_t nChannels, |
+ const size_t nChannels, |
const uint32_t samplesPerSec, |
void* audioSamples, |
size_t& nSamplesOut, |
@@ -521,10 +521,10 @@ class AudioDeviceTest : public ::testing::Test { |
int record_sample_rate() const { |
return record_parameters_.sample_rate(); |
} |
- int playout_channels() const { |
+ size_t playout_channels() const { |
return playout_parameters_.channels(); |
} |
- int record_channels() const { |
+ size_t record_channels() const { |
return record_parameters_.channels(); |
} |
size_t playout_frames_per_10ms_buffer() const { |
@@ -919,7 +919,7 @@ TEST_F(AudioDeviceTest, StartPlayoutAndRecordingVerifyCallbacks) { |
// not contain any explicit verification that the audio quality is perfect. |
TEST_F(AudioDeviceTest, RunPlayoutWithFileAsSource) { |
// TODO(henrika): extend test when mono output is supported. |
- EXPECT_EQ(1, playout_channels()); |
+ EXPECT_EQ(1u, playout_channels()); |
NiceMock<MockAudioTransport> mock(kPlayout); |
const int num_callbacks = kFilePlayTimeInSec * kNumCallbacksPerSecond; |
std::string file_name = GetFileName(playout_sample_rate()); |