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

Merge "media: keep JMediaCodec::mCodec reference until destruction" into qt-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-06-19 22:19:28 +00:00
committed by Android (Google) Code Review
parent bc73f723af eaed9f519e
commit 8a1174bc94
2 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
media/jni/android_media_MediaCodec.cpp
View File

@@ -211,9 +211,9 @@ void JMediaCodec::registerSelf() {
} }
void JMediaCodec::release() { void JMediaCodec::release() {
std::call_once(mReleaseFlag, [this] {
if (mCodec != NULL) { if (mCodec != NULL) {
mCodec->release(); mCodec->release();
mCodec.clear();
mInitStatus = NO_INIT; mInitStatus = NO_INIT;
} }
@@ -222,10 +222,11 @@ void JMediaCodec::release() {
mLooper->stop(); mLooper->stop();
mLooper.clear(); mLooper.clear();
} }
});
} }
JMediaCodec::~JMediaCodec() { JMediaCodec::~JMediaCodec() {
if (mCodec != NULL || mLooper != NULL) { if (mLooper != NULL) {
/* MediaCodec and looper should have been released explicitly already /* MediaCodec and looper should have been released explicitly already
* in setMediaCodec() (see comments in setMediaCodec()). * in setMediaCodec() (see comments in setMediaCodec()).
* *

3
media/jni/android_media_MediaCodec.h
View File

@@ -17,6 +17,8 @@
#ifndef _ANDROID_MEDIA_MEDIACODEC_H_ #ifndef _ANDROID_MEDIA_MEDIACODEC_H_
#define _ANDROID_MEDIA_MEDIACODEC_H_ #define _ANDROID_MEDIA_MEDIACODEC_H_
#include <mutex>
#include "jni.h" #include "jni.h"
#include <media/MediaAnalyticsItem.h> #include <media/MediaAnalyticsItem.h>
@@ -156,6 +158,7 @@ private:
sp<ALooper> mLooper; sp<ALooper> mLooper;
sp<MediaCodec> mCodec; sp<MediaCodec> mCodec;
AString mNameAtCreation; AString mNameAtCreation;
std::once_flag mReleaseFlag;
sp<AMessage> mCallbackNotification; sp<AMessage> mCallbackNotification;
sp<AMessage> mOnFrameRenderedNotification; sp<AMessage> mOnFrameRenderedNotification;