Remove kint16max.

media/base/audio_buffer_queue_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "base/basictypes.h"
+#include <stdint.h>
+
+#include <limits>
+
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
 #include "media/base/audio_buffer.h"
 #include "media/base/audio_buffer_queue.h"
 #include "media/base/audio_bus.h"
 #include "media/base/test_helpers.h"
 #include "media/base/timestamp_constants.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ skipping 30 matching lines @@
                             step,
                             frames,
                             kNoTimestamp());
 }
 
 TEST(AudioBufferQueueTest, AppendAndClear) {
   const ChannelLayout channel_layout = CHANNEL_LAYOUT_MONO;
   AudioBufferQueue buffer;
   EXPECT_EQ(0, buffer.frames());
   buffer.Append(
-      MakeTestBuffer<uint8>(kSampleFormatU8, channel_layout, 10, 1, 8));
+      MakeTestBuffer<uint8_t>(kSampleFormatU8, channel_layout, 10, 1, 8));
   EXPECT_EQ(8, buffer.frames());
   buffer.Clear();
   EXPECT_EQ(0, buffer.frames());
   buffer.Append(
-      MakeTestBuffer<uint8>(kSampleFormatU8, channel_layout, 20, 1, 8));
+      MakeTestBuffer<uint8_t>(kSampleFormatU8, channel_layout, 20, 1, 8));
   EXPECT_EQ(8, buffer.frames());
 }
 
 TEST(AudioBufferQueueTest, MultipleAppend) {
   const ChannelLayout channel_layout = CHANNEL_LAYOUT_MONO;
   AudioBufferQueue buffer;
   buffer.Append(
-      MakeTestBuffer<uint8>(kSampleFormatU8, channel_layout, 10, 1, 8));
+      MakeTestBuffer<uint8_t>(kSampleFormatU8, channel_layout, 10, 1, 8));
   EXPECT_EQ(8, buffer.frames());
   buffer.Append(
-      MakeTestBuffer<uint8>(kSampleFormatU8, channel_layout, 10, 1, 8));
+      MakeTestBuffer<uint8_t>(kSampleFormatU8, channel_layout, 10, 1, 8));
   EXPECT_EQ(16, buffer.frames());
   buffer.Append(
-      MakeTestBuffer<uint8>(kSampleFormatU8, channel_layout, 10, 1, 8));
+      MakeTestBuffer<uint8_t>(kSampleFormatU8, channel_layout, 10, 1, 8));
   EXPECT_EQ(24, buffer.frames());
   buffer.Append(
-      MakeTestBuffer<uint8>(kSampleFormatU8, channel_layout, 10, 1, 8));
+      MakeTestBuffer<uint8_t>(kSampleFormatU8, channel_layout, 10, 1, 8));
   EXPECT_EQ(32, buffer.frames());
   buffer.Append(
-      MakeTestBuffer<uint8>(kSampleFormatU8, channel_layout, 10, 1, 8));
+      MakeTestBuffer<uint8_t>(kSampleFormatU8, channel_layout, 10, 1, 8));
   EXPECT_EQ(40, buffer.frames());
 }
 
 TEST(AudioBufferQueueTest, IteratorCheck) {
   const ChannelLayout channel_layout = CHANNEL_LAYOUT_MONO;
   const int channels = ChannelLayoutToChannelCount(channel_layout);
   AudioBufferQueue buffer;
   scoped_ptr<AudioBus> bus = AudioBus::Create(channels, 100);
 
   // Append 40 frames in 5 buffers. Intersperse ReadFrames() to make the
@@ skipping 92 matching lines @@
 }
 
 TEST(AudioBufferQueueTest, ReadU8) {
   const ChannelLayout channel_layout = CHANNEL_LAYOUT_4_0;
   const int channels = ChannelLayoutToChannelCount(channel_layout);
   const int frames = 4;
   AudioBufferQueue buffer;
 
   // Add 4 frames of data.
   buffer.Append(
-      MakeTestBuffer<uint8>(kSampleFormatU8, channel_layout, 128, 1, frames));
+      MakeTestBuffer<uint8_t>(kSampleFormatU8, channel_layout, 128, 1, frames));
 
   // Read all 4 frames from the buffer.
   scoped_ptr<AudioBus> bus = AudioBus::Create(channels, frames);
   EXPECT_EQ(frames, buffer.ReadFrames(frames, 0, bus.get()));
   EXPECT_EQ(0, buffer.frames());
   VerifyBus(bus.get(), 0, frames, bus->frames(), 0, 1.0f / 127.0f);
 }
 
 TEST(AudioBufferQueueTest, ReadS16) {
   const ChannelLayout channel_layout = CHANNEL_LAYOUT_STEREO;
   const int channels = ChannelLayoutToChannelCount(channel_layout);
   AudioBufferQueue buffer;
 
   // Add 24 frames of data.
   buffer.Append(
-      MakeTestBuffer<int16>(kSampleFormatS16, channel_layout, 1, 1, 4));
+      MakeTestBuffer<int16_t>(kSampleFormatS16, channel_layout, 1, 1, 4));
   buffer.Append(
-      MakeTestBuffer<int16>(kSampleFormatS16, channel_layout, 9, 1, 20));
+      MakeTestBuffer<int16_t>(kSampleFormatS16, channel_layout, 9, 1, 20));
   EXPECT_EQ(24, buffer.frames());
 
   // Read 6 frames from the buffer.
   const int frames = 6;
   scoped_ptr<AudioBus> bus = AudioBus::Create(channels, buffer.frames());
   EXPECT_EQ(frames, buffer.ReadFrames(frames, 0, bus.get()));
   EXPECT_EQ(18, buffer.frames());
