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

Merge "media: lazy MediaCodec.release()" into rvc-dev am: 82e82762fd am: 82973fd578

Browse Source 
Change-Id: I433732a8e90b7ae8e4a22b1c4d3e2626cb1fe27a
This commit is contained in:
Automerger Merge Worker
2020-02-29 00:40:24 +00:00
parent fb57d02ca3 82973fd578
commit 3383c10079
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
media/jni/android_media_MediaCodec.cpp
View File

@@ -242,6 +242,13 @@ void JMediaCodec::release() {
}); });
} }
void JMediaCodec::releaseAsync() {
if (mCodec != NULL) {
mCodec->releaseAsync();
}
mInitStatus = NO_INIT;
}
JMediaCodec::~JMediaCodec() { JMediaCodec::~JMediaCodec() {
if (mLooper != NULL) { if (mLooper != NULL) {
/* MediaCodec and looper should have been released explicitly already /* MediaCodec and looper should have been released explicitly already
@@ -1124,7 +1131,10 @@ 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) {
setMediaCodec(env, thiz, NULL); sp<JMediaCodec> codec = getMediaCodec(env, thiz);
if (codec != NULL) {
codec->releaseAsync();
}
} }
static void throwCodecException(JNIEnv *env, status_t err, int32_t actionCode, const char *msg) { static void throwCodecException(JNIEnv *env, status_t err, int32_t actionCode, const char *msg) {
@@ -2797,7 +2807,7 @@ static void android_media_MediaCodec_native_setup(
static void android_media_MediaCodec_native_finalize( static void android_media_MediaCodec_native_finalize(
JNIEnv *env, jobject thiz) { JNIEnv *env, jobject thiz) {
android_media_MediaCodec_release(env, thiz); setMediaCodec(env, thiz, NULL);
} }
// MediaCodec.LinearBlock // MediaCodec.LinearBlock

1
media/jni/android_media_MediaCodec.h
View File

@@ -61,6 +61,7 @@ struct JMediaCodec : public AHandler {
void registerSelf(); void registerSelf();
void release(); void release();
void releaseAsync();
status_t enableOnFrameRenderedListener(jboolean enable); status_t enableOnFrameRenderedListener(jboolean enable);