Media: Do not support new codecs with legacy MIME type names.

media/base/mime_util_internal.h

 // Copyright 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.
 
 #ifndef MEDIA_BASE_MIME_UTIL_INTERNAL_H_
 #define MEDIA_BASE_MIME_UTIL_INTERNAL_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 69 matching lines @@
   typedef base::hash_set<int> CodecSet;
   typedef std::map<std::string, CodecSet> MediaFormatMappings;
   struct CodecEntry {
     CodecEntry() : codec(INVALID_CODEC), is_ambiguous(true) {}
     CodecEntry(Codec c, bool ambiguous) : codec(c), is_ambiguous(ambiguous) {}
     Codec codec;
     bool is_ambiguous;
   };
   typedef std::map<std::string, CodecEntry> StringToCodecMappings;
 
-  // For faster lookup, keep hash sets.
+  // Initializes the supported media types into hash sets for faster lookup.
   void InitializeMimeTypeMaps();
 
+  // Initializes the supported media formats (|media_format_map_|).
+  void AddSupportedMediaFormats();
+
+  // Adds |mime_type| with the specified codecs to |media_format_map_|.
+  void AddContainerWithCodecs(const std::string& mime_type,
+                              const std::string& codecs_list,
+                              bool is_proprietary_mime_type);
+
   // Returns IsSupported if all codec IDs in |codecs| are unambiguous and are
   // supported in |mime_type_lower_case|. MayBeSupported is returned if at least
   // one codec ID in |codecs| is ambiguous but all the codecs are supported.
   // IsNotSupported is returned if |mime_type_lower_case| is not supported or at
   // least one is not supported in |mime_type_lower_case|. |is_encrypted| means
   // the codec will be used with encrypted blocks.
   SupportsType AreSupportedCodecs(const CodecSet& supported_codecs,
                                   const std::vector<std::string>& codecs,
                                   const std::string& mime_type_lower_case,
                                   bool is_encrypted) const;
@@ skipping 34 matching lines @@
                                         bool is_encrypted) const;
 
 #if defined(OS_ANDROID)
   // Indicates the support of various codecs within the platform.
   PlatformInfo platform_info_;
 #endif
 
   // A map of mime_types and hash map of the supported codecs for the mime_type.
   MediaFormatMappings media_format_map_;
 
-  // Keeps track of whether proprietary codec support should be
-  // advertised to callers.
+  // List of proprietary containers in |media_format_map_|.
+  std::vector<std::string> proprietary_media_containers_;
+  // Whether proprietary codec support should be advertised to callers.
   bool allow_proprietary_codecs_;
 
   // Lookup table for string compare based string -> Codec mappings.
   StringToCodecMappings string_to_codec_map_;
 
   DISALLOW_COPY_AND_ASSIGN(MimeUtil);
 };
 
 }  // namespace internal
 }  // namespace media
 
 #endif  // MEDIA_BASE_MIME_UTIL_INTERNAL_H_