drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "If media player has died already, do not dec the old surface texture reference. Otherwise segfault will occur. For bug 5327664."

Browse Source
This commit is contained in:
Gloria Wang
2011-09-15 16:56:41 -07:00
committed by Android (Google) Code Review
parent b851f15ee2 e828beb386
commit 152f7b3985
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
media/jni/android_media_MediaPlayer.cpp
View File

@ -247,6 +247,11 @@ getVideoSurfaceTexture(JNIEnv* env, jobject thiz) {
static void static void
decVideoSurfaceRef(JNIEnv *env, jobject thiz) decVideoSurfaceRef(JNIEnv *env, jobject thiz)
{ {
sp<MediaPlayer> mp = getMediaPlayer(env, thiz);
if (mp == NULL) {
return;
}
sp<ISurfaceTexture> old_st = getVideoSurfaceTexture(env, thiz); sp<ISurfaceTexture> old_st = getVideoSurfaceTexture(env, thiz);
if (old_st != NULL) { if (old_st != NULL) {
old_st->decStrong(thiz); old_st->decStrong(thiz);