| Index: media/base/android/media_codec_util.cc
|
| diff --git a/media/base/android/media_codec_util.cc b/media/base/android/media_codec_util.cc
|
| index c01aabe826be829edcca7d7a4cc1461b2bdccdc9..6fde55954469c594f0da1ef65935823b9d8b42de 100644
|
| --- a/media/base/android/media_codec_util.cc
|
| +++ b/media/base/android/media_codec_util.cc
|
| @@ -89,11 +89,13 @@ bool MediaCodecUtil::IsMediaCodecAvailable() {
|
| // MediaCodec is only available on JB and greater.
|
| if (base::android::BuildInfo::GetInstance()->sdk_int() < 16)
|
| return false;
|
| +
|
| // Blacklist some devices on Jellybean as for MediaCodec support is buggy.
|
| - // http://crbug.com/365494.
|
| - if (base::android::BuildInfo::GetInstance()->sdk_int() == 16) {
|
| + // http://crbug.com/365494, http://crbug.com/615872
|
| + if (base::android::BuildInfo::GetInstance()->sdk_int() <= 19) {
|
| std::string model(base::android::BuildInfo::GetInstance()->model());
|
| - return model != "GT-I9100" && model != "GT-I9300" && model != "GT-N7000";
|
| + return model != "GT-I9100" && model != "GT-I9300" && model != "GT-N7000" &&
|
| + model != "GT-N7100";
|
| }
|
| return true;
|
| }
|
|
|