Chromium Code Reviews| 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..5062fe9c31ac0206365e5cd51f50f38e8edf1378 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"; |
|
qinmin
2016/06/08 17:18:07
nit: && should go to the previous line
|
| } |
| return true; |
| } |