Changed TestShellWebMimeRegistryImpl to blacklist rather than whitelist containers and codecs.

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 <map>
 #include <string>
 
 #include "net/base/mime_util.h"
 #include "net/base/platform_mime_util.h"
 
@@ skipping 216 matching lines @@
   "image/webp",
   "image/png",
   "image/gif",
   "image/bmp",
   "image/x-icon",    // ico
   "image/x-xbitmap"  // xbm
 };
 
 // A list of media types: http://en.wikipedia.org/wiki/Internet_media_type
 // A comprehensive mime type list: http://plugindoc.mozdev.org/winmime.php
-static const char* const supported_media_types[] = {
+// This set of codecs is supported by all variations of Chromium.
+static const char* const common_media_types[] = {
   // Ogg.
   "audio/ogg",
   "application/ogg",
 #if defined(ENABLE_MEDIA_CODEC_THEORA)
   "video/ogg",
 #endif
 
   // WebM.
   "video/webm",
   "audio/webm",
   "audio/wav",
   "audio/x-wav",
+};
 
-#if defined(GOOGLE_CHROME_BUILD) || defined(USE_PROPRIETARY_CODECS)
+// List of proprietary types only supported by Google Chrome.
+static const char* const proprietary_media_types[] = {
   // MPEG-4.
   "video/mp4",
   "video/x-m4v",
   "audio/mp4",
   "audio/x-m4a",
 
   // MP3.
   "audio/mp3",
   "audio/x-mp3",
   "audio/mpeg",
-#endif
 };
 
 // List of supported codecs when passed in with <source type="...">.
+// This set of codecs is supported by all variations of Chromium.
 //
 // 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 supported_media_codecs[] = {
-#if defined(GOOGLE_CHROME_BUILD) || defined(USE_PROPRIETARY_CODECS)
-  "avc1",
-  "mp4a",
-#endif
+static const char* const common_media_codecs[] = {
 #if defined(ENABLE_MEDIA_CODEC_THEORA)
   "theora",
 #endif
   "vorbis",
   "vp8",
   "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)
 static const char* const supported_non_image_types[] = {
   "text/cache-manifest",
   "text/html",
   "text/xml",
   "text/xsl",
   "text/plain",
   // Many users complained about css files served for
   // download instead of displaying in the browser:
   // http://code.google.com/p/chromium/issues/detail?id=7192
@@ skipping 74 matching lines @@
 
 void MimeUtil::InitializeMimeTypeMaps() {
   for (size_t i = 0; i < arraysize(supported_image_types); ++i)
     image_map_.insert(supported_image_types[i]);
 
   // Initialize the supported non-image types.
   for (size_t i = 0; i < arraysize(supported_non_image_types); ++i)
     non_image_map_.insert(supported_non_image_types[i]);
   for (size_t i = 0; i < arraysize(supported_javascript_types); ++i)
     non_image_map_.insert(supported_javascript_types[i]);
-  for (size_t i = 0; i < arraysize(supported_media_types); ++i)
-    non_image_map_.insert(supported_media_types[i]);
+  for (size_t i = 0; i < arraysize(common_media_types); ++i)
+    non_image_map_.insert(common_media_types[i]);
+#if defined(GOOGLE_CHROME_BUILD) || defined(USE_PROPRIETARY_CODECS)
+  for (size_t i = 0; i < arraysize(proprietary_media_types); ++i)
+    non_image_map_.insert(proprietary_media_types[i]);
+#endif
 
   // Initialize the supported media types.
-  for (size_t i = 0; i < arraysize(supported_media_types); ++i)
-    media_map_.insert(supported_media_types[i]);
+  for (size_t i = 0; i < arraysize(common_media_types); ++i)
+    media_map_.insert(common_media_types[i]);
+#if defined(GOOGLE_CHROME_BUILD) || defined(USE_PROPRIETARY_CODECS)
+  for (size_t i = 0; i < arraysize(proprietary_media_types); ++i)
+    media_map_.insert(proprietary_media_types[i]);
+#endif
 
   for (size_t i = 0; i < arraysize(supported_javascript_types); ++i)
     javascript_map_.insert(supported_javascript_types[i]);
 
   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]);
+  for (size_t i = 0; i < arraysize(common_media_codecs); ++i)
+    codecs_map_.insert(common_media_codecs[i]);
+#if defined(GOOGLE_CHROME_BUILD) || defined(USE_PROPRIETARY_CODECS)
+  for (size_t i = 0; i < arraysize(proprietary_media_codecs); ++i)
+    codecs_map_.insert(proprietary_media_codecs[i]);
+#endif
 
   // Initialize the strict supported media types.
   for (size_t i = 0; i < arraysize(format_codec_mappings); ++i) {
     std::vector<std::string> mime_type_codecs;
     ParseCodecString(format_codec_mappings[i].codecs_list,
                      &mime_type_codecs,
                      false);
 
     MimeMappings codecs;
     for (size_t j = 0; j < mime_type_codecs.size(); ++j)
@@ skipping 337 matching lines @@
                                      &unique_extensions);
 
   GetExtensionsFromHardCodedMappings(secondary_mappings,
                                      arraysize(secondary_mappings),
                                      mime_type,
                                      &unique_extensions);
 
   HashSetToVector(&unique_extensions, extensions);
 }
 
+std::vector<std::string> GetProprietaryMediaTypes() {
+  std::vector<std::string> proprietary_types;
+// Unless/until WebM files are added to the media layout tests, we need to avoid
+// blacklisting mp4 and H.264 when Theora is not supported (and proprietary
+// codecs are) so that the media tests can still run.
+#if defined(ENABLE_MEDIA_CODEC_THEORA) || !defined(USE_PROPRIETARY_CODECS)
+  for (size_t i = 0; i < arraysize(proprietary_media_types); ++i)
+    proprietary_types.push_back(proprietary_media_types[i]);
+#endif
+  return proprietary_types;

[qinmin, 2012/04/06 23:36:59]

if we do this, does that mean video/ogg is not blacklisted for android?

[ddorwin, 2012/04/07 02:40:41]

It is not blacklisted for layout tests. In the #else (Android) case, the vector
is empty so nothing is blacklisted for layout tests.
However, it has been removed from the production code (above), so canPlayType()
in both layout tests (DRT) and the product will return "".

I considered renaming this GetMediaTypesToBlacklistInLayoutTests() since Theora
is not proprietary, but that is so long. I can't think of a better name, though.

[qinmin, 2012/04/07 02:46:53]

Is it possible this will cause some layout test to fail. So if the test has a
video which has multiple src,  android should choose ".mp4" instead of ".ogv" as
otherwise the test will fail.
 
On 2012/04/07 02:40:41, ddorwin wrote:

[ddorwin, 2012/04/07 03:15:31]

No. The layout test will have nothing blacklisted and will eventually call other
parts of this file to find out if the type is valid.  video/ogg will not be
supported because line 243 is not compiled on Android.

The blacklisting logic is only needed to remove some types and codecs that this
file might say are supported. In the case of Android, this file does NOT say
video/ogg or Theora are supported.

+}
+
+std::vector<std::string> GetProprietaryMediaCodecs() {
+  std::vector<std::string> proprietary_codecs;
+// Unless/until WebM files are added to the media layout tests, we need to avoid
+// blacklisting mp4 and H.264 when Theora is not supported (and proprietary
+// codecs are) so that the media tests can still run.
+#if defined(ENABLE_MEDIA_CODEC_THEORA) || !defined(USE_PROPRIETARY_CODECS)
+  for (size_t i = 0; i < arraysize(proprietary_media_codecs); ++i)
+    proprietary_codecs.push_back(proprietary_media_codecs[i]);
+#endif
+  return proprietary_codecs;

[qinmin, 2012/04/06 23:36:59]

same here, what about theora for android.

[ddorwin, 2012/04/07 02:40:41]

Same.

+}
+
 }  // namespace net