| Index: media/base/android/sdk_media_codec_bridge.cc
|
| diff --git a/media/base/android/sdk_media_codec_bridge.cc b/media/base/android/sdk_media_codec_bridge.cc
|
| index 82a467a0bcfa80bd439d82aeba469fc3e66cf7a4..df47b329e12b153250c137969e6efcf99cd63733 100644
|
| --- a/media/base/android/sdk_media_codec_bridge.cc
|
| +++ b/media/base/android/sdk_media_codec_bridge.cc
|
| @@ -334,6 +334,15 @@ MediaCodecStatus SdkMediaCodecBridge::GetOutputBufferAddress(
|
| return MEDIA_CODEC_OK;
|
| }
|
|
|
| +std::string SdkMediaCodecBridge::GetName() {
|
| + if (base::android::BuildInfo::GetInstance()->sdk_int() < 18)
|
| + return "";
|
| + JNIEnv* env = AttachCurrentThread();
|
| + ScopedJavaLocalRef<jstring> j_name =
|
| + Java_MediaCodecBridge_getName(env, j_media_codec_.obj());
|
| + return ConvertJavaStringToUTF8(env, j_name.obj());
|
| +}
|
| +
|
| // static
|
| bool SdkMediaCodecBridge::RegisterSdkMediaCodecBridge(JNIEnv* env) {
|
| return RegisterNativesImpl(env);
|
|
|