-  VerifyBus(bus.get(), 0, 4, 4, 1.0f / kint16max, 1.0f / kint16max);
-  VerifyBus(bus.get(), 4, 2, 20, 9.0f / kint16max, 1.0f / kint16max);
+  VerifyBus(bus.get(), 0, 4, 4, 1.0f / std::numeric_limits<int16_t>::max(),
+            1.0f / std::numeric_limits<int16_t>::max());
+  VerifyBus(bus.get(), 4, 2, 20, 9.0f / std::numeric_limits<int16_t>::max(),
+            1.0f / std::numeric_limits<int16_t>::max());
 }
 
 TEST(AudioBufferQueueTest, ReadS32) {
   const ChannelLayout channel_layout = CHANNEL_LAYOUT_STEREO;
   const int channels = ChannelLayoutToChannelCount(channel_layout);
   AudioBufferQueue buffer;
 
   // Add 24 frames of data.
   buffer.Append(
-      MakeTestBuffer<int32>(kSampleFormatS32, channel_layout, 1, 1, 4));
+      MakeTestBuffer<int32_t>(kSampleFormatS32, channel_layout, 1, 1, 4));
   buffer.Append(
-      MakeTestBuffer<int32>(kSampleFormatS32, channel_layout, 9, 1, 20));
+      MakeTestBuffer<int32_t>(kSampleFormatS32, channel_layout, 9, 1, 20));
   EXPECT_EQ(24, buffer.frames());
 
   // Read 6 frames from the buffer.
   scoped_ptr<AudioBus> bus = AudioBus::Create(channels, 100);
   EXPECT_EQ(6, buffer.ReadFrames(6, 0, bus.get()));
   EXPECT_EQ(18, buffer.frames());
-  VerifyBus(bus.get(), 0, 4, 4, 1.0f / kint32max, 1.0f / kint32max);
-  VerifyBus(bus.get(), 4, 2, 20, 9.0f / kint32max, 1.0f / kint32max);
+  VerifyBus(bus.get(), 0, 4, 4, 1.0f / std::numeric_limits<int32_t>::max(),
+            1.0f / std::numeric_limits<int32_t>::max());
+  VerifyBus(bus.get(), 4, 2, 20, 9.0f / std::numeric_limits<int32_t>::max(),
+            1.0f / std::numeric_limits<int32_t>::max());
 
   // Read the next 2 frames.
   EXPECT_EQ(2, buffer.ReadFrames(2, 0, bus.get()));
   EXPECT_EQ(16, buffer.frames());
