Make sure canPlayType does not return probably/maybe for VP9 on Android.

net/base/mime_util.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 <algorithm>
 #include <iterator>
 #include <map>
 #include <string>
 
 #include "base/containers/hash_tables.h"
@@ skipping 276 matching lines @@
   "audio/mp4",
   "audio/x-m4a",
 
   // MP3.
   "audio/mp3",
   "audio/x-mp3",
   "audio/mpeg",
 };
 
 // List of supported codecs when passed in with <source type="...">.
 // This set of codecs is supported by all variations of Chromium.

[asanka, 2013/09/06 19:13:32]

This comment is increasingly incorrect.

[Tom Finegan, 2013/09/06 21:00:48]

Agreed. Also, in addition to the accuracy of the comment, it's also wrong that
canPlayType() relies on this code instead of something in media. Not sure how
feasible moving this functionality where it belongs (or at least changing it to
query the media stack) actually is, though.

 //
 // Refer to http://wiki.whatwg.org/wiki/Video_type_parameters#Browser_Support
 // for more information.
 //
 // The codecs for WAV are integers as defined in Appendix A of RFC2361:
 // http://tools.ietf.org/html/rfc2361
 static const char* const common_media_codecs[] = {
 #if !defined(OS_ANDROID)  // Android doesn't support Ogg Theora.
   "theora",
+  "vp9",  // TODO(tomfinegan): Move vp9 back down with vp8 once VP9 is supported
+          // on Android. https://crbug.com/285016
 #endif
   "vorbis",
   "vp8",
-  "vp9",
   "1"  // WAVE_FORMAT_PCM.
 };
 
 // List of proprietary codecs only supported by Google Chrome.
 static const char* const proprietary_media_codecs[] = {
   "avc1",
   "mp4a"
 };
 
 // Note: does not include javascript types list (see supported_javascript_types)
@@ skipping 85 matching lines @@
   "text/jscript",
   "text/livescript"
 };
 
 struct MediaFormatStrict {
   const char* mime_type;
   const char* codecs_list;
 };
 
 static const MediaFormatStrict format_codec_mappings[] = {
+  // TODO(tomfinegan): Remove this if/else when VP9 is supported on Android.
+  // https://crbug.com/285016
+#if !defined(OS_ANDROID)
   { "video/webm", "vorbis,vp8,vp8.0,vp9,vp9.0" },
+#else
+  { "video/webm", "vorbis,vp8,vp8.0" },
+#endif
   { "audio/webm", "vorbis" },
   { "audio/wav", "1" }
 };
 
 MimeUtil::MimeUtil() {
   InitializeMimeTypeMaps();
 }
 
 // static
 bool MimeUtil::AreSupportedCodecs(const MimeMappings& supported_codecs,
@@ skipping 567 matching lines @@
   post_data->append("\r\n" + value + "\r\n");
 }
 
 void AddMultipartFinalDelimiterForUpload(const std::string& mime_boundary,
                                          std::string* post_data) {
   DCHECK(post_data);
   post_data->append("--" + mime_boundary + "--\r\n");
 }
 
 }  // namespace net