Index: webrtc/modules/audio_device/android/audio_manager_unittest.cc |
diff --git a/webrtc/modules/audio_device/android/audio_manager_unittest.cc b/webrtc/modules/audio_device/android/audio_manager_unittest.cc |
index a5bc840dff4e0081dd71572a6ff2c6d1075ffd9d..ddae73067a1a6541024e0450b868689a79ab462b 100644 |
--- a/webrtc/modules/audio_device/android/audio_manager_unittest.cc |
+++ b/webrtc/modules/audio_device/android/audio_manager_unittest.cc |
@@ -82,14 +82,14 @@ TEST_F(AudioManagerTest, ShowAudioParameterInfo) { |
PRINT("%saudio layer: %s\n", kTag, |
low_latency_out ? "Low latency OpenSL" : "Java/JNI based AudioTrack"); |
PRINT("%ssample rate: %d Hz\n", kTag, playout_parameters_.sample_rate()); |
- PRINT("%schannels: %d\n", kTag, playout_parameters_.channels()); |
+ PRINT("%schannels: %" PRIuS "\n", kTag, playout_parameters_.channels()); |
PRINT("%sframes per buffer: %" PRIuS " <=> %.2f ms\n", kTag, |
playout_parameters_.frames_per_buffer(), |
playout_parameters_.GetBufferSizeInMilliseconds()); |
PRINT("RECORD: \n"); |
PRINT("%saudio layer: %s\n", kTag, "Java/JNI based AudioRecord"); |
PRINT("%ssample rate: %d Hz\n", kTag, record_parameters_.sample_rate()); |
- PRINT("%schannels: %d\n", kTag, record_parameters_.channels()); |
+ PRINT("%schannels: %" PRIuS "\n", kTag, record_parameters_.channels()); |
PRINT("%sframes per buffer: %" PRIuS " <=> %.2f ms\n", kTag, |
record_parameters_.frames_per_buffer(), |
record_parameters_.GetBufferSizeInMilliseconds()); |
@@ -119,7 +119,7 @@ TEST_F(AudioManagerTest, AudioParametersWithDefaultConstruction) { |
AudioParameters params; |
EXPECT_FALSE(params.is_valid()); |
EXPECT_EQ(0, params.sample_rate()); |
- EXPECT_EQ(0, params.channels()); |
+ EXPECT_EQ(0U, params.channels()); |
EXPECT_EQ(0U, params.frames_per_buffer()); |
EXPECT_EQ(0U, params.frames_per_10ms_buffer()); |
EXPECT_EQ(0U, params.GetBytesPerFrame()); |
@@ -131,7 +131,7 @@ TEST_F(AudioManagerTest, AudioParametersWithDefaultConstruction) { |
// Basic test of the AudioParameters class using non default construction. |
TEST_F(AudioManagerTest, AudioParametersWithNonDefaultConstruction) { |
const int kSampleRate = 48000; |
- const int kChannels = 1; |
+ const size_t kChannels = 1; |
const size_t kFramesPerBuffer = 480; |
const size_t kFramesPer10msBuffer = 480; |
const size_t kBytesPerFrame = 2; |