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

Merge "media: fix MediaCodec key-value converter am: c3c53cf3e7 am: bb263f7040" into rvc-d1-dev-plus-aosp am: a912822918

Browse Source 
Change-Id: I60645579a79be0984c3c9a5f06c16919996e3fa0
This commit is contained in:
Automerger Merge Worker
2020-04-16 18:30:01 +00:00
parent 38456aa211 a912822918
commit e6145ecd15
1 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
media/jni/android_media_MediaCodec.cpp
View File

@@ -132,6 +132,8 @@ static struct {
jmethodID asReadOnlyBufferId;
jmethodID positionId;
jmethodID limitId;
jmethodID getPositionId;
jmethodID getLimitId;
} gByteBufferInfo;
static struct {
@@ -2033,13 +2035,11 @@ static status_t ConvertKeyValueListsToAMessage(
if (env->IsInstanceOf(jvalue.get(), sFields.mStringClass)) {
const char *tmp = env->GetStringUTFChars((jstring)jvalue.get(), nullptr);
AString value;
if (tmp) {
value.setTo(tmp);
}
env->ReleaseStringUTFChars((jstring)jvalue.get(), tmp);
if (value.empty()) {
if (!tmp) {
return NO_MEMORY;
}
value.setTo(tmp);
env->ReleaseStringUTFChars((jstring)jvalue.get(), tmp);
result->setString(key.c_str(), value);
} else if (env->IsInstanceOf(jvalue.get(), sFields.mIntegerClass)) {
jint value = env->CallIntMethod(jvalue.get(), sFields.mIntegerValueId);
@@ -2051,8 +2051,8 @@ static status_t ConvertKeyValueListsToAMessage(
jfloat value = env->CallFloatMethod(jvalue.get(), sFields.mFloatValueId);
result->setFloat(key.c_str(), value);
} else if (env->IsInstanceOf(jvalue.get(), gByteBufferInfo.clazz)) {
jint position = env->CallIntMethod(jvalue.get(), gByteBufferInfo.positionId);
jint limit = env->CallIntMethod(jvalue.get(), gByteBufferInfo.limitId);
jint position = env->CallIntMethod(jvalue.get(), gByteBufferInfo.getPositionId);
jint limit = env->CallIntMethod(jvalue.get(), gByteBufferInfo.getLimitId);
sp<ABuffer> buffer{new ABuffer(limit - position)};
void *data = env->GetDirectBufferAddress(jvalue.get());
if (data != nullptr) {
@@ -2773,6 +2773,14 @@ static void android_media_MediaCodec_native_init(JNIEnv *env, jclass) {
clazz.get(), "limit", "(I)Ljava/nio/Buffer;");
CHECK(gByteBufferInfo.limitId != NULL);
gByteBufferInfo.getPositionId = env->GetMethodID(
clazz.get(), "position", "()I");
CHECK(gByteBufferInfo.getPositionId != NULL);
gByteBufferInfo.getLimitId = env->GetMethodID(
clazz.get(), "limit", "()I");
CHECK(gByteBufferInfo.getLimitId != NULL);
clazz.reset(env->FindClass("java/util/ArrayList"));
CHECK(clazz.get() != NULL);