| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef MEDIA_BASE_MIME_UTIL_H__ | 5 #ifndef MEDIA_BASE_MIME_UTIL_H__ |
| 6 #define MEDIA_BASE_MIME_UTIL_H__ | 6 #define MEDIA_BASE_MIME_UTIL_H__ |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 49 // support only a subset of codecs, but |codecs| was empty. Also returned if | 49 // support only a subset of codecs, but |codecs| was empty. Also returned if |
| 50 // all the codecs in |codecs| are supported, but additional codec parameters | 50 // all the codecs in |codecs| are supported, but additional codec parameters |
| 51 // were supplied (such as profile) for which the support cannot be decided. | 51 // were supplied (such as profile) for which the support cannot be decided. |
| 52 // * Returns IsNotSupported if either the |mime_type| is not supported or the | 52 // * Returns IsNotSupported if either the |mime_type| is not supported or the |
| 53 // |mime_type| is supported but at least one of the codecs within |codecs| is | 53 // |mime_type| is supported but at least one of the codecs within |codecs| is |
| 54 // not supported for the |mime_type|. | 54 // not supported for the |mime_type|. |
| 55 MEDIA_EXPORT SupportsType | 55 MEDIA_EXPORT SupportsType |
| 56 IsSupportedMediaFormat(const std::string& mime_type, | 56 IsSupportedMediaFormat(const std::string& mime_type, |
| 57 const std::vector<std::string>& codecs); | 57 const std::vector<std::string>& codecs); |
| 58 | 58 |
| 59 // Similar to the above, but for encrypted formats. |
| 60 MEDIA_EXPORT SupportsType |
| 61 IsSupportedEncryptedMediaFormat(const std::string& mime_type, |
| 62 const std::vector<std::string>& codecs); |
| 63 |
| 59 // Test only method that removes proprietary media types and codecs from the | 64 // Test only method that removes proprietary media types and codecs from the |
| 60 // list of supported MIME types and codecs. These types and codecs must be | 65 // list of supported MIME types and codecs. These types and codecs must be |
| 61 // removed to ensure consistent layout test results across all Chromium | 66 // removed to ensure consistent layout test results across all Chromium |
| 62 // variations. | 67 // variations. |
| 63 MEDIA_EXPORT void RemoveProprietaryMediaTypesAndCodecsForTests(); | 68 MEDIA_EXPORT void RemoveProprietaryMediaTypesAndCodecsForTests(); |
| 64 | 69 |
| 65 } // namespace media | 70 } // namespace media |
| 66 | 71 |
| 67 #endif // MEDIA_BASE_MIME_UTIL_H__ | 72 #endif // MEDIA_BASE_MIME_UTIL_H__ |
| 68 | 73 |
| OLD | NEW |