Make sure canPlayType does not return probably/maybe for VP9 on Android.

BUG=285016
TEST=YouTube playback works for videos that are available in the VP9 format.

Review URL: https://chromiumcodereview.appspot.com/23463020

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@221964 0039d316-1c4b-4281-b951-d872f2087c98
parent b6040699
...@@ -304,10 +304,11 @@ static const char* const proprietary_media_types[] = { ...@@ -304,10 +304,11 @@ static const char* const proprietary_media_types[] = {
static const char* const common_media_codecs[] = { static const char* const common_media_codecs[] = {
#if !defined(OS_ANDROID) // Android doesn't support Ogg Theora. #if !defined(OS_ANDROID) // Android doesn't support Ogg Theora.
"theora", "theora",
"vp9", // TODO(tomfinegan): Move vp9 back down with vp8 once VP9 is supported
// on Android. https://crbug.com/285016
#endif #endif
"vorbis", "vorbis",
"vp8", "vp8",
"vp9",
"1" // WAVE_FORMAT_PCM. "1" // WAVE_FORMAT_PCM.
}; };
...@@ -413,7 +414,13 @@ struct MediaFormatStrict { ...@@ -413,7 +414,13 @@ struct MediaFormatStrict {
}; };
static const MediaFormatStrict format_codec_mappings[] = { 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" }, { "video/webm", "vorbis,vp8,vp8.0,vp9,vp9.0" },
#else
{ "video/webm", "vorbis,vp8,vp8.0" },
#endif
{ "audio/webm", "vorbis" }, { "audio/webm", "vorbis" },
{ "audio/wav", "1" } { "audio/wav", "1" }
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment