| Index: media/base/android/media_codec_bridge.cc
|
| diff --git a/media/base/android/media_codec_bridge.cc b/media/base/android/media_codec_bridge.cc
|
| index bb5ddccfd7e5a239961ba4761ee8903da0a84e56..c3e2db8a4902fd00e1ac30eee1cc42bf625fd2f4 100644
|
| --- a/media/base/android/media_codec_bridge.cc
|
| +++ b/media/base/android/media_codec_bridge.cc
|
| @@ -72,14 +72,21 @@ bool MediaCodecBridge::IsAvailable() {
|
| return base::android::BuildInfo::GetInstance()->sdk_int() >= 16;
|
| }
|
|
|
| +// static
|
| +bool MediaCodecBridge::CanPlayType(const char* mime, bool secure) {
|
| + JNIEnv* env = AttachCurrentThread();
|
| + ScopedJavaLocalRef<jstring> j_mime = ConvertUTF8ToJavaString(env, mime);
|
| + return !Java_MediaCodecBridge_create(env, j_mime.obj(), secure).is_null();
|
| +}
|
| +
|
| +// TODO(xhwang): Support creating secure MediaCodecBridge.
|
| MediaCodecBridge::MediaCodecBridge(const char* mime) {
|
| JNIEnv* env = AttachCurrentThread();
|
| CHECK(env);
|
| DCHECK(mime);
|
|
|
| - ScopedJavaLocalRef<jstring> j_type = ConvertUTF8ToJavaString(env, mime);
|
| - j_media_codec_.Reset(Java_MediaCodecBridge_create(
|
| - env, j_type.obj()));
|
| + ScopedJavaLocalRef<jstring> j_mime = ConvertUTF8ToJavaString(env, mime);
|
| + j_media_codec_.Reset(Java_MediaCodecBridge_create(env, j_mime.obj(), false));
|
| }
|
|
|
| MediaCodecBridge::~MediaCodecBridge() {
|
|
|