generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

WebRTCDemo: move the deletion of CritSect to end of the dtor to fix a crash in Android video renderer.

Browse Source 
BUG=3368
TEST=Manual Test

Review URL: https://webrtc-codereview.appspot.com/21519005

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6220 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
braveyao@webrtc.org 2014-05-22 02:57:55 +00:00
parent 8e755c1ad2
commit 21f7d6d2fe
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
webrtc/modules/video_render/android/video_render_android_native_opengl2.cc
View File

@ -245,7 +245,6 @@ AndroidNativeOpenGl2Channel::AndroidNativeOpenGl2Channel(
AndroidNativeOpenGl2Channel::~AndroidNativeOpenGl2Channel() { AndroidNativeOpenGl2Channel::~AndroidNativeOpenGl2Channel() {
WEBRTC_TRACE(kTraceInfo, kTraceVideoRenderer, _id, WEBRTC_TRACE(kTraceInfo, kTraceVideoRenderer, _id,
"AndroidNativeOpenGl2Channel dtor"); "AndroidNativeOpenGl2Channel dtor");
delete &_renderCritSect;
if (_jvm) { if (_jvm) {
// get the JNI env for this thread // get the JNI env for this thread
bool isAttached = false; bool isAttached = false;
@ -277,6 +276,8 @@ AndroidNativeOpenGl2Channel::~AndroidNativeOpenGl2Channel() {
} }
} }
} }
delete &_renderCritSect;
} }
int32_t AndroidNativeOpenGl2Channel::Init(int32_t zOrder, int32_t AndroidNativeOpenGl2Channel::Init(int32_t zOrder,