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

Merge "media: fix OutputFrame.getFormat()" into rvc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-04-17 22:07:04 +00:00
committed by Android (Google) Code Review
parent c7cd73aa00 bedf6bac62
commit 28ea0461c1
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
media/jni/android_media_MediaCodec.cpp
View File

@@ -735,14 +735,19 @@ status_t JMediaCodec::getOutputFrame(
} }
} }
jobject format; jobject formatMap;
err = getOutputFormat(env, index, &format); err = getOutputFormat(env, index, &formatMap);
if (err != OK) { if (err != OK) {
return err; return err;
} }
env->SetObjectField(frame, gFields.outputFrameFormatID, format); ScopedLocalRef<jclass> mediaFormatClass{env, env->FindClass("android/media/MediaFormat")};
env->DeleteLocalRef(format); ScopedLocalRef<jobject> format{env, env->NewObject(
format = nullptr; mediaFormatClass.get(),
env->GetMethodID(mediaFormatClass.get(), "<init>", "(Ljava/util/Map;)V"),
formatMap)};
env->SetObjectField(frame, gFields.outputFrameFormatID, format.get());
env->DeleteLocalRef(formatMap);
formatMap = nullptr;
sp<RefBase> obj; sp<RefBase> obj;
if (buffer->meta()->findObject("changedKeys", &obj) && obj) { if (buffer->meta()->findObject("changedKeys", &obj) && obj) {