Fix MediaSource code so it can handle HE-AAC content that uses implicit signalling.

media/mp4/aac_unittest.cc

 // Copyright (c) 2012 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 "media/mp4/aac.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace media {
 
 namespace mp4 {
 
 TEST(AACTest, BasicProfileTest) {
   AAC aac;
   uint8 buffer[] = {0x12, 0x10};
   std::vector<uint8> data;
 
   data.assign(buffer, buffer + sizeof(buffer));
 
   EXPECT_TRUE(aac.Parse(data));
-  EXPECT_EQ(aac.frequency(), 44100u);
+  EXPECT_EQ(aac.GetOutputSamplesPerSecond(false), 44100);
   EXPECT_EQ(aac.channel_layout(), CHANNEL_LAYOUT_STEREO);
 }
 
 TEST(AACTest, ExtensionTest) {
   AAC aac;
   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.frequency(), 48000u);
+  EXPECT_EQ(aac.GetOutputSamplesPerSecond(false), 48000);
+  EXPECT_EQ(aac.GetOutputSamplesPerSecond(true), 48000);
   EXPECT_EQ(aac.channel_layout(), CHANNEL_LAYOUT_STEREO);
 }
 
+TEST(AACTest, TestImplicitSBR) {
+  AAC aac;
+  uint8 buffer[] = {0x13, 0x10};
+  std::vector<uint8> data;
+
+  data.assign(buffer, buffer + sizeof(buffer));
+
+  EXPECT_TRUE(aac.Parse(data));
+  EXPECT_EQ(aac.GetOutputSamplesPerSecond(false), 24000);
+  EXPECT_EQ(aac.GetOutputSamplesPerSecond(true), 48000);
+  EXPECT_EQ(aac.channel_layout(), CHANNEL_LAYOUT_STEREO);
+}
+
 TEST(AACTest, SixChannelTest) {
   AAC aac;
   uint8 buffer[] = {0x11, 0xb0};
   std::vector<uint8> data;
 
   data.assign(buffer, buffer + sizeof(buffer));
 
   EXPECT_TRUE(aac.Parse(data));
-  EXPECT_EQ(aac.frequency(), 48000u);
+  EXPECT_EQ(aac.GetOutputSamplesPerSecond(false), 48000);
   EXPECT_EQ(aac.channel_layout(), CHANNEL_LAYOUT_5_1);
 }
 
 TEST(AACTest, DataTooShortTest) {
   AAC aac;
   std::vector<uint8> data;
 
   EXPECT_FALSE(aac.Parse(data));
 
   data.push_back(0x12);
@@ skipping 39 matching lines @@
 
   EXPECT_FALSE(aac.Parse(data));
 
   data[1] = 0x08;
   EXPECT_TRUE(aac.Parse(data));
 }
 
 }  // namespace mp4
 
 }  // namespace media