| Index: media/audio/alsa/alsa_output_unittest.cc
|
| diff --git a/media/audio/alsa/alsa_output_unittest.cc b/media/audio/alsa/alsa_output_unittest.cc
|
| index af2c46a0b4915a7e123eca114f23bbfd38696606..59cd889e20243337f021bc06e8623befc8b6bf10 100644
|
| --- a/media/audio/alsa/alsa_output_unittest.cc
|
| +++ b/media/audio/alsa/alsa_output_unittest.cc
|
| @@ -114,7 +114,7 @@ class AlsaPcmOutputStreamTest : public testing::Test {
|
| }
|
|
|
| AlsaPcmOutputStream* CreateStream(ChannelLayout layout,
|
| - int32 samples_per_packet) {
|
| + int32_t samples_per_packet) {
|
| AudioParameters params(kTestFormat, layout, kTestSampleRate,
|
| kTestBitsPerSample, samples_per_packet);
|
| return new AlsaPcmOutputStream(kTestDeviceName,
|
| @@ -150,7 +150,7 @@ class AlsaPcmOutputStreamTest : public testing::Test {
|
| static const AudioParameters::Format kTestFormat;
|
| static const char kTestDeviceName[];
|
| static const char kDummyMessage[];
|
| - static const uint32 kTestFramesPerPacket;
|
| + static const uint32_t kTestFramesPerPacket;
|
| static const int kTestPacketSize;
|
| static const int kTestFailedErrno;
|
| static snd_pcm_t* const kFakeHandle;
|
| @@ -186,7 +186,7 @@ const AudioParameters::Format AlsaPcmOutputStreamTest::kTestFormat =
|
| AudioParameters::AUDIO_PCM_LINEAR;
|
| const char AlsaPcmOutputStreamTest::kTestDeviceName[] = "TestDevice";
|
| const char AlsaPcmOutputStreamTest::kDummyMessage[] = "dummy";
|
| -const uint32 AlsaPcmOutputStreamTest::kTestFramesPerPacket = 1000;
|
| +const uint32_t AlsaPcmOutputStreamTest::kTestFramesPerPacket = 1000;
|
| const int AlsaPcmOutputStreamTest::kTestPacketSize =
|
| AlsaPcmOutputStreamTest::kTestFramesPerPacket *
|
| AlsaPcmOutputStreamTest::kTestBytesPerFrame;
|
| @@ -273,8 +273,9 @@ TEST_F(AlsaPcmOutputStreamTest, LatencyFloor) {
|
|
|
| // Test that having more packets ends up with a latency based on packet size.
|
| const int kOverMinLatencyPacketSize = kPacketFramesInMinLatency + 1;
|
| - int64 expected_micros = AlsaPcmOutputStream::FramesToTimeDelta(
|
| - kOverMinLatencyPacketSize * 2, kTestSampleRate).InMicroseconds();
|
| + int64_t expected_micros = AlsaPcmOutputStream::FramesToTimeDelta(
|
| + kOverMinLatencyPacketSize * 2, kTestSampleRate)
|
| + .InMicroseconds();
|
|
|
| EXPECT_CALL(mock_alsa_wrapper_, PcmOpen(_, _, _, _))
|
| .WillOnce(DoAll(SetArgumentPointee<0>(kFakeHandle), Return(0)));
|
| @@ -302,8 +303,9 @@ TEST_F(AlsaPcmOutputStreamTest, LatencyFloor) {
|
| }
|
|
|
| TEST_F(AlsaPcmOutputStreamTest, OpenClose) {
|
| - int64 expected_micros = AlsaPcmOutputStream::FramesToTimeDelta(
|
| - 2 * kTestFramesPerPacket, kTestSampleRate).InMicroseconds();
|
| + int64_t expected_micros = AlsaPcmOutputStream::FramesToTimeDelta(
|
| + 2 * kTestFramesPerPacket, kTestSampleRate)
|
| + .InMicroseconds();
|
|
|
| // Open() call opens the playback device, sets the parameters, posts a task
|
| // with the resulting configuration data, and transitions the object state to
|
|
|