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

am c4de6f81: Merge "MediaPlayer: properly handle released surfaces" into ics-mr0

Browse Source 
* commit 'c4de6f81d4533acbfc162d051de480d474b72e76':
  MediaPlayer: properly handle released surfaces
This commit is contained in:
Jamie Gennis
2011-10-17 12:40:49 -07:00
committed by Android Git Automerger
parent 9757440700 c4de6f81d4
commit 29fe8cb941
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
media/jni/android_media_MediaPlayer.cpp
View File

@@ -274,8 +274,14 @@ setVideoSurface(JNIEnv *env, jobject thiz, jobject jsurface, jboolean mediaPlaye
sp<ISurfaceTexture> new_st; sp<ISurfaceTexture> new_st;
if (jsurface) { if (jsurface) {
sp<Surface> surface(Surface_getSurface(env, jsurface)); sp<Surface> surface(Surface_getSurface(env, jsurface));
new_st = surface->getSurfaceTexture(); if (surface != NULL) {
new_st->incStrong(thiz); new_st = surface->getSurfaceTexture();
new_st->incStrong(thiz);
} else {
jniThrowException(env, "java/lang/IllegalArgumentException",
"The surface has been released");
return;
}
} }
env->SetIntField(thiz, fields.surface_texture, (int)new_st.get()); env->SetIntField(thiz, fields.surface_texture, (int)new_st.get());