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 6fde55954469c594f0da1ef65935823b9d8b42de..04298b46d63264aae4bb06d47d9c1fe622c7462a 100644 |
| --- a/media/base/android/media_codec_util.cc |
| +++ b/media/base/android/media_codec_util.cc |
| @@ -66,12 +66,14 @@ static bool IsSupportedAndroidMimeType(const std::string& mime_type) { |
| } |
| static std::string GetDefaultCodecName(const std::string& mime_type, |
| - MediaCodecDirection direction) { |
| + MediaCodecDirection direction, |
| + bool require_software) { |
|
DaleCurtis
2016/06/22 21:20:11
require_software_codec here and elsewhere.
liberato (no reviews please)
2016/06/22 21:43:55
done, sorry.
|
| DCHECK(MediaCodecUtil::IsMediaCodecAvailable()); |
| JNIEnv* env = AttachCurrentThread(); |
| ScopedJavaLocalRef<jstring> j_mime = ConvertUTF8ToJavaString(env, mime_type); |
| ScopedJavaLocalRef<jstring> j_codec_name = |
| - Java_MediaCodecUtil_getDefaultCodecName(env, j_mime.obj(), direction); |
| + Java_MediaCodecUtil_getDefaultCodecName(env, j_mime.obj(), direction, |
| + require_software); |
| return ConvertJavaStringToUTF8(env, j_codec_name.obj()); |
| } |
| @@ -147,7 +149,8 @@ bool MediaCodecUtil::IsKnownUnaccelerated(const std::string& android_mime_type, |
| if (!IsMediaCodecAvailable()) |
| return true; |
| - std::string codec_name = GetDefaultCodecName(android_mime_type, direction); |
| + std::string codec_name = |
| + GetDefaultCodecName(android_mime_type, direction, false); |
| DVLOG(1) << __FUNCTION__ << "Default codec for " << android_mime_type << " : " |
| << codec_name << ", direction: " << direction; |
| if (!codec_name.size()) |