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

am 8d5f3e31: Manage jclass objects (and most jobjects) in jni code using ScopedLocalRef

Browse Source 
* commit '8d5f3e31c914e29129f50fe9830d71adf52ab5cf':
  Manage jclass objects (and most jobjects) in jni code using ScopedLocalRef
This commit is contained in:
Andreas Huber
2013-08-12 09:58:53 -07:00
committed by Android Git Automerger
parent f8d747b3fd 8d5f3e31c9
commit cee3a2a59e
2 changed files with 101 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
media/jni/android_media_MediaCodec.cpp
View File

@@ -38,6 +38,8 @@
#include <media/stagefright/foundation/AString.h> #include <media/stagefright/foundation/AString.h>
#include <media/stagefright/MediaErrors.h> #include <media/stagefright/MediaErrors.h>
#include <nativehelper/ScopedLocalRef.h>
#include <system/window.h> #include <system/window.h>
namespace android { namespace android {
@@ -86,7 +88,7 @@ JMediaCodec::JMediaCodec(
mLooper->start( mLooper->start(
false, // runOnCallingThread false, // runOnCallingThread
false, // canCallJava false, // canCallJava
PRIORITY_DEFAULT); PRIORITY_FOREGROUND);
if (nameIsType) { if (nameIsType) {
mCodec = MediaCodec::CreateByType(mLooper, name, encoder); mCodec = MediaCodec::CreateByType(mLooper, name, encoder);
@@ -186,9 +188,10 @@ status_t JMediaCodec::dequeueOutputBuffer(
return err; return err;
} }
jclass clazz = env->FindClass("android/media/MediaCodec$BufferInfo"); ScopedLocalRef<jclass> clazz(
env, env->FindClass("android/media/MediaCodec$BufferInfo"));
jmethodID method = env->GetMethodID(clazz, "set", "(IIJI)V"); jmethodID method = env->GetMethodID(clazz.get(), "set", "(IIJI)V");
env->CallVoidMethod(bufferInfo, method, offset, size, timeUs, flags); env->CallVoidMethod(bufferInfo, method, offset, size, timeUs, flags);
return OK; return OK;
@@ -227,29 +230,33 @@ status_t JMediaCodec::getBuffers(
return err; return err;
} }
jclass byteBufferClass = env->FindClass("java/nio/ByteBuffer"); ScopedLocalRef<jclass> byteBufferClass(
CHECK(byteBufferClass != NULL); env, env->FindClass("java/nio/ByteBuffer"));
CHECK(byteBufferClass.get() != NULL);
jmethodID orderID = env->GetMethodID( jmethodID orderID = env->GetMethodID(
byteBufferClass, byteBufferClass.get(),
"order", "order",
"(Ljava/nio/ByteOrder;)Ljava/nio/ByteBuffer;"); "(Ljava/nio/ByteOrder;)Ljava/nio/ByteBuffer;");
CHECK(orderID != NULL); CHECK(orderID != NULL);
jclass byteOrderClass = env->FindClass("java/nio/ByteOrder"); ScopedLocalRef<jclass> byteOrderClass(
CHECK(byteOrderClass != NULL); env, env->FindClass("java/nio/ByteOrder"));
CHECK(byteOrderClass.get() != NULL);
jmethodID nativeOrderID = env->GetStaticMethodID( jmethodID nativeOrderID = env->GetStaticMethodID(
byteOrderClass, "nativeOrder", "()Ljava/nio/ByteOrder;"); byteOrderClass.get(), "nativeOrder", "()Ljava/nio/ByteOrder;");
CHECK(nativeOrderID != NULL); CHECK(nativeOrderID != NULL);
jobject nativeByteOrderObj = jobject nativeByteOrderObj =
env->CallStaticObjectMethod(byteOrderClass, nativeOrderID); env->CallStaticObjectMethod(byteOrderClass.get(), nativeOrderID);
CHECK(nativeByteOrderObj != NULL); CHECK(nativeByteOrderObj != NULL);
*bufArray = (jobjectArray)env->NewObjectArray( *bufArray = (jobjectArray)env->NewObjectArray(
buffers.size(), byteBufferClass, NULL); buffers.size(), byteBufferClass.get(), NULL);
if (*bufArray == NULL) { if (*bufArray == NULL) {
env->DeleteLocalRef(nativeByteOrderObj); env->DeleteLocalRef(nativeByteOrderObj);
return NO_MEMORY; return NO_MEMORY;
@@ -338,11 +345,12 @@ static void android_media_MediaCodec_release(JNIEnv *env, jobject thiz) {
} }
static void throwCryptoException(JNIEnv *env, status_t err, const char *msg) { static void throwCryptoException(JNIEnv *env, status_t err, const char *msg) {
jclass clazz = env->FindClass("android/media/MediaCodec$CryptoException"); ScopedLocalRef<jclass> clazz(
CHECK(clazz != NULL); env, env->FindClass("android/media/MediaCodec$CryptoException"));
CHECK(clazz.get() != NULL);
jmethodID constructID = jmethodID constructID =
env->GetMethodID(clazz, "<init>", "(ILjava/lang/String;)V"); env->GetMethodID(clazz.get(), "<init>", "(ILjava/lang/String;)V");
CHECK(constructID != NULL); CHECK(constructID != NULL);
jstring msgObj = env->NewStringUTF(msg != NULL ? msg : "Unknown Error"); jstring msgObj = env->NewStringUTF(msg != NULL ? msg : "Unknown Error");
@@ -363,7 +371,7 @@ static void throwCryptoException(JNIEnv *env, status_t err, const char *msg) {
} }
jthrowable exception = jthrowable exception =
(jthrowable)env->NewObject(clazz, constructID, err, msgObj); (jthrowable)env->NewObject(clazz.get(), constructID, err, msgObj);
env->Throw(exception); env->Throw(exception);
} }
@@ -848,51 +856,55 @@ static void android_media_MediaCodec_setVideoScalingMode(
} }
static void android_media_MediaCodec_native_init(JNIEnv *env) { static void android_media_MediaCodec_native_init(JNIEnv *env) {
jclass clazz = env->FindClass("android/media/MediaCodec"); ScopedLocalRef<jclass> clazz(
CHECK(clazz != NULL); env, env->FindClass("android/media/MediaCodec"));
CHECK(clazz.get() != NULL);
gFields.context = env->GetFieldID(clazz, "mNativeContext", "I"); gFields.context = env->GetFieldID(clazz.get(), "mNativeContext", "I");
CHECK(gFields.context != NULL); CHECK(gFields.context != NULL);
clazz = env->FindClass("android/media/MediaCodec$CryptoInfo"); clazz.reset(env->FindClass("android/media/MediaCodec$CryptoInfo"));
CHECK(clazz != NULL); CHECK(clazz.get() != NULL);
gFields.cryptoInfoNumSubSamplesID = gFields.cryptoInfoNumSubSamplesID =
env->GetFieldID(clazz, "numSubSamples", "I"); env->GetFieldID(clazz.get(), "numSubSamples", "I");
CHECK(gFields.cryptoInfoNumSubSamplesID != NULL); CHECK(gFields.cryptoInfoNumSubSamplesID != NULL);
gFields.cryptoInfoNumBytesOfClearDataID = gFields.cryptoInfoNumBytesOfClearDataID =
env->GetFieldID(clazz, "numBytesOfClearData", "[I"); env->GetFieldID(clazz.get(), "numBytesOfClearData", "[I");
CHECK(gFields.cryptoInfoNumBytesOfClearDataID != NULL); CHECK(gFields.cryptoInfoNumBytesOfClearDataID != NULL);
gFields.cryptoInfoNumBytesOfEncryptedDataID = gFields.cryptoInfoNumBytesOfEncryptedDataID =
env->GetFieldID(clazz, "numBytesOfEncryptedData", "[I"); env->GetFieldID(clazz.get(), "numBytesOfEncryptedData", "[I");
CHECK(gFields.cryptoInfoNumBytesOfEncryptedDataID != NULL); CHECK(gFields.cryptoInfoNumBytesOfEncryptedDataID != NULL);
gFields.cryptoInfoKeyID = env->GetFieldID(clazz, "key", "[B"); gFields.cryptoInfoKeyID = env->GetFieldID(clazz.get(), "key", "[B");
CHECK(gFields.cryptoInfoKeyID != NULL); CHECK(gFields.cryptoInfoKeyID != NULL);
gFields.cryptoInfoIVID = env->GetFieldID(clazz, "iv", "[B"); gFields.cryptoInfoIVID = env->GetFieldID(clazz.get(), "iv", "[B");
CHECK(gFields.cryptoInfoIVID != NULL); CHECK(gFields.cryptoInfoIVID != NULL);
gFields.cryptoInfoModeID = env->GetFieldID(clazz, "mode", "I"); gFields.cryptoInfoModeID = env->GetFieldID(clazz.get(), "mode", "I");
CHECK(gFields.cryptoInfoModeID != NULL); CHECK(gFields.cryptoInfoModeID != NULL);
clazz = env->FindClass("android/media/MediaCodec$CryptoException"); clazz.reset(env->FindClass("android/media/MediaCodec$CryptoException"));
CHECK(clazz != NULL); CHECK(clazz.get() != NULL);
jfieldID field; jfieldID field;
field = env->GetStaticFieldID(clazz, "ERROR_NO_KEY", "I"); field = env->GetStaticFieldID(clazz.get(), "ERROR_NO_KEY", "I");
CHECK(field != NULL); CHECK(field != NULL);
gCryptoErrorCodes.cryptoErrorNoKey = env->GetStaticIntField(clazz, field); gCryptoErrorCodes.cryptoErrorNoKey =
env->GetStaticIntField(clazz.get(), field);
field = env->GetStaticFieldID(clazz, "ERROR_KEY_EXPIRED", "I"); field = env->GetStaticFieldID(clazz.get(), "ERROR_KEY_EXPIRED", "I");
CHECK(field != NULL); CHECK(field != NULL);
gCryptoErrorCodes.cryptoErrorKeyExpired = env->GetStaticIntField(clazz, field); gCryptoErrorCodes.cryptoErrorKeyExpired =
env->GetStaticIntField(clazz.get(), field);
field = env->GetStaticFieldID(clazz, "ERROR_RESOURCE_BUSY", "I"); field = env->GetStaticFieldID(clazz.get(), "ERROR_RESOURCE_BUSY", "I");
CHECK(field != NULL); CHECK(field != NULL);
gCryptoErrorCodes.cryptoErrorResourceBusy = env->GetStaticIntField(clazz, field); gCryptoErrorCodes.cryptoErrorResourceBusy =
env->GetStaticIntField(clazz.get(), field);
} }
static void android_media_MediaCodec_native_setup( static void android_media_MediaCodec_native_setup(

97
media/jni/android_media_Utils.cpp
View File

@@ -24,6 +24,8 @@
#include <media/stagefright/foundation/ABuffer.h> #include <media/stagefright/foundation/ABuffer.h>
#include <media/stagefright/foundation/AMessage.h> #include <media/stagefright/foundation/AMessage.h>
#include <nativehelper/ScopedLocalRef.h>
namespace android { namespace android {
bool ConvertKeyValueArraysToKeyedVector( bool ConvertKeyValueArraysToKeyedVector(
@@ -76,33 +78,35 @@ bool ConvertKeyValueArraysToKeyedVector(
} }
static jobject makeIntegerObject(JNIEnv *env, int32_t value) { static jobject makeIntegerObject(JNIEnv *env, int32_t value) {
jclass clazz = env->FindClass("java/lang/Integer"); ScopedLocalRef<jclass> clazz(env, env->FindClass("java/lang/Integer"));
CHECK(clazz != NULL); CHECK(clazz.get() != NULL);
jmethodID integerConstructID = env->GetMethodID(clazz, "<init>", "(I)V"); jmethodID integerConstructID =
env->GetMethodID(clazz.get(), "<init>", "(I)V");
CHECK(integerConstructID != NULL); CHECK(integerConstructID != NULL);
return env->NewObject(clazz, integerConstructID, value); return env->NewObject(clazz.get(), integerConstructID, value);
} }
static jobject makeLongObject(JNIEnv *env, int64_t value) { static jobject makeLongObject(JNIEnv *env, int64_t value) {
jclass clazz = env->FindClass("java/lang/Long"); ScopedLocalRef<jclass> clazz(env, env->FindClass("java/lang/Long"));
CHECK(clazz != NULL); CHECK(clazz.get() != NULL);
jmethodID longConstructID = env->GetMethodID(clazz, "<init>", "(J)V"); jmethodID longConstructID = env->GetMethodID(clazz.get(), "<init>", "(J)V");
CHECK(longConstructID != NULL); CHECK(longConstructID != NULL);
return env->NewObject(clazz, longConstructID, value); return env->NewObject(clazz.get(), longConstructID, value);
} }
static jobject makeFloatObject(JNIEnv *env, float value) { static jobject makeFloatObject(JNIEnv *env, float value) {
jclass clazz = env->FindClass("java/lang/Float"); ScopedLocalRef<jclass> clazz(env, env->FindClass("java/lang/Float"));
CHECK(clazz != NULL); CHECK(clazz.get() != NULL);
jmethodID floatConstructID = env->GetMethodID(clazz, "<init>", "(F)V"); jmethodID floatConstructID =
env->GetMethodID(clazz.get(), "<init>", "(F)V");
CHECK(floatConstructID != NULL); CHECK(floatConstructID != NULL);
return env->NewObject(clazz, floatConstructID, value); return env->NewObject(clazz.get(), floatConstructID, value);
} }
static jobject makeByteBufferObject( static jobject makeByteBufferObject(
@@ -110,15 +114,16 @@ static jobject makeByteBufferObject(
jbyteArray byteArrayObj = env->NewByteArray(size); jbyteArray byteArrayObj = env->NewByteArray(size);
env->SetByteArrayRegion(byteArrayObj, 0, size, (const jbyte *)data); env->SetByteArrayRegion(byteArrayObj, 0, size, (const jbyte *)data);
jclass clazz = env->FindClass("java/nio/ByteBuffer"); ScopedLocalRef<jclass> clazz(env, env->FindClass("java/nio/ByteBuffer"));
CHECK(clazz != NULL); CHECK(clazz.get() != NULL);
jmethodID byteBufWrapID = jmethodID byteBufWrapID =
env->GetStaticMethodID(clazz, "wrap", "([B)Ljava/nio/ByteBuffer;"); env->GetStaticMethodID(
clazz.get(), "wrap", "([B)Ljava/nio/ByteBuffer;");
CHECK(byteBufWrapID != NULL); CHECK(byteBufWrapID != NULL);
jobject byteBufObj = env->CallStaticObjectMethod( jobject byteBufObj = env->CallStaticObjectMethod(
clazz, byteBufWrapID, byteArrayObj); clazz.get(), byteBufWrapID, byteArrayObj);
env->DeleteLocalRef(byteArrayObj); byteArrayObj = NULL; env->DeleteLocalRef(byteArrayObj); byteArrayObj = NULL;
@@ -140,14 +145,15 @@ static void SetMapInt32(
status_t ConvertMessageToMap( status_t ConvertMessageToMap(
JNIEnv *env, const sp<AMessage> &msg, jobject *map) { JNIEnv *env, const sp<AMessage> &msg, jobject *map) {
jclass hashMapClazz = env->FindClass("java/util/HashMap"); ScopedLocalRef<jclass> hashMapClazz(
env, env->FindClass("java/util/HashMap"));
if (hashMapClazz == NULL) { if (hashMapClazz.get() == NULL) {
return -EINVAL; return -EINVAL;
} }
jmethodID hashMapConstructID = jmethodID hashMapConstructID =
env->GetMethodID(hashMapClazz, "<init>", "()V"); env->GetMethodID(hashMapClazz.get(), "<init>", "()V");
if (hashMapConstructID == NULL) { if (hashMapConstructID == NULL) {
return -EINVAL; return -EINVAL;
@@ -155,7 +161,7 @@ status_t ConvertMessageToMap(
jmethodID hashMapPutID = jmethodID hashMapPutID =
env->GetMethodID( env->GetMethodID(
hashMapClazz, hashMapClazz.get(),
"put", "put",
"(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;"); "(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;");
@@ -163,7 +169,7 @@ status_t ConvertMessageToMap(
return -EINVAL; return -EINVAL;
} }
jobject hashMap = env->NewObject(hashMapClazz, hashMapConstructID); jobject hashMap = env->NewObject(hashMapClazz.get(), hashMapConstructID);
for (size_t i = 0; i < msg->countEntries(); ++i) { for (size_t i = 0; i < msg->countEntries(); ++i) {
AMessage::Type valueType; AMessage::Type valueType;
@@ -276,17 +282,16 @@ status_t ConvertMessageToMap(
status_t ConvertKeyValueArraysToMessage( status_t ConvertKeyValueArraysToMessage(
JNIEnv *env, jobjectArray keys, jobjectArray values, JNIEnv *env, jobjectArray keys, jobjectArray values,
sp<AMessage> *out) { sp<AMessage> *out) {
jclass stringClass = env->FindClass("java/lang/String"); ScopedLocalRef<jclass> stringClass(env, env->FindClass("java/lang/String"));
CHECK(stringClass != NULL); CHECK(stringClass.get() != NULL);
ScopedLocalRef<jclass> integerClass(env, env->FindClass("java/lang/Integer"));
jclass integerClass = env->FindClass("java/lang/Integer"); CHECK(integerClass.get() != NULL);
CHECK(integerClass != NULL); ScopedLocalRef<jclass> longClass(env, env->FindClass("java/lang/Long"));
CHECK(longClass.get() != NULL);
jclass floatClass = env->FindClass("java/lang/Float"); ScopedLocalRef<jclass> floatClass(env, env->FindClass("java/lang/Float"));
CHECK(floatClass != NULL); CHECK(floatClass.get() != NULL);
ScopedLocalRef<jclass> byteBufClass(env, env->FindClass("java/nio/ByteBuffer"));
jclass byteBufClass = env->FindClass("java/nio/ByteBuffer"); CHECK(byteBufClass.get() != NULL);
CHECK(byteBufClass != NULL);
sp<AMessage> msg = new AMessage; sp<AMessage> msg = new AMessage;
@@ -309,7 +314,7 @@ status_t ConvertKeyValueArraysToMessage(
for (jsize i = 0; i < numEntries; ++i) { for (jsize i = 0; i < numEntries; ++i) {
jobject keyObj = env->GetObjectArrayElement(keys, i); jobject keyObj = env->GetObjectArrayElement(keys, i);
if (!env->IsInstanceOf(keyObj, stringClass)) { if (!env->IsInstanceOf(keyObj, stringClass.get())) {
return -EINVAL; return -EINVAL;
} }
@@ -326,7 +331,7 @@ status_t ConvertKeyValueArraysToMessage(
jobject valueObj = env->GetObjectArrayElement(values, i); jobject valueObj = env->GetObjectArrayElement(values, i);
if (env->IsInstanceOf(valueObj, stringClass)) { if (env->IsInstanceOf(valueObj, stringClass.get())) {
const char *value = env->GetStringUTFChars((jstring)valueObj, NULL); const char *value = env->GetStringUTFChars((jstring)valueObj, NULL);
if (value == NULL) { if (value == NULL) {
@@ -337,29 +342,37 @@ status_t ConvertKeyValueArraysToMessage(
env->ReleaseStringUTFChars((jstring)valueObj, value); env->ReleaseStringUTFChars((jstring)valueObj, value);
value = NULL; value = NULL;
} else if (env->IsInstanceOf(valueObj, integerClass)) { } else if (env->IsInstanceOf(valueObj, integerClass.get())) {
jmethodID intValueID = jmethodID intValueID =
env->GetMethodID(integerClass, "intValue", "()I"); env->GetMethodID(integerClass.get(), "intValue", "()I");
CHECK(intValueID != NULL); CHECK(intValueID != NULL);
jint value = env->CallIntMethod(valueObj, intValueID); jint value = env->CallIntMethod(valueObj, intValueID);
msg->setInt32(key.c_str(), value); msg->setInt32(key.c_str(), value);
} else if (env->IsInstanceOf(valueObj, floatClass)) { } else if (env->IsInstanceOf(valueObj, longClass.get())) {
jmethodID longValueID =
env->GetMethodID(longClass.get(), "longValue", "()J");
CHECK(longValueID != NULL);
jlong value = env->CallLongMethod(valueObj, longValueID);
msg->setInt64(key.c_str(), value);
} else if (env->IsInstanceOf(valueObj, floatClass.get())) {
jmethodID floatValueID = jmethodID floatValueID =
env->GetMethodID(floatClass, "floatValue", "()F"); env->GetMethodID(floatClass.get(), "floatValue", "()F");
CHECK(floatValueID != NULL); CHECK(floatValueID != NULL);
jfloat value = env->CallFloatMethod(valueObj, floatValueID); jfloat value = env->CallFloatMethod(valueObj, floatValueID);
msg->setFloat(key.c_str(), value); msg->setFloat(key.c_str(), value);
} else if (env->IsInstanceOf(valueObj, byteBufClass)) { } else if (env->IsInstanceOf(valueObj, byteBufClass.get())) {
jmethodID positionID = jmethodID positionID =
env->GetMethodID(byteBufClass, "position", "()I"); env->GetMethodID(byteBufClass.get(), "position", "()I");
CHECK(positionID != NULL); CHECK(positionID != NULL);
jmethodID limitID = jmethodID limitID =
env->GetMethodID(byteBufClass, "limit", "()I"); env->GetMethodID(byteBufClass.get(), "limit", "()I");
CHECK(limitID != NULL); CHECK(limitID != NULL);
jint position = env->CallIntMethod(valueObj, positionID); jint position = env->CallIntMethod(valueObj, positionID);
@@ -375,7 +388,7 @@ status_t ConvertKeyValueArraysToMessage(
buffer->size()); buffer->size());
} else { } else {
jmethodID arrayID = jmethodID arrayID =
env->GetMethodID(byteBufClass, "array", "()[B"); env->GetMethodID(byteBufClass.get(), "array", "()[B");
CHECK(arrayID != NULL); CHECK(arrayID != NULL);
jbyteArray byteArray = jbyteArray byteArray =