Reland of Implement support for vp9 in ISO-BMFF

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 93 matching lines @@
   // 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;
 
   // Converts a codec ID into an Codec enum value and indicates
   // whether the conversion was ambiguous.
-  // Returns true if this method was able to map |codec_id| to a specific
-  // Codec enum value. |codec| and |is_ambiguous| are only valid if true
-  // is returned. Otherwise their value is undefined after the call.
+  // Returns true if this method was able to map |codec_id| with
+  // |mime_type_lower_case| to a specific Codec enum value. |codec| and
+  // |is_ambiguous| are only valid if true is returned. Otherwise their value is
+  // undefined after the call.
   // |is_ambiguous| is true if |codec_id| did not have enough information to
   // unambiguously determine the proper Codec enum value. If |is_ambiguous|
   // is true |codec| contains the best guess for the intended Codec enum value.
   // |is_encrypted| means the codec will be used with encrypted blocks.
-  bool StringToCodec(const std::string& codec_id,
+  bool StringToCodec(const std::string& mime_type_lower_case,
+                     const std::string& codec_id,
                      Codec* codec,
                      bool* is_ambiguous,
                      bool is_encrypted) const;
 
   // Returns true if |codec| is supported when contained in
   // |mime_type_lower_case|. Note: This method will always return false for
   // proprietary codecs if |allow_proprietary_codecs_| is set to false.
   // |is_encrypted| means the codec will be used with encrypted blocks.
   bool IsCodecSupported(Codec codec,
                         const std::string& mime_type_lower_case,
@@ skipping 30 matching lines @@
   // 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_