Implemented rest of webkit api/glue code needed for HTML5 media canPlayType().

BUG=16636
TEST=we should respect the codecs= parameter when provided as a media mime type

Review URL: http://codereview.chromium.org/160073


git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21607 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 36 insertions, 0 deletions

diff --git a/net/base/mime_util.cc b/net/base/mime_util.cc
index fb81009..d7ea052 100644
--- a/net/base/mime_util.cc
+++ b/net/base/mime_util.cc
@@ -37,6 +37,8 @@ class MimeUtil : public PlatformMimeUtil {
   bool MatchesMimeType(const std::string &mime_type_pattern,
                        const std::string &mime_type) const;
 
+  bool AreSupportedMediaCodecs(const std::vector<std::string>& codecs) const;
+
   void ParseCodecString(const std::string& codecs,
                         std::vector<std::string>* codecs_out);
 
@@ -55,6 +57,7 @@ class MimeUtil : public PlatformMimeUtil {
   MimeMappings non_image_map_;
   MimeMappings javascript_map_;
   MimeMappings view_source_map_;
+  MimeMappings codecs_map_;
 };  // class MimeUtil
 
 struct MimeInfo {
@@ -196,6 +199,19 @@ static const char* const supported_media_types[] = {
 #endif
 };
 
+// List of supported codecs when passed in with <source type="...">.
+//
+// Refer to http://wiki.whatwg.org/wiki/Video_type_parameters#Browser_Support
+// for more information.
+static const char* const supported_media_codecs[] = {
+#if defined(GOOGLE_CHROME_BUILD)
+  "avc1",
+  "mp4a",
+#endif
+  "theora",
+  "vorbis",
+};
+
 // Note: does not include javascript types list (see supported_javascript_types)
 static const char* const supported_non_image_types[] = {
   "text/html",
@@ -270,6 +286,9 @@ void MimeUtil::InitializeMimeTypeMaps() {
 
   for (size_t i = 0; i < arraysize(view_source_types); ++i)
     view_source_map_.insert(view_source_types[i]);
+
+  for (size_t i = 0; i < arraysize(supported_media_codecs); ++i)
+    codecs_map_.insert(supported_media_codecs[i]);
 }
 
 bool MimeUtil::IsSupportedImageMimeType(const char* mime_type) const {
@@ -336,6 +355,16 @@ bool MimeUtil::MatchesMimeType(const std::string &mime_type_pattern,
   return true;
 }
 
+bool MimeUtil::AreSupportedMediaCodecs(
+    const std::vector<std::string>& codecs) const {
+  for (size_t i = 0; i < codecs.size(); ++i) {
+    if (codecs_map_.find(codecs[i]) == codecs_map_.end()) {
+      return false;
+    }
+  }
+  return true;
+}
+
 void MimeUtil::ParseCodecString(const std::string& codecs,
                                 std::vector<std::string>* codecs_out) {
   std::string no_quote_codecs;
@@ -403,6 +432,10 @@ bool MatchesMimeType(const std::string &mime_type_pattern,
   return GetMimeUtil()->MatchesMimeType(mime_type_pattern, mime_type);
 }
 
+bool AreSupportedMediaCodecs(const std::vector<std::string>& codecs) {
+  return GetMimeUtil()->AreSupportedMediaCodecs(codecs);
+}
+
 void ParseCodecString(const std::string& codecs,
                       std::vector<std::string>* codecs_out) {
   GetMimeUtil()->ParseCodecString(codecs, codecs_out);
diff --git a/net/base/mime_util.h b/net/base/mime_util.h
index 17620d9..1846087 100644
--- a/net/base/mime_util.h
+++ b/net/base/mime_util.h
@@ -46,6 +46,9 @@ bool IsSupportedMimeType(const std::string& mime_type);
 bool MatchesMimeType(const std::string &mime_type_pattern,
                      const std::string &mime_type);
 
+// Returns true if and only if all codecs are supported, false otherwise.
+bool AreSupportedMediaCodecs(const std::vector<std::string>& codecs);
+
 // Parses a codec string, populating |codecs_out| with the prefix of each codec
 // in the string |codecs_in|. For example, passed "aaa.b.c,dd.eee", |codecs_out|
 // will contain {"aaa", "dd"}.