diff options
| author | jinsukkim@chromium.org <jinsukkim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-13 06:59:18 +0000 |
|---|---|---|
| committer | jinsukkim@chromium.org <jinsukkim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-13 06:59:18 +0000 |
| commit | a4bf6f1bffa2f125a7fd9ae87ea64675f04a0d1a (patch) | |
| tree | e61c83e680d2f65740f97aa0aafe7348866e1d02 /net | |
| parent | ac5fd66554e86bcf484b7047aae5e298be5ff0d2 (diff) | |
| download | chromium_src-a4bf6f1bffa2f125a7fd9ae87ea64675f04a0d1a.zip chromium_src-a4bf6f1bffa2f125a7fd9ae87ea64675f04a0d1a.tar.gz chromium_src-a4bf6f1bffa2f125a7fd9ae87ea64675f04a0d1a.tar.bz2 | |
Add mime types for HLS
HTTP Live streaming is supported by Android media player where
Clank can be installed (ICS and above) but mime type was not
being recognized properly. This CL rectifies it by adding the
types to the supported list.
BUG=332309
Tested: Android 4.04, 4.3, 4.4
Review URL: https://codereview.chromium.org/130853002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244467 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rw-r--r-- | net/base/mime_util.cc | 6 | ||||
| -rw-r--r-- | net/base/mime_util_unittest.cc | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/net/base/mime_util.cc b/net/base/mime_util.cc index 51a970b..2dee17d 100644 --- a/net/base/mime_util.cc +++ b/net/base/mime_util.cc @@ -281,6 +281,12 @@ static const char* const common_media_types[] = { // Wav. "audio/wav", "audio/x-wav", + +#if defined(OS_ANDROID) + // HLS. Supported by Android ICS and above. + "application/vnd.apple.mpegurl", + "application/x-mpegurl", +#endif }; // List of proprietary types only supported by Google Chrome. diff --git a/net/base/mime_util_unittest.cc b/net/base/mime_util_unittest.cc index bf6bed9..3bb4995 100644 --- a/net/base/mime_util_unittest.cc +++ b/net/base/mime_util_unittest.cc @@ -80,6 +80,8 @@ TEST(MimeUtilTest, LookupTypes) { #if defined(OS_ANDROID) EXPECT_TRUE(IsSupportedNonImageMimeType("application/x-x509-ca-cert")); EXPECT_TRUE(IsSupportedNonImageMimeType("application/x-pkcs12")); + EXPECT_TRUE(IsSupportedMediaMimeType("application/vnd.apple.mpegurl")); + EXPECT_TRUE(IsSupportedMediaMimeType("application/x-mpegurl")); #endif EXPECT_TRUE(IsSupportedMimeType("image/jpeg")); |