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

Merge "Revert "Workaround for slow AudioRecord destructor"" into klp-dev

Browse Source
This commit is contained in:
Glenn Kasten
2013-09-20 22:38:18 +00:00
committed by Android (Google) Code Review
parent 0447669142 f69cd6787d
commit 543de8746e
1 changed files with 0 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
core/jni/android_media_AudioRecord.cpp
View File

@@ -310,18 +310,6 @@ android_media_AudioRecord_stop(JNIEnv *env, jobject thiz)
// ----------------------------------------------------------------------------
// This class is used to destroy a RefBase asynchronously
class AsyncDestructThread : public Thread
{
public:
AsyncDestructThread(sp<RefBase> refBase) : mRefBase(refBase) { }
protected:
virtual ~AsyncDestructThread() { }
private:
virtual bool threadLoop() { return false; }
const sp<RefBase> mRefBase;
};
#define CALLBACK_COND_WAIT_TIMEOUT_MS 1000
static void android_media_AudioRecord_release(JNIEnv *env, jobject thiz) {
sp<AudioRecord> lpRecorder = setAudioRecord(env, thiz, 0);
@@ -354,17 +342,6 @@ static void android_media_AudioRecord_release(JNIEnv *env, jobject thiz) {
env->DeleteGlobalRef(lpCookie->audioRecord_ref);
delete lpCookie;
}
// FIXME AudioRecord destruction should not be slow
if (lpRecorder != 0) {
// must be a raw reference to avoid a race after run()
AsyncDestructThread *adt = new AsyncDestructThread(lpRecorder);
// guaranteed to not run destructor
lpRecorder.clear();
// after the run(), adt thread will hold a strong reference to lpRecorder,
// and the only strong reference to itself
adt->run("AsyncDestruct");
// do not delete adt here: adt thread destroys itself, and lpRecorder if needed
}
}