Implement ISO BMFF support in Media Source.

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 "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "media/base/audio_decoder_config.h"
 #include "media/base/stream_parser_buffer.h"
 #include "media/base/video_decoder_config.h"
 #include "media/filters/chunk_demuxer_client.h"
 #include "media/webm/webm_stream_parser.h"
+#include "media/mp4/mp4_stream_parser.h"

[acolwell GONE FROM CHROMIUM, 2012/06/06 17:32:39]

includes should be alphabetical

[strobe_, 2012/06/07 16:33:54]

Done.

 
 namespace media {
 
 struct CodecInfo {
   const char* name;
   DemuxerStream::Type type;
 };
 
 typedef StreamParser* (*ParserFactoryFunction)();
 
 struct SupportedTypeInfo {
   const char* type;
   const ParserFactoryFunction factory_function;
   const CodecInfo** codecs;
 };
 
 static const CodecInfo kVP8CodecInfo = { "vp8", DemuxerStream::VIDEO };
 static const CodecInfo kVorbisCodecInfo = { "vorbis", DemuxerStream::AUDIO };
 
+// TODO(strobe): Perform matching against supported profiles and levels, or
+// simply accept codecs that match a prefix.
+static const CodecInfo kH264CodecInfo = { "avc1.4D4041", DemuxerStream::VIDEO };
+static const CodecInfo kAACCodecInfo = { "mp4a.40.2", DemuxerStream::AUDIO };
+
 static const CodecInfo* kVideoWebMCodecs[] = {
   &kVP8CodecInfo,
   &kVorbisCodecInfo,
   NULL
 };
 
 static const CodecInfo* kAudioWebMCodecs[] = {
+  &kVP8CodecInfo,

[acolwell GONE FROM CHROMIUM, 2012/06/06 17:32:39]

remove. VP8 should not be allowed in an audio only mimetype

[strobe_, 2012/06/07 16:33:54]

Done. Sorry, copy and paste error.

   &kVorbisCodecInfo,
   NULL
 };
 
+static const CodecInfo* kVideoMP4Codecs[] = {
+  &kH264CodecInfo,
+  &kAACCodecInfo,
+  NULL
+};
+
+static const CodecInfo* kAudioMP4Codecs[] = {
+  &kAACCodecInfo,
+  NULL
+};
+
 static StreamParser* BuildWebMParser() {
   return new WebMStreamParser();
 }
 
+static StreamParser* BuildMP4Parser() {
+  return new MP4StreamParser();
+}
+
 static const SupportedTypeInfo kSupportedTypeInfo[] = {
   { "video/webm", &BuildWebMParser, kVideoWebMCodecs },
   { "audio/webm", &BuildWebMParser, kAudioWebMCodecs },
+  { "video/mp4", &BuildMP4Parser, kVideoMP4Codecs },
+  { "audio/mp4", &BuildMP4Parser, kAudioMP4Codecs },
 };
 
 // Checks to see if the specified |type| and |codecs| list are supported.
 // Returns true if |type| and all codecs listed in |codecs| are supported.
 //         |factory_function| contains a function that can build a StreamParser
 //                            for this type.
 //         |has_audio| is true if an audio codec was specified.
 //         |has_video| is true if a video codec was specified.
 // Returns false otherwise. The values of |factory_function|, |has_audio|,
 //         and |has_video| are undefined.
@@ skipping 447 matching lines @@
 
   base::AutoLock auto_lock(lock_);
 
   return source_buffer_->GetBufferedRanges(ranges_out);
 }
 
 bool ChunkDemuxer::AppendData(const std::string& id,
                               const uint8* data,
                               size_t length) {
   DVLOG(1) << "AppendData(" << id << ", " << length << ")";
-
-  // TODO(acolwell): Remove when http://webk.it/83788 fix lands.
-  if (source_id_.empty()) {
-    std::vector<std::string> codecs(2);
-    codecs[0] = "vp8";
-    codecs[1] = "vorbis";
-    AddId(id, "video/webm", codecs);
-  }
-
   DCHECK(!source_id_.empty());
   DCHECK_EQ(source_id_, id);
   DCHECK(!id.empty());
   DCHECK(data);
   DCHECK_GT(length, 0u);
 
   int64 buffered_bytes = 0;
 
   PipelineStatusCB cb;
   {
@@ skipping 237 matching lines @@
   return true;
 }
 
 bool ChunkDemuxer::OnKeyNeeded(scoped_array<uint8> init_data,
                                int init_data_size) {
   client_->KeyNeeded(init_data.Pass(), init_data_size);
   return true;
 }
 
 }  // namespace media