Add support for accepting MPEG2 AAC-LC bitstreams.

media/filters/chunk_demuxer.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/filters/chunk_demuxer.h"
 
 #include <algorithm>
 #include <deque>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/message_loop_proxy.h"
 #include "base/string_util.h"
 #include "media/base/audio_decoder_config.h"
 #include "media/base/stream_parser_buffer.h"
 #include "media/base/video_decoder_config.h"
 #if defined(GOOGLE_CHROME_BUILD) || defined(USE_PROPRIETARY_CODECS)
+#include "media/mp4/es_descriptor.h"
 #include "media/mp4/mp4_stream_parser.h"
 #endif
 #include "media/webm/webm_stream_parser.h"
 
 using base::TimeDelta;
 
 namespace media {
 
 struct CodecInfo {
   const char* pattern;
@@ skipping 22 matching lines @@
   &kVorbisCodecInfo,
   NULL
 };
 
 static StreamParser* BuildWebMParser(const std::vector<std::string>& codecs) {
   return new WebMStreamParser();
 }
 
 #if defined(GOOGLE_CHROME_BUILD) || defined(USE_PROPRIETARY_CODECS)
 static const CodecInfo kH264CodecInfo = { "avc1.*", DemuxerStream::VIDEO };
-static const CodecInfo kAACCodecInfo = { "mp4a.40.*", DemuxerStream::AUDIO };
+static const CodecInfo kMPEG4AACLCCodecInfo = {
+  "mp4a.40.2", DemuxerStream::AUDIO };

[scherkus (not reviewing), 2013/01/08 23:51:08]

move trailing }; to next line here + below

[acolwell GONE FROM CHROMIUM, 2013/01/16 17:35:09]

Done.

+static const CodecInfo kMPEG4AACSBRCodecInfo = {
+  "mp4a.40.5", DemuxerStream::AUDIO };
+static const CodecInfo kMPEG2AACLCCodecInfo = {
+  "mp4a.67", DemuxerStream::AUDIO };
 
 static const CodecInfo* kVideoMP4Codecs[] = {
   &kH264CodecInfo,
-  &kAACCodecInfo,
+  &kMPEG4AACLCCodecInfo,
+  &kMPEG4AACSBRCodecInfo,
+  &kMPEG2AACLCCodecInfo,
   NULL
 };
 
 static const CodecInfo* kAudioMP4Codecs[] = {
-  &kAACCodecInfo,
+  &kMPEG4AACLCCodecInfo,
+  &kMPEG4AACSBRCodecInfo,
+  &kMPEG2AACLCCodecInfo,
   NULL
 };
 
 // Mimetype codec string that indicates the content contains AAC SBR frames.
 static const char* kSBRCodecId = "mp4a.40.5";
 
 static StreamParser* BuildMP4Parser(const std::vector<std::string>& codecs) {
+  std::set<int> audio_object_types;
   bool has_sbr = false;
   for (size_t i = 0; i < codecs.size(); ++i) {
+    if (MatchPattern(codecs[i], kMPEG2AACLCCodecInfo.pattern)) {
+      audio_object_types.insert(mp4::kISO_13818_7_AAC_LC);
+    } else {
+      audio_object_types.insert(mp4::kISO_14496_3);
+    }
+
     if (codecs[i] == kSBRCodecId) {
       has_sbr = true;
       break;
     }
   }
 
-  return new mp4::MP4StreamParser(has_sbr);
+  return new mp4::MP4StreamParser(audio_object_types, has_sbr);
 }
 #endif
 
 static const SupportedTypeInfo kSupportedTypeInfo[] = {
   { "video/webm", &BuildWebMParser, kVideoWebMCodecs },
   { "audio/webm", &BuildWebMParser, kAudioWebMCodecs },
 #if defined(GOOGLE_CHROME_BUILD) || defined(USE_PROPRIETARY_CODECS)
   { "video/mp4", &BuildMP4Parser, kVideoMP4Codecs },
   { "audio/mp4", &BuildMP4Parser, kAudioMP4Codecs },
 #endif
@@ skipping 1149 matching lines @@
 
 Ranges<TimeDelta> ChunkDemuxer::GetBufferedRanges() const {
   if (audio_ && !video_)
     return audio_->GetBufferedRanges(duration_);
   else if (!audio_ && video_)
     return video_->GetBufferedRanges(duration_);
   return ComputeIntersection();
 }
 
 }  // namespace media