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

Merge "TextureView: don't call onSTAvailable due to setST" into jb-dev

Browse Source
This commit is contained in:
Jamie Gennis
2012-04-30 15:29:33 -07:00
committed by Android (Google) Code Review
parent 6113ce3be4 8a34d6800e
commit 459e459ef9
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/android/view/TextureView.java
View File

@@ -339,8 +339,7 @@ public class TextureView extends View {
mLayer = mAttachInfo.mHardwareRenderer.createHardwareLayer(mOpaque); mLayer = mAttachInfo.mHardwareRenderer.createHardwareLayer(mOpaque);
if (!mUpdateSurface) { if (!mUpdateSurface) {
// We already have a SurfaceTexture to use, and we will pass it // Create a new SurfaceTexture for the layer.
// to mLayer below.
mSurface = mAttachInfo.mHardwareRenderer.createSurfaceTexture(mLayer); mSurface = mAttachInfo.mHardwareRenderer.createSurfaceTexture(mLayer);
} }
nSetDefaultBufferSize(mSurface, getWidth(), getHeight()); nSetDefaultBufferSize(mSurface, getWidth(), getHeight());
@@ -359,7 +358,7 @@ public class TextureView extends View {
}; };
mSurface.setOnFrameAvailableListener(mUpdateListener); mSurface.setOnFrameAvailableListener(mUpdateListener);
if (mListener != null) { if (mListener != null && !mUpdateSurface) {
mListener.onSurfaceTextureAvailable(mSurface, getWidth(), getHeight()); mListener.onSurfaceTextureAvailable(mSurface, getWidth(), getHeight());
} }
} }
@@ -669,7 +668,9 @@ public class TextureView extends View {
* SurfaceTexture} is already being used by this view, it is immediately * SurfaceTexture} is already being used by this view, it is immediately
* released and not be usable any more. The {@link * released and not be usable any more. The {@link
* SurfaceTextureListener#onSurfaceTextureDestroyed} callback is <b>not</b> * SurfaceTextureListener#onSurfaceTextureDestroyed} callback is <b>not</b>
* called. * called for the previous {@link SurfaceTexture}. Similarly, the {@link
* SurfaceTextureListener#onSurfaceTextureAvailable} callback is <b>not</b>
* called for the {@link SurfaceTexture} passed to setSurfaceTexture.
* *
* The {@link SurfaceTexture} object must be detached from all OpenGL ES * The {@link SurfaceTexture} object must be detached from all OpenGL ES
* contexts prior to calling this method. * contexts prior to calling this method.