| 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 eb30f28966196c7a15c7cc14b4468491f6fe450f..399f0dba49a00013ba7577fdbb915adb0eb722e8 100644
|
| --- a/media/base/android/media_codec_bridge.cc
|
| +++ b/media/base/android/media_codec_bridge.cc
|
| @@ -24,6 +24,7 @@
|
| using base::android::AttachCurrentThread;
|
| using base::android::ConvertJavaStringToUTF8;
|
| using base::android::ConvertUTF8ToJavaString;
|
| +using base::android::JavaIntArrayToIntVector;
|
| using base::android::ScopedJavaLocalRef;
|
|
|
| namespace media {
|
| @@ -171,6 +172,24 @@ std::string MediaCodecBridge::GetDefaultCodecName(
|
| }
|
|
|
| // static
|
| +std::vector<int> MediaCodecBridge::GetEncoderColorFormats(
|
| + const std::string& mime_type) {
|
| + std::vector<int> color_formats;
|
| + if (!IsAvailable())
|
| + return color_formats;
|
| +
|
| + JNIEnv* env = AttachCurrentThread();
|
| + ScopedJavaLocalRef<jstring> j_mime = ConvertUTF8ToJavaString(env, mime_type);
|
| + ScopedJavaLocalRef<jintArray> j_color_format_array =
|
| + Java_MediaCodecBridge_getEncoderColorFormatsForMime(env, j_mime.obj());
|
| +
|
| + if (j_color_format_array.obj())
|
| + JavaIntArrayToIntVector(env, j_color_format_array.obj(), &color_formats);
|
| +
|
| + return color_formats;
|
| +}
|
| +
|
| +// static
|
| bool MediaCodecBridge::CanDecode(const std::string& codec, bool is_secure) {
|
| if (!IsAvailable())
|
| return false;
|
|
|