Index: net/base/mime_util.cc |
diff --git a/net/base/mime_util.cc b/net/base/mime_util.cc |
index ddb9b66ee835d69b16427092e3a8ad1ccff6045c..d0ab79c05e47f4cd00ab17d48ca45fa5da973d8f 100644 |
--- a/net/base/mime_util.cc |
+++ b/net/base/mime_util.cc |
@@ -304,10 +304,11 @@ static const char* const proprietary_media_types[] = { |
static const char* const common_media_codecs[] = { |
#if !defined(OS_ANDROID) // Android doesn't support Ogg Theora. |
"theora", |
+ "vp9", // TODO(tomfinegan): Move vp9 back down with vp8 once VP9 is supported |
+ // on Android. https://crbug.com/285016 |
#endif |
"vorbis", |
"vp8", |
- "vp9", |
"1" // WAVE_FORMAT_PCM. |
}; |
@@ -413,7 +414,13 @@ struct MediaFormatStrict { |
}; |
static const MediaFormatStrict format_codec_mappings[] = { |
+ // TODO(tomfinegan): Remove this if/else when VP9 is supported on Android. |
+ // https://crbug.com/285016 |
+#if !defined(OS_ANDROID) |
{ "video/webm", "vorbis,vp8,vp8.0,vp9,vp9.0" }, |
+#else |
+ { "video/webm", "vorbis,vp8,vp8.0" }, |
+#endif |
{ "audio/webm", "vorbis" }, |
{ "audio/wav", "1" } |
}; |