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

media/mp4/aac.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 <algorithm>
+
 #include "base/logging.h"
 #include "media/base/bit_reader.h"
 #include "media/mp4/rcheck.h"
 
 // The following conversion table is extracted from ISO 14496 Part 3 -
 // Table 1.16 - Sampling Frequency Index.
-static const uint32 kFrequencyMap[] = {
+static const int kFrequencyMap[] = {
   96000, 88200, 64000, 48000, 44100, 32000, 24000,
   22050, 16000, 12000, 11025, 8000, 7350
 };
 
 static ChannelLayout GetChannelLayout(uint8 channel_config) {
   switch (channel_config) {
     case 1:
       return CHANNEL_LAYOUT_MONO;
     case 2:
       return CHANNEL_LAYOUT_STEREO;
@@ skipping 13 matching lines @@
 
   return CHANNEL_LAYOUT_UNSUPPORTED;
 }
 
 namespace media {
 
 namespace mp4 {
 
 AAC::AAC()
     : profile_(0), frequency_index_(0), channel_config_(0), frequency_(0),
-      channel_layout_(CHANNEL_LAYOUT_UNSUPPORTED) {
+      extension_frequency_(0), channel_layout_(CHANNEL_LAYOUT_UNSUPPORTED) {
 }
 
 AAC::~AAC() {
 }
 
 bool AAC::Parse(const std::vector<uint8>& data) {
   if (data.empty())
     return false;
 
   BitReader reader(&data[0], data.size());
   uint8 extension_type = 0;
   bool ps_present = false;
-  uint8 extension_frequency_index;
+  uint8 extension_frequency_index = 0xff;
 
   frequency_ = 0;
+  extension_frequency_ = 0;
 
   // The following code is written according to ISO 14496 Part 3 Table 1.13 -
   // Syntax of AudioSpecificConfig.
 
   // Read base configuration
   RCHECK(reader.ReadBits(5, &profile_));
   RCHECK(reader.ReadBits(4, &frequency_index_));
   if (frequency_index_ == 0xf)
     RCHECK(reader.ReadBits(24, &frequency_));
   RCHECK(reader.ReadBits(4, &channel_config_));
 
-  extension_frequency_index = frequency_index_;
-
   // Read extension configuration

[vrk (LEFT CHROMIUM), 2012/07/20 23:08:48]

nit: period at end

[acolwell GONE FROM CHROMIUM, 2012/07/20 23:20:05]

Done.

   if (profile_ == 5 || profile_ == 29) {
     ps_present = (profile_ == 29);
     extension_type = 5;
     RCHECK(reader.ReadBits(4, &extension_frequency_index));
     if (extension_frequency_index == 0xf)
-      RCHECK(reader.ReadBits(24, &frequency_));
+      RCHECK(reader.ReadBits(24, &extension_frequency_));
     RCHECK(reader.ReadBits(5, &profile_));
   }
 
   RCHECK(SkipDecoderGASpecificConfig(&reader));
   RCHECK(SkipErrorSpecificConfig());
 
   // Read extension configuration again
   if (extension_type != 5) {
     uint16 sync_extension_type;
     uint8 sbr_present_flag;
     uint8 ps_present_flag;
 
     if (reader.ReadBits(11, &sync_extension_type) &&
         sync_extension_type == 0x2b7) {
       if (reader.ReadBits(5, &extension_type) && extension_type == 5) {
         RCHECK(reader.ReadBits(1, &sbr_present_flag));
 
         if (sbr_present_flag) {
           RCHECK(reader.ReadBits(4, &extension_frequency_index));
 
           if (extension_frequency_index == 0xf)
-            RCHECK(reader.ReadBits(24, &frequency_));
+            RCHECK(reader.ReadBits(24, &extension_frequency_));
 
           RCHECK(reader.ReadBits(11, &sync_extension_type));
 
           if (sync_extension_type == 0x548) {
             RCHECK(reader.ReadBits(1, &ps_present_flag));
             ps_present = ps_present_flag != 0;
           }
         }
       }
     }
   }
 
   if (frequency_ == 0) {
+    RCHECK(frequency_index_ < arraysize(kFrequencyMap));
+    frequency_ = kFrequencyMap[frequency_index_];
+  }
+
+  if (extension_frequency_ == 0 && extension_frequency_index != 0xff) {
     RCHECK(extension_frequency_index < arraysize(kFrequencyMap));
-    frequency_ = kFrequencyMap[extension_frequency_index];
+    extension_frequency_ = kFrequencyMap[extension_frequency_index];
   }
 
   // When Parametric Stereo is on, mono will be played as stereo.
   if (ps_present && channel_config_ == 1)
     channel_layout_ = GetChannelLayout(2);
   else
     channel_layout_ = GetChannelLayout(channel_config_);
 
   return frequency_ != 0 && channel_layout_ != CHANNEL_LAYOUT_UNSUPPORTED &&
       profile_ >= 1 && profile_ <= 4 && frequency_index_ != 0xf &&
       channel_config_ <= 7;
 }
 
-uint32 AAC::frequency() const {
-  return frequency_;
+int AAC::GetOutputSamplesPerSecond(bool sbr_in_mimetype) const {
+  if (extension_frequency_ > 0)
+    return extension_frequency_;
+
+  if (!sbr_in_mimetype)
+    return frequency_;
+
+  // The following code is written according to ISO 14496 Part 3 Table 1.11.

[vrk (LEFT CHROMIUM), 2012/07/20 23:08:48]

nit: Also include Table 1.22. (Table 1.11 refers to the capping to 48000, Table
1.22 refers to the "2 *")

[acolwell GONE FROM CHROMIUM, 2012/07/20 23:20:05]

Done.

+  // TODO(acolwell) : Extend sample rate cap to 96kHz for Level 5 content.
+  DCHECK_GT(frequency_, 0);
+  return std::min(2 * frequency_, 48000);
 }
 
 ChannelLayout AAC::channel_layout() const {
   return channel_layout_;
 }
 
 bool AAC::ConvertEsdsToADTS(std::vector<uint8>* buffer) const {
   size_t size = buffer->size() + 7;
 
   DCHECK(profile_ >= 1 && profile_ <= 4 && frequency_index_ != 0xf &&
@@ skipping 92 matching lines @@
 
     RCHECK(bit_reader->ReadBits(1, &dummy));  // extensionFlag3
   }
 
   return true;
 }
 
 }  // namespace mp4
 
 }  // namespace media