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

media/mp4/mp4_stream_parser.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/mp4_stream_parser.h"
 
 #include "base/callback.h"
 #include "base/callback_helpers.h"
 #include "base/logging.h"
 #include "base/time.h"
 #include "media/base/audio_decoder_config.h"
 #include "media/base/stream_parser_buffer.h"
 #include "media/base/video_decoder_config.h"
 #include "media/mp4/box_definitions.h"
 #include "media/mp4/box_reader.h"
 #include "media/mp4/es_descriptor.h"
 #include "media/mp4/rcheck.h"
 
 namespace media {
 namespace mp4 {
 
-MP4StreamParser::MP4StreamParser()
+MP4StreamParser::MP4StreamParser(bool has_sbr)
     : state_(kWaitingForInit),
       moof_head_(0),
       mdat_tail_(0),
       has_audio_(false),
       has_video_(false),
       audio_track_id_(0),
-      video_track_id_(0) {
+      video_track_id_(0),
+      has_sbr_(has_sbr) {
 }
 
 MP4StreamParser::~MP4StreamParser() {}
 
 void MP4StreamParser::Init(const InitCB& init_cb,
                            const NewConfigCB& config_cb,
                            const NewBuffersCB& audio_cb,
                            const NewBuffersCB& video_cb,
                            const NeedKeyCB& need_key_cb,
                            const NewMediaSegmentCB& new_segment_cb) {
@@ skipping 140 matching lines @@
 
       // TODO(strobe): We accept all format values, pending clarification on
       // the formats used for encrypted media (http://crbug.com/132351).
       //  RCHECK(entry.format == FOURCC_MP4A ||
       //         (entry.format == FOURCC_ENCA &&
       //          entry.sinf.format.format == FOURCC_MP4A));
 
       // Check if it is MPEG4 AAC defined in ISO 14496 Part 3.
       RCHECK(entry.esds.object_type == kISO_14496_3);
       audio_config.Initialize(kCodecAAC, entry.samplesize,
-                              aac.channel_layout(), aac.frequency(),
+                              aac.channel_layout(),
+                              aac.GetOutputSamplesPerSecond(has_sbr_),
                               NULL, 0, false);
-
       has_audio_ = true;
       audio_track_id_ = track->header.track_id;
     }
     if (track->media.handler.type == kVideo && !video_config.IsValidConfig()) {
       RCHECK(!samp_descr.video_entries.empty());
       if (static_cast<uint32>(desc_idx) >= samp_descr.video_entries.size())
         desc_idx = 0;
       const VideoSampleEntry& entry = samp_descr.video_entries[desc_idx];
 
       //  RCHECK(entry.format == FOURCC_AVC1 ||
@@ skipping 162 matching lines @@
   return true;
 }
 
 void MP4StreamParser::ChangeState(State new_state) {
   DVLOG(2) << "Changing state: " << new_state;
   state_ = new_state;
 }
 
 }  // namespace mp4
 }  // namespace media