summaryrefslogtreecommitdiffstats
path: root/net/base/mime_util.cc
diff options
context:
space:
mode:
authorfbarchard@chromium.org <fbarchard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-28 22:25:20 +0000
committerfbarchard@chromium.org <fbarchard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-28 22:25:20 +0000
commitc417b76be98fcfb19a743f7f044163cc7b5d7ef2 (patch)
tree78f21a3afb7c3cd438cdce34967c4325c2401964 /net/base/mime_util.cc
parentdf10bf173f91818f1f03d409ec8d60265b44675f (diff)
downloadchromium_src-c417b76be98fcfb19a743f7f044163cc7b5d7ef2.zip
chromium_src-c417b76be98fcfb19a743f7f044163cc7b5d7ef2.tar.gz
chromium_src-c417b76be98fcfb19a743f7f044163cc7b5d7ef2.tar.bz2
add audio/wav mimetype
BUG=23916 TEST=http://beta.html5test.com/ Review URL: http://codereview.chromium.org/3474015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60856 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base/mime_util.cc')
-rw-r--r--net/base/mime_util.cc8
1 files changed, 6 insertions, 2 deletions
diff --git a/net/base/mime_util.cc b/net/base/mime_util.cc
index 629270a..c0622a5 100644
--- a/net/base/mime_util.cc
+++ b/net/base/mime_util.cc
@@ -90,6 +90,7 @@ static const MimeInfo primary_mappings[] = {
{ "audio/ogg", "ogg,oga" },
{ "video/webm", "webm" },
{ "audio/webm", "webm" },
+ { "audio/wav", "wav" },
{ "application/xhtml+xml", "xhtml,xht" },
{ "application/x-chrome-extension", "crx" }
};
@@ -207,6 +208,7 @@ static const char* const supported_media_types[] = {
"application/ogg",
"video/webm",
"audio/webm",
+ "audio/wav",
#if defined(GOOGLE_CHROME_BUILD) || defined(USE_PROPRIETARY_CODECS)
// MPEG-4.
@@ -233,7 +235,8 @@ static const char* const supported_media_codecs[] = {
#endif
"theora",
"vorbis",
- "vp8"
+ "vp8",
+ "1" // PCM for WAV.
};
// Note: does not include javascript types list (see supported_javascript_types)
@@ -304,7 +307,8 @@ struct MediaFormatStrict {
static const MediaFormatStrict format_codec_mappings[] = {
{ "video/webm", "vorbis,vp8,vp8.0" },
- { "audio/webm", "vorbis" }
+ { "audio/webm", "vorbis" },
+ { "audio/wav", "1" }
};
void MimeUtil::InitializeMimeTypeMaps() {