Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix media metadata retriever JNI due to a change to the private native Bitmap constructor signature"

Browse Source
This commit is contained in:
James Dong
2010-12-14 22:25:02 -08:00
committed by Android (Google) Code Review
parent 4f3867e3ce 88b7741228
commit 1bfdfc63b3
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
media/jni/android_media_MediaMetadataRetriever.cpp
View File

@@ -215,7 +215,7 @@ static jobject android_media_MediaMetadataRetriever_getFrameAtTime(JNIEnv *env,
// its pixels, it is important that the pixels (along with SkBitmap) be
// available after creating the Bitmap is returned to Java app.
jobject jSrcBitmap = env->NewObject(fields.bitmapClazz,
fields.bitmapConstructor, (int) bitmap, true, NULL, -1);
fields.bitmapConstructor, (int) bitmap, NULL, true, NULL, -1);
LOGV("Return a new bitmap constructed with the rotation matrix");
return env->CallStaticObjectMethod(
@@ -321,7 +321,7 @@ static void android_media_MediaMetadataRetriever_native_init(JNIEnv *env)
return;
}
fields.bitmapConstructor = env->GetMethodID(fields.bitmapClazz, "<init>", "(IZ[BI)V");
fields.bitmapConstructor = env->GetMethodID(fields.bitmapClazz, "<init>", "(I[BZ[BI)V");
if (fields.bitmapConstructor == NULL) {
jniThrowException(env, "java/lang/RuntimeException", "Can't find Bitmap constructor");
return;