| 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 226a90a6cbf8c2a6262ca11096ed24b562d8e82f..e75ed83b235e5326a295ef37a1a22cf28a5d429a 100644
|
| --- a/media/base/android/sdk_media_codec_bridge.cc
|
| +++ b/media/base/android/sdk_media_codec_bridge.cc
|
| @@ -316,6 +316,16 @@ MediaCodecStatus SdkMediaCodecBridge::CopyFromOutputBuffer(int index,
|
| return status;
|
| }
|
|
|
| +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());
|
| +}
|
| +
|
| MediaCodecStatus SdkMediaCodecBridge::GetOutputBufferAddress(int index,
|
| size_t offset,
|
| void** addr,
|
|
|