Add Chromium-side changes for MediaSource::isTypeSupported()

webkit/glue/simple_webmimeregistry_impl.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 "webkit/glue/simple_webmimeregistry_impl.h"
 
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "net/base/mime_util.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebString.h"
 #include "webkit/base/file_path_string_conversions.h"
 #include "webkit/media/crypto/key_systems.h"
+#include "webkit/media/webmediasourceclient_impl.h"
 
 using WebKit::WebString;
 using WebKit::WebMimeRegistry;
 
 namespace {
 
 // Convert a WebString to ASCII, falling back on an empty string in the case
 // of a non-ASCII string.
 std::string ToASCIIOrEmpty(const WebString& string) {
   return IsStringASCII(string) ? UTF16ToASCII(string) : std::string();
@@ skipping 75 matching lines @@
   // If we don't recognize the codec, it's possible we support it.
   std::vector<std::string> parsed_codecs;
   net::ParseCodecString(ToASCIIOrEmpty(codecs), &parsed_codecs, true);
   if (!net::AreSupportedMediaCodecs(parsed_codecs))
     return MayBeSupported;
 
   // Otherwise we have a perfect match.
   return IsSupported;
 }
 
+bool SimpleWebMimeRegistryImpl::supportsMediaSourceMIMEType(
+    const WebKit::WebString& mime_type,
+    const WebString& codecs) {
+  const std::string mime_type_ascii = ToASCIIOrEmpty(mime_type);
+  std::vector<std::string> parsed_codec_ids;
+  net::ParseCodecString(ToASCIIOrEmpty(codecs), &parsed_codec_ids, false);
+  if (mime_type_ascii.empty() || parsed_codec_ids.size() == 0)
+    return false;
+  return webkit_media::WebMediaSourceClientImpl::isTypeSupported(

[scherkus (not reviewing), 2013/03/14 18:49:40]

why not call media::StreamParserFactory::IsTypeSupported(type, codecs) directly
instead of going through WMSCImpl?

[acolwell GONE FROM CHROMIUM, 2013/03/14 20:08:49]

git cl upload said "no!" I think it is because code in "webkit/glue" is not
allowed to depend on stuff in "media/". It explicitly complained about this.

[scherkus (not reviewing), 2013/03/14 20:21:03]

well that's because media/ isn't in webkit/glue/DEPS but you're working around
it via webkit/media/DEPS

I don't think the indirection is doing us much -- I think poking a small hole in
webkit/glue/DEPS to depend on media/filters/stream_parser_factory.h should be
fine (darin: please shout if you disagree!)

[acolwell GONE FROM CHROMIUM, 2013/03/14 20:56:35]

Done.

+      mime_type_ascii, parsed_codec_ids);
+}
+
 WebMimeRegistry::SupportsType
     SimpleWebMimeRegistryImpl::supportsNonImageMIMEType(
     const WebString& mime_type) {
   return net::IsSupportedNonImageMimeType(ToASCIIOrEmpty(mime_type)) ?
       WebMimeRegistry::IsSupported : WebMimeRegistry::IsNotSupported;
 }
 
 WebString SimpleWebMimeRegistryImpl::mimeTypeForExtension(
     const WebString& file_extension) {
   std::string mime_type;
@@ skipping 20 matching lines @@
 
 WebString SimpleWebMimeRegistryImpl::preferredExtensionForMIMEType(
     const WebString& mime_type) {
   base::FilePath::StringType file_extension;
   net::GetPreferredExtensionForMimeType(ToASCIIOrEmpty(mime_type),
                                         &file_extension);
   return webkit_base::FilePathStringToWebString(file_extension);
 }
 
 }  // namespace webkit_glue