Fix encrypted AAC in BMFF by adding subsample info.

media/mp4/mp4_stream_parser.h

 // 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.
 
 #ifndef MEDIA_MP4_MP4_STREAM_PARSER_H_
 #define MEDIA_MP4_MP4_STREAM_PARSER_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 46 matching lines @@
   // retained after all 'mdat' information has been read.
   // Returns 'true' on success, 'false' if there was an error.
   bool ReadAndDiscardMDATsUntil(const int64 offset);
 
   void ChangeState(State new_state);
 
   bool EmitConfigs();
   bool PrepareAVCBuffer(const AVCDecoderConfigurationRecord& avc_config,
                         std::vector<uint8>* frame_buf,
                         std::vector<SubsampleEntry>* subsamples) const;
+  bool PrepareAACBuffer(const AAC& aac_config,
+                        std::vector<uint8>* frame_buf,
+                        std::vector<SubsampleEntry>* subsamples) const;
   bool EnqueueSample(BufferQueue* audio_buffers,
                      BufferQueue* video_buffers,
                      bool* err);
   bool SendAndFlushSamples(BufferQueue* audio_buffers,
                            BufferQueue* video_buffers);
 
   void Reset();
 
   State state_;
   InitCB init_cb_;
@@ skipping 25 matching lines @@
   uint32 video_track_id_;
   bool has_sbr_;
 
   DISALLOW_COPY_AND_ASSIGN(MP4StreamParser);
 };
 
 }  // namespace mp4
 }  // namespace media
 
 #endif  // MEDIA_MP4_MP4_STREAM_PARSER_H_