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

Merge "Camera2 Legacy: catch more surface abandoned error"

Browse Source
This commit is contained in:
Treehugger Robot
2016-10-21 20:36:29 +00:00
committed by Gerrit Code Review
parent 4a5789b9b1 091661334b
commit 03f14bef41
1 changed files with 34 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
core/java/android/hardware/camera2/legacy/SurfaceTextureRenderer.java
View File

@@ -248,7 +248,8 @@ public class SurfaceTextureRenderer {
return program; return program;
} }
private void drawFrame(SurfaceTexture st, int width, int height, int flipType) { private void drawFrame(SurfaceTexture st, int width, int height, int flipType)
throws LegacyExceptionUtils.BufferQueueAbandonedException {
checkGlError("onDrawFrame start"); checkGlError("onDrawFrame start");
st.getTransformMatrix(mSTMatrix); st.getTransformMatrix(mSTMatrix);
@@ -343,7 +344,7 @@ public class SurfaceTextureRenderer {
/*offset*/ 0); /*offset*/ 0);
GLES20.glDrawArrays(GLES20.GL_TRIANGLE_STRIP, /*offset*/ 0, /*count*/ 4); GLES20.glDrawArrays(GLES20.GL_TRIANGLE_STRIP, /*offset*/ 0, /*count*/ 4);
checkGlError("glDrawArrays"); checkGlDrawError("glDrawArrays");
} }
/** /**
@@ -548,7 +549,29 @@ public class SurfaceTextureRenderer {
private void checkGlError(String msg) { private void checkGlError(String msg) {
int error; int error;
while ((error = GLES20.glGetError()) != GLES20.GL_NO_ERROR) { while ((error = GLES20.glGetError()) != GLES20.GL_NO_ERROR) {
throw new IllegalStateException(msg + ": GLES20 error: 0x" + Integer.toHexString(error)); throw new IllegalStateException(
msg + ": GLES20 error: 0x" + Integer.toHexString(error));
}
}
private void checkGlDrawError(String msg)
throws LegacyExceptionUtils.BufferQueueAbandonedException {
int error;
boolean surfaceAbandoned = false;
boolean glError = false;
while ((error = GLES20.glGetError()) != GLES20.GL_NO_ERROR) {
if (error == GLES20.GL_OUT_OF_MEMORY) {
surfaceAbandoned = true;
} else {
glError = true;
}
}
if (glError) {
throw new IllegalStateException(
msg + ": GLES20 error: 0x" + Integer.toHexString(error));
}
if (surfaceAbandoned) {
throw new LegacyExceptionUtils.BufferQueueAbandonedException();
} }
} }
@@ -759,9 +782,14 @@ public class SurfaceTextureRenderer {
if (LegacyCameraDevice.containsSurfaceId(holder.surface, targetSurfaceIds)) { if (LegacyCameraDevice.containsSurfaceId(holder.surface, targetSurfaceIds)) {
makeCurrent(holder.eglSurface); makeCurrent(holder.eglSurface);
// glReadPixels reads from the bottom of the buffer, so add an extra vertical flip // glReadPixels reads from the bottom of the buffer, so add an extra vertical flip
drawFrame(mSurfaceTexture, holder.width, holder.height, try {
(mFacing == CameraCharacteristics.LENS_FACING_FRONT) ? drawFrame(mSurfaceTexture, holder.width, holder.height,
FLIP_TYPE_BOTH : FLIP_TYPE_VERTICAL); (mFacing == CameraCharacteristics.LENS_FACING_FRONT) ?
FLIP_TYPE_BOTH : FLIP_TYPE_VERTICAL);
} catch (LegacyExceptionUtils.BufferQueueAbandonedException e) {
// Should never hit this.
throw new IllegalStateException("Surface abandoned, skipping drawFrame...", e);
}
mPBufferPixels.clear(); mPBufferPixels.clear();
GLES20.glReadPixels(/*x*/ 0, /*y*/ 0, holder.width, holder.height, GLES20.glReadPixels(/*x*/ 0, /*y*/ 0, holder.width, holder.height,
GLES20.GL_RGBA, GLES20.GL_UNSIGNED_BYTE, mPBufferPixels); GLES20.GL_RGBA, GLES20.GL_UNSIGNED_BYTE, mPBufferPixels);