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

Merge "Create GL texture when it is missing for video layer" into ics-mr1

Browse Source
This commit is contained in:
Teng-Hui Zhu
2011-11-03 11:43:16 -07:00
committed by Android (Google) Code Review
parent e395f645aa 1f54673381
commit 76b067590b
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/webkit/HTML5VideoInline.java
View File

@@ -74,11 +74,13 @@ public class HTML5VideoInline extends HTML5VideoView{
public SurfaceTexture getSurfaceTexture(int videoLayerId) {
// Create the surface texture.
if (videoLayerId != mVideoLayerUsingSurfaceTexture
|| mSurfaceTexture == null) {
if (mTextureNames == null) {
mTextureNames = new int[1];
GLES20.glGenTextures(1, mTextureNames, 0);
|| mSurfaceTexture == null
|| mTextureNames == null) {
if (mTextureNames != null) {
GLES20.glDeleteTextures(1, mTextureNames, 0);
}
mTextureNames = new int[1];
GLES20.glGenTextures(1, mTextureNames, 0);
mSurfaceTexture = new SurfaceTexture(mTextureNames[0]);
}
mVideoLayerUsingSurfaceTexture = videoLayerId;