zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Android GlTextureFrameBuffer: Re-attach texture in setSize

Browse Source 
BUG=None

Review-Url: https://codereview.webrtc.org/2571503002
Cr-Commit-Position: refs/heads/master@{#16110}
This commit is contained in:
magjed
2017-01-17 02:51:06 -08:00
committed by Commit bot
parent 1fd08c1e67
commit 9b96a172ed
1 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
webrtc/sdk/android/api/org/webrtc/GlTextureFrameBuffer.java
View File

@ -40,24 +40,15 @@ public class GlTextureFrameBuffer {
throw new IllegalArgumentException("Invalid pixel format: " + pixelFormat); throw new IllegalArgumentException("Invalid pixel format: " + pixelFormat);
} }
// Create texture.
textureId = GlUtil.generateTexture(GLES20.GL_TEXTURE_2D); textureId = GlUtil.generateTexture(GLES20.GL_TEXTURE_2D);
this.width = 0; this.width = 0;
this.height = 0; this.height = 0;
// Create framebuffer object and bind it. // Create framebuffer object.
final int frameBuffers[] = new int[1]; final int frameBuffers[] = new int[1];
GLES20.glGenFramebuffers(1, frameBuffers, 0); GLES20.glGenFramebuffers(1, frameBuffers, 0);
frameBufferId = frameBuffers[0]; frameBufferId = frameBuffers[0];
GLES20.glBindFramebuffer(GLES20.GL_FRAMEBUFFER, frameBufferId);
GlUtil.checkNoGLES2Error("Generate framebuffer");
// Attach the texture to the framebuffer as color attachment.
GLES20.glFramebufferTexture2D(
GLES20.GL_FRAMEBUFFER, GLES20.GL_COLOR_ATTACHMENT0, GLES20.GL_TEXTURE_2D, textureId, 0);
GlUtil.checkNoGLES2Error("Attach texture to framebuffer");
// Restore normal framebuffer.
GLES20.glBindFramebuffer(GLES20.GL_FRAMEBUFFER, 0);
} }
/** /**
@ -82,6 +73,19 @@ public class GlTextureFrameBuffer {
GLES20.GL_UNSIGNED_BYTE, null); GLES20.GL_UNSIGNED_BYTE, null);
GLES20.glBindTexture(GLES20.GL_TEXTURE_2D, 0); GLES20.glBindTexture(GLES20.GL_TEXTURE_2D, 0);
GlUtil.checkNoGLES2Error("GlTextureFrameBuffer setSize"); GlUtil.checkNoGLES2Error("GlTextureFrameBuffer setSize");
// Attach the texture to the framebuffer as color attachment.
GLES20.glBindFramebuffer(GLES20.GL_FRAMEBUFFER, frameBufferId);
GLES20.glFramebufferTexture2D(
GLES20.GL_FRAMEBUFFER, GLES20.GL_COLOR_ATTACHMENT0, GLES20.GL_TEXTURE_2D, textureId, 0);
// Check that the framebuffer is in a good state.
final int status = GLES20.glCheckFramebufferStatus(GLES20.GL_FRAMEBUFFER);
if (status != GLES20.GL_FRAMEBUFFER_COMPLETE) {
throw new IllegalStateException("Framebuffer not complete, status: " + status);
}
GLES20.glBindFramebuffer(GLES20.GL_FRAMEBUFFER, 0);
} }
public int getWidth() { public int getWidth() {