-  VerifyBus(bus.get(), 0, 2, 20, 11.0f / kint32max, 1.0f / kint32max);
+  VerifyBus(bus.get(), 0, 2, 20, 11.0f / std::numeric_limits<int32_t>::max(),
+            1.0f / std::numeric_limits<int32_t>::max());
 }
 
 TEST(AudioBufferQueueTest, ReadF32Planar) {
   const ChannelLayout channel_layout = CHANNEL_LAYOUT_STEREO;
   const int channels = ChannelLayoutToChannelCount(channel_layout);
   AudioBufferQueue buffer;
 
   // Add 14 frames of data.
   buffer.Append(MakeTestBuffer<float>(
       kSampleFormatPlanarF32, channel_layout, 1.0f, 1.0f, 4));
   buffer.Append(MakeTestBuffer<float>(
       kSampleFormatPlanarF32, channel_layout, 50.0f, 1.0f, 10));
   EXPECT_EQ(14, buffer.frames());
 
   // Read 6 frames from the buffer.
   scoped_ptr<AudioBus> bus = AudioBus::Create(channels, 100);
   EXPECT_EQ(6, buffer.ReadFrames(6, 0, bus.get()));
   EXPECT_EQ(8, buffer.frames());
   VerifyBus(bus.get(), 0, 4, 4, 1, 1);
   VerifyBus(bus.get(), 4, 2, 10, 50, 1);
 }
 
 TEST(AudioBufferQueueTest, ReadS16Planar) {
   const ChannelLayout channel_layout = CHANNEL_LAYOUT_STEREO;
   const int channels = ChannelLayoutToChannelCount(channel_layout);
   AudioBufferQueue buffer;
 
   // Add 24 frames of data.
   buffer.Append(
-      MakeTestBuffer<int16>(kSampleFormatPlanarS16, channel_layout, 1, 1, 4));
-  buffer.Append(
-      MakeTestBuffer<int16>(kSampleFormatPlanarS16, channel_layout, 5, 1, 20));
+      MakeTestBuffer<int16_t>(kSampleFormatPlanarS16, channel_layout, 1, 1, 4));
+  buffer.Append(MakeTestBuffer<int16_t>(kSampleFormatPlanarS16, channel_layout,
+                                        5, 1, 20));
   EXPECT_EQ(24, buffer.frames());
 
   // Read 6 frames from the buffer.
   scoped_ptr<AudioBus> bus = AudioBus::Create(channels, 100);
   EXPECT_EQ(6, buffer.ReadFrames(6, 0, bus.get()));
   EXPECT_EQ(18, buffer.frames());
-  VerifyBus(bus.get(), 0, 4, 4, 1.0f / kint16max, 1.0f / kint16max);
-  VerifyBus(bus.get(), 4, 2, 20, 5.0f / kint16max, 1.0f / kint16max);
+  VerifyBus(bus.get(), 0, 4, 4, 1.0f / std::numeric_limits<int16_t>::max(),
+            1.0f / std::numeric_limits<int16_t>::max());
+  VerifyBus(bus.get(), 4, 2, 20, 5.0f / std::numeric_limits<int16_t>::max(),
+            1.0f / std::numeric_limits<int16_t>::max());
 }
 
 TEST(AudioBufferQueueTest, ReadManyChannels) {
   const ChannelLayout channel_layout = CHANNEL_LAYOUT_OCTAGONAL;
   const int channels = ChannelLayoutToChannelCount(channel_layout);
   AudioBufferQueue buffer;
 
   // Add 76 frames of data.
   buffer.Append(
       MakeTestBuffer<float>(kSampleFormatF32, channel_layout, 0.0f, 1.0f, 6));
@@ skipping 41 matching lines @@
   EXPECT_EQ(5, buffer.PeekFrames(5, 10, 0, bus1.get()));
   VerifyBus(bus1.get(), 0, 5, bus1->frames(), 40, 1);
 
   // Peek to the end of the buffer.
   EXPECT_EQ(30, buffer.frames());
   EXPECT_EQ(30, buffer.PeekFrames(60, 0, 0, bus1.get()));
   EXPECT_EQ(30, buffer.PeekFrames(30, 0, 0, bus1.get()));
 }
 
 }  // namespace media