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

Merge "media: fix race condition on async release" into rvc-dev am: 7e1b558949 am: fddc33a377

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11927284

Change-Id: I654fc16f23957f0c23585dceb15d9ee470ddb765
This commit is contained in:
Wonsik Kim
2020-06-20 01:01:29 +00:00
committed by Automerger Merge Worker
parent 14b026be14 fddc33a377
commit 66b09a3bf9
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
media/jni/android_media_MediaCodec.cpp
View File

@@ -235,7 +235,10 @@ void JMediaCodec::release() {
void JMediaCodec::releaseAsync() { void JMediaCodec::releaseAsync() {
std::call_once(mAsyncReleaseFlag, [this] { std::call_once(mAsyncReleaseFlag, [this] {
if (mCodec != NULL) { if (mCodec != NULL) {
mCodec->releaseAsync(new AMessage(kWhatAsyncReleaseComplete, this)); sp<AMessage> notify = new AMessage(kWhatAsyncReleaseComplete, this);
// Hold strong reference to this until async release is complete
notify->setObject("this", this);
mCodec->releaseAsync(notify);
} }
mInitStatus = NO_INIT; mInitStatus = NO_INIT;
}); });
@@ -1088,8 +1091,11 @@ void JMediaCodec::onMessageReceived(const sp<AMessage> &msg) {
} }
case kWhatAsyncReleaseComplete: case kWhatAsyncReleaseComplete:
{ {
mCodec.clear(); if (mLooper != NULL) {
mLooper->stop(); mLooper->unregisterHandler(id());
mLooper->stop();
mLooper.clear();
}
break; break;
} }
default: default:
@@ -1104,7 +1110,7 @@ void JMediaCodec::onMessageReceived(const sp<AMessage> &msg) {
using namespace android; using namespace android;
static sp<JMediaCodec> setMediaCodec( static sp<JMediaCodec> setMediaCodec(
JNIEnv *env, jobject thiz, const sp<JMediaCodec> &codec) { JNIEnv *env, jobject thiz, const sp<JMediaCodec> &codec, bool release = true) {
sp<JMediaCodec> old = (JMediaCodec *)env->CallLongMethod(thiz, gFields.lockAndGetContextID); sp<JMediaCodec> old = (JMediaCodec *)env->CallLongMethod(thiz, gFields.lockAndGetContextID);
if (codec != NULL) { if (codec != NULL) {
codec->incStrong(thiz); codec->incStrong(thiz);
@@ -1115,7 +1121,9 @@ static sp<JMediaCodec> setMediaCodec(
* its message handler, doing release() from there will deadlock * its message handler, doing release() from there will deadlock
* (as MediaCodec::release() post synchronous message to the same looper) * (as MediaCodec::release() post synchronous message to the same looper)
*/ */
old->release(); if (release) {
old->release();
}
old->decStrong(thiz); old->decStrong(thiz);
} }
env->CallVoidMethod(thiz, gFields.setAndUnlockContextID, (jlong)codec.get()); env->CallVoidMethod(thiz, gFields.setAndUnlockContextID, (jlong)codec.get());
@@ -1130,7 +1138,8 @@ static sp<JMediaCodec> getMediaCodec(JNIEnv *env, jobject thiz) {
} }
static void android_media_MediaCodec_release(JNIEnv *env, jobject thiz) { static void android_media_MediaCodec_release(JNIEnv *env, jobject thiz) {
sp<JMediaCodec> codec = getMediaCodec(env, thiz); // Clear Java native reference.
sp<JMediaCodec> codec = setMediaCodec(env, thiz, nullptr, false /* release */);
if (codec != NULL) { if (codec != NULL) {
codec->releaseAsync(); codec->releaseAsync();
} }