| 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 2a418ecec36866816e9860d82102aac749399484..1bac07d89bce0f564af4dba18d7a11315c3ef137 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_codec) {
|
| 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_codec);
|
| return ConvertJavaStringToUTF8(env, j_codec_name.obj());
|
| }
|
|
|
| @@ -145,7 +147,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())
|
|
|