Fix encrypted AAC in BMFF by adding subsample info.

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"
@@ skipping 138 matching lines @@
   // 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;
+  size_t size = buffer->size() + kADTSHeaderSize;
 
   DCHECK(profile_ >= 1 && profile_ <= 4 && frequency_index_ != 0xf &&
          channel_config_ <= 7);
 
   // ADTS header uses 13 bits for packet size.
   if (size >= (1 << 13))
     return false;
 
   std::vector<uint8>& adts = *buffer;
 
-  adts.insert(buffer->begin(), 7, 0);
+  adts.insert(buffer->begin(), kADTSHeaderSize, 0);
   adts[0] = 0xff;
   adts[1] = 0xf1;
   adts[2] = ((profile_ - 1) << 6) + (frequency_index_ << 2) +
       (channel_config_ >> 2);
   adts[3] = ((channel_config_ & 0x3) << 6) + (size >> 11);
   adts[4] = (size & 0x7ff) >> 3;
   adts[5] = ((size & 7) << 5) + 0x1f;
   adts[6] = 0xfc;
 
   return true;
@@ skipping 73 matching lines @@
 
     RCHECK(bit_reader->ReadBits(1, &dummy));  // extensionFlag3
   }
 
   return true;
 }
 
 }  // namespace mp4
 
 }  // namespace media