Log codec IDs for MediaSource content.

media/formats/mp4/aac_unittest.cc

Index: media/formats/mp4/aac_unittest.cc
diff --git a/media/formats/mp4/aac_unittest.cc b/media/formats/mp4/aac_unittest.cc
index d3ca83925b9bf7df6685efbd32a177f4bb36e2ea..9d65c31cea5a78164fb812d774dea0e91b72aa80 100644
--- a/media/formats/mp4/aac_unittest.cc
+++ b/media/formats/mp4/aac_unittest.cc
@@ -10,135 +10,135 @@ namespace media {
 
 namespace mp4 {
 
-TEST(AACTest, BasicProfileTest) {
-  AAC aac;
+class AACTest : public testing::Test {
+ public:
+  bool Parse(const std::vector<uint8>& data) {
+    return aac_.Parse(data, LogCB());
+  }
+
+  AAC aac_;
+};
+
+TEST_F(AACTest, BasicProfileTest) {
   uint8 buffer[] = {0x12, 0x10};
   std::vector<uint8> data;
 
   data.assign(buffer, buffer + sizeof(buffer));
 
-  EXPECT_TRUE(aac.Parse(data));
-  EXPECT_EQ(aac.GetOutputSamplesPerSecond(false), 44100);
-  EXPECT_EQ(aac.GetChannelLayout(false), CHANNEL_LAYOUT_STEREO);
+  EXPECT_TRUE(Parse(data));
+  EXPECT_EQ(aac_.GetOutputSamplesPerSecond(false), 44100);
+  EXPECT_EQ(aac_.GetChannelLayout(false), CHANNEL_LAYOUT_STEREO);
 }
 
-TEST(AACTest, ExtensionTest) {
-  AAC aac;
+TEST_F(AACTest, ExtensionTest) {
   uint8 buffer[] = {0x13, 0x08, 0x56, 0xe5, 0x9d, 0x48, 0x80};
   std::vector<uint8> data;
 
   data.assign(buffer, buffer + sizeof(buffer));
 
-  EXPECT_TRUE(aac.Parse(data));
-  EXPECT_EQ(aac.GetOutputSamplesPerSecond(false), 48000);
-  EXPECT_EQ(aac.GetOutputSamplesPerSecond(true), 48000);
-  EXPECT_EQ(aac.GetChannelLayout(false), CHANNEL_LAYOUT_STEREO);
+  EXPECT_TRUE(Parse(data));
+  EXPECT_EQ(aac_.GetOutputSamplesPerSecond(false), 48000);
+  EXPECT_EQ(aac_.GetOutputSamplesPerSecond(true), 48000);
+  EXPECT_EQ(aac_.GetChannelLayout(false), CHANNEL_LAYOUT_STEREO);
 }
 
 // Test implicit SBR with mono channel config.
 // Mono channel layout should only be reported if SBR is not
 // specified. Otherwise stereo should be reported.
 // See ISO-14496-3 Section 1.6.6.1.2 for details about this special casing.
-TEST(AACTest, ImplicitSBR_ChannelConfig0) {
-  AAC aac;
+TEST_F(AACTest, ImplicitSBR_ChannelConfig0) {
   uint8 buffer[] = {0x13, 0x08};
   std::vector<uint8> data;
 
   data.assign(buffer, buffer + sizeof(buffer));
 
-  EXPECT_TRUE(aac.Parse(data));
+  EXPECT_TRUE(Parse(data));
 
   // Test w/o implict SBR.
-  EXPECT_EQ(aac.GetOutputSamplesPerSecond(false), 24000);
-  EXPECT_EQ(aac.GetChannelLayout(false), CHANNEL_LAYOUT_MONO);
+  EXPECT_EQ(aac_.GetOutputSamplesPerSecond(false), 24000);
+  EXPECT_EQ(aac_.GetChannelLayout(false), CHANNEL_LAYOUT_MONO);
 
   // Test implicit SBR.
-  EXPECT_EQ(aac.GetOutputSamplesPerSecond(true), 48000);
-  EXPECT_EQ(aac.GetChannelLayout(true), CHANNEL_LAYOUT_STEREO);
+  EXPECT_EQ(aac_.GetOutputSamplesPerSecond(true), 48000);
+  EXPECT_EQ(aac_.GetChannelLayout(true), CHANNEL_LAYOUT_STEREO);
 }
 
 // Tests implicit SBR with a stereo channel config.
-TEST(AACTest, ImplicitSBR_ChannelConfig1) {
-  AAC aac;
+TEST_F(AACTest, ImplicitSBR_ChannelConfig1) {
   uint8 buffer[] = {0x13, 0x10};
   std::vector<uint8> data;
 
   data.assign(buffer, buffer + sizeof(buffer));
 
-  EXPECT_TRUE(aac.Parse(data));
+  EXPECT_TRUE(Parse(data));
 
   // Test w/o implict SBR.
-  EXPECT_EQ(aac.GetOutputSamplesPerSecond(false), 24000);
-  EXPECT_EQ(aac.GetChannelLayout(false), CHANNEL_LAYOUT_STEREO);
+  EXPECT_EQ(aac_.GetOutputSamplesPerSecond(false), 24000);
+  EXPECT_EQ(aac_.GetChannelLayout(false), CHANNEL_LAYOUT_STEREO);
 
   // Test implicit SBR.
-  EXPECT_EQ(aac.GetOutputSamplesPerSecond(true), 48000);
-  EXPECT_EQ(aac.GetChannelLayout(true), CHANNEL_LAYOUT_STEREO);
+  EXPECT_EQ(aac_.GetOutputSamplesPerSecond(true), 48000);
+  EXPECT_EQ(aac_.GetChannelLayout(true), CHANNEL_LAYOUT_STEREO);
 }
 
-TEST(AACTest, SixChannelTest) {
-  AAC aac;
+TEST_F(AACTest, SixChannelTest) {
   uint8 buffer[] = {0x11, 0xb0};
   std::vector<uint8> data;
 
   data.assign(buffer, buffer + sizeof(buffer));
 
-  EXPECT_TRUE(aac.Parse(data));
-  EXPECT_EQ(aac.GetOutputSamplesPerSecond(false), 48000);
-  EXPECT_EQ(aac.GetChannelLayout(false), CHANNEL_LAYOUT_5_1_BACK);
+  EXPECT_TRUE(Parse(data));
+  EXPECT_EQ(aac_.GetOutputSamplesPerSecond(false), 48000);
+  EXPECT_EQ(aac_.GetChannelLayout(false), CHANNEL_LAYOUT_5_1_BACK);
 }
 
-TEST(AACTest, DataTooShortTest) {
-  AAC aac;
+TEST_F(AACTest, DataTooShortTest) {
   std::vector<uint8> data;
 
-  EXPECT_FALSE(aac.Parse(data));
+  EXPECT_FALSE(Parse(data));
 
   data.push_back(0x12);
-  EXPECT_FALSE(aac.Parse(data));
+  EXPECT_FALSE(Parse(data));
 }
 
-TEST(AACTest, IncorrectProfileTest) {
-  AAC aac;
+TEST_F(AACTest, IncorrectProfileTest) {
   uint8 buffer[] = {0x0, 0x08};
   std::vector<uint8> data;
 
   data.assign(buffer, buffer + sizeof(buffer));
 
-  EXPECT_FALSE(aac.Parse(data));
+  EXPECT_FALSE(Parse(data));
 
   data[0] = 0x08;
-  EXPECT_TRUE(aac.Parse(data));
+  EXPECT_TRUE(Parse(data));
 
   data[0] = 0x28;
-  EXPECT_FALSE(aac.Parse(data));
+  EXPECT_FALSE(Parse(data));
 }
 
-TEST(AACTest, IncorrectFrequencyTest) {
-  AAC aac;
+TEST_F(AACTest, IncorrectFrequencyTest) {
   uint8 buffer[] = {0x0f, 0x88};
   std::vector<uint8> data;
 
   data.assign(buffer, buffer + sizeof(buffer));
 
-  EXPECT_FALSE(aac.Parse(data));
+  EXPECT_FALSE(Parse(data));
 
   data[0] = 0x0e;
   data[1] = 0x08;
-  EXPECT_TRUE(aac.Parse(data));
+  EXPECT_TRUE(Parse(data));
 }
 
-TEST(AACTest, IncorrectChannelTest) {
-  AAC aac;
+TEST_F(AACTest, IncorrectChannelTest) {
   uint8 buffer[] = {0x0e, 0x00};
   std::vector<uint8> data;
 
   data.assign(buffer, buffer + sizeof(buffer));
 
-  EXPECT_FALSE(aac.Parse(data));
+  EXPECT_FALSE(Parse(data));
 
   data[1] = 0x08;
-  EXPECT_TRUE(aac.Parse(data));
+  EXPECT_TRUE(Parse(data));
 }
 
 }  // namespace mp4