Skip to content

SDK / exoplayer

Go to a project
Commit 3eda590c by claincly Committed by bachinger
Options

Rollback of https://github.com/google/ExoPlayer/commit/9788750ddb23b2064dddf99d6e1ea491b2e45cea 

*** Original commit ***

Simplify GL program handling.

***

PiperOrigin-RevId: 400970170
parent 80d36516
Expand all
Inline Side-by-side
Showing with 43 additions and 65 deletions
demos/gl/src/main/java/com/google/android/exoplayer2/gldemo/BitmapOverlayVideoProcessor.java
...@@ -15,8 +15,6 @@ ...@@ -15,8 +15,6 @@
*/ */
package com.google.android.exoplayer2.gldemo; package com.google.android.exoplayer2.gldemo;
import static com.google.android.exoplayer2.util.Assertions.checkNotNull;
import android.content.Context; import android.content.Context;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.graphics.Bitmap; import android.graphics.Bitmap;
...@@ -28,6 +26,7 @@ import android.opengl.GLES20; ...@@ -28,6 +26,7 @@ import android.opengl.GLES20;
import android.opengl.GLUtils; import android.opengl.GLUtils;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.util.Assertions;
import com.google.android.exoplayer2.util.GlUtil; import com.google.android.exoplayer2.util.GlUtil;
import java.io.IOException; import java.io.IOException;
import java.util.Locale; import java.util.Locale;
...@@ -50,7 +49,7 @@ import javax.microedition.khronos.opengles.GL10; ...@@ -50,7 +49,7 @@ import javax.microedition.khronos.opengles.GL10;
private final Bitmap logoBitmap; private final Bitmap logoBitmap;
private final Canvas overlayCanvas; private final Canvas overlayCanvas;
@Nullable private GlUtil.Program program; private int program;
@Nullable private GlUtil.Attribute[] attributes; @Nullable private GlUtil.Attribute[] attributes;
@Nullable private GlUtil.Uniform[] uniforms; @Nullable private GlUtil.Uniform[] uniforms;
...@@ -78,40 +77,27 @@ import javax.microedition.khronos.opengles.GL10; ...@@ -78,40 +77,27 @@ import javax.microedition.khronos.opengles.GL10;
@Override @Override
public void initialize() { public void initialize() {
String vertexShaderCode;
String fragmentShaderCode;
try { try {
program = vertexShaderCode = GlUtil.loadAsset(context, "bitmap_overlay_video_processor_vertex.glsl");
new GlUtil.Program( fragmentShaderCode =
context, GlUtil.loadAsset(context, "bitmap_overlay_video_processor_fragment.glsl");
/* vertexShaderFilePath= */ "bitmap_overlay_video_processor_vertex.glsl",
/* fragmentShaderFilePath= */ "bitmap_overlay_video_processor_fragment.glsl");
} catch (IOException e) { } catch (IOException e) {
throw new IllegalStateException(e); throw new IllegalStateException(e);
} }
program.use(); program = GlUtil.compileProgram(vertexShaderCode, fragmentShaderCode);
GlUtil.Attribute[] attributes = program.getAttributes(); GlUtil.Attribute[] attributes = GlUtil.getAttributes(program);
GlUtil.Uniform[] uniforms = GlUtil.getUniforms(program);
for (GlUtil.Attribute attribute : attributes) { for (GlUtil.Attribute attribute : attributes) {
if (attribute.name.equals("a_position")) { if (attribute.name.equals("a_position")) {
attribute.setBuffer( attribute.setBuffer(new float[] {-1, -1, 0, 1, 1, -1, 0, 1, -1, 1, 0, 1, 1, 1, 0, 1}, 4);
new float[] {
-1, -1, 0, 1,
1, -1, 0, 1,
-1, 1, 0, 1,
1, 1, 0, 1
},
4);
} else if (attribute.name.equals("a_texcoord")) { } else if (attribute.name.equals("a_texcoord")) {
attribute.setBuffer( attribute.setBuffer(new float[] {0, 0, 0, 1, 1, 0, 0, 1, 0, 1, 0, 1, 1, 1, 0, 1}, 4);
new float[] {
0, 0, 0, 1,
1, 0, 0, 1,
0, 1, 0, 1,
1, 1, 0, 1
},
4);
} }
} }
this.attributes = attributes; this.attributes = attributes;
this.uniforms = checkNotNull(program).getUniforms(); this.uniforms = uniforms;
GLES20.glGenTextures(1, textures, 0); GLES20.glGenTextures(1, textures, 0);
GLES20.glBindTexture(GL10.GL_TEXTURE_2D, textures[0]); GLES20.glBindTexture(GL10.GL_TEXTURE_2D, textures[0]);
GLES20.glTexParameterf(GL10.GL_TEXTURE_2D, GL10.GL_TEXTURE_MIN_FILTER, GL10.GL_NEAREST); GLES20.glTexParameterf(GL10.GL_TEXTURE_2D, GL10.GL_TEXTURE_MIN_FILTER, GL10.GL_NEAREST);
...@@ -140,8 +126,9 @@ import javax.microedition.khronos.opengles.GL10; ...@@ -140,8 +126,9 @@ import javax.microedition.khronos.opengles.GL10;
GlUtil.checkGlError(); GlUtil.checkGlError();
// Run the shader program. // Run the shader program.
GlUtil.Uniform[] uniforms = checkNotNull(this.uniforms); GlUtil.Uniform[] uniforms = Assertions.checkNotNull(this.uniforms);
GlUtil.Attribute[] attributes = checkNotNull(this.attributes); GlUtil.Attribute[] attributes = Assertions.checkNotNull(this.attributes);
GLES20.glUseProgram(program);
for (GlUtil.Uniform uniform : uniforms) { for (GlUtil.Uniform uniform : uniforms) {
switch (uniform.name) { switch (uniform.name) {
case "tex_sampler_0": case "tex_sampler_0":
......
library/core/src/main/java/com/google/android/exoplayer2/video/VideoDecoderGLSurfaceView.java
...@@ -15,8 +15,6 @@ ...@@ -15,8 +15,6 @@
*/ */
package com.google.android.exoplayer2.video; package com.google.android.exoplayer2.video;
import static com.google.android.exoplayer2.util.Assertions.checkNotNull;
import android.content.Context; import android.content.Context;
import android.opengl.GLES20; import android.opengl.GLES20;
import android.opengl.GLSurfaceView; import android.opengl.GLSurfaceView;
...@@ -142,7 +140,7 @@ public final class VideoDecoderGLSurfaceView extends GLSurfaceView ...@@ -142,7 +140,7 @@ public final class VideoDecoderGLSurfaceView extends GLSurfaceView
// glDrawArrays uses it. // glDrawArrays uses it.
private final FloatBuffer[] textureCoords; private final FloatBuffer[] textureCoords;
@Nullable private GlUtil.Program program; private int program;
private int colorMatrixLocation; private int colorMatrixLocation;
// Accessed only from the GL thread. // Accessed only from the GL thread.
...@@ -163,9 +161,9 @@ public final class VideoDecoderGLSurfaceView extends GLSurfaceView ...@@ -163,9 +161,9 @@ public final class VideoDecoderGLSurfaceView extends GLSurfaceView
@Override @Override
public void onSurfaceCreated(GL10 unused, EGLConfig config) { public void onSurfaceCreated(GL10 unused, EGLConfig config) {
program = new GlUtil.Program(VERTEX_SHADER, FRAGMENT_SHADER); program = GlUtil.compileProgram(VERTEX_SHADER, FRAGMENT_SHADER);
program.use(); GLES20.glUseProgram(program);
int posLocation = program.glGetAttribLocation("in_pos"); int posLocation = GLES20.glGetAttribLocation(program, "in_pos");
GLES20.glEnableVertexAttribArray(posLocation); GLES20.glEnableVertexAttribArray(posLocation);
GLES20.glVertexAttribPointer( GLES20.glVertexAttribPointer(
posLocation, posLocation,
...@@ -174,14 +172,14 @@ public final class VideoDecoderGLSurfaceView extends GLSurfaceView ...@@ -174,14 +172,14 @@ public final class VideoDecoderGLSurfaceView extends GLSurfaceView
/* normalized= */ false, /* normalized= */ false,
/* stride= */ 0, /* stride= */ 0,
TEXTURE_VERTICES); TEXTURE_VERTICES);
texLocations[0] = checkNotNull(program).glGetAttribLocation("in_tc_y"); texLocations[0] = GLES20.glGetAttribLocation(program, "in_tc_y");
GLES20.glEnableVertexAttribArray(texLocations[0]); GLES20.glEnableVertexAttribArray(texLocations[0]);
texLocations[1] = checkNotNull(program).glGetAttribLocation("in_tc_u"); texLocations[1] = GLES20.glGetAttribLocation(program, "in_tc_u");
GLES20.glEnableVertexAttribArray(texLocations[1]); GLES20.glEnableVertexAttribArray(texLocations[1]);
texLocations[2] = checkNotNull(program).glGetAttribLocation("in_tc_v"); texLocations[2] = GLES20.glGetAttribLocation(program, "in_tc_v");
GLES20.glEnableVertexAttribArray(texLocations[2]); GLES20.glEnableVertexAttribArray(texLocations[2]);
GlUtil.checkGlError(); GlUtil.checkGlError();
colorMatrixLocation = checkNotNull(program).glGetUniformLocation("mColorConversion"); colorMatrixLocation = GLES20.glGetUniformLocation(program, "mColorConversion");
GlUtil.checkGlError(); GlUtil.checkGlError();
setupTextures(); setupTextures();
GlUtil.checkGlError(); GlUtil.checkGlError();
...@@ -298,7 +296,7 @@ public final class VideoDecoderGLSurfaceView extends GLSurfaceView ...@@ -298,7 +296,7 @@ public final class VideoDecoderGLSurfaceView extends GLSurfaceView
private void setupTextures() { private void setupTextures() {
GLES20.glGenTextures(3, yuvTextures, /* offset= */ 0); GLES20.glGenTextures(3, yuvTextures, /* offset= */ 0);
for (int i = 0; i < 3; i++) { for (int i = 0; i < 3; i++) {
GLES20.glUniform1i(checkNotNull(program).glGetUniformLocation(TEXTURE_UNIFORMS[i]), i); GLES20.glUniform1i(GLES20.glGetUniformLocation(program, TEXTURE_UNIFORMS[i]), i);
GLES20.glActiveTexture(GLES20.GL_TEXTURE0 + i); GLES20.glActiveTexture(GLES20.GL_TEXTURE0 + i);
GLES20.glBindTexture(GLES20.GL_TEXTURE_2D, yuvTextures[i]); GLES20.glBindTexture(GLES20.GL_TEXTURE_2D, yuvTextures[i]);
GLES20.glTexParameterf( GLES20.glTexParameterf(
......
library/core/src/main/java/com/google/android/exoplayer2/video/spherical/ProjectionRenderer.java
...@@ -15,7 +15,6 @@ ...@@ -15,7 +15,6 @@
*/ */
package com.google.android.exoplayer2.video.spherical; package com.google.android.exoplayer2.video.spherical;
import static com.google.android.exoplayer2.util.Assertions.checkNotNull;
import static com.google.android.exoplayer2.util.GlUtil.checkGlError; import static com.google.android.exoplayer2.util.GlUtil.checkGlError;
import android.opengl.GLES11Ext; import android.opengl.GLES11Ext;
...@@ -91,12 +90,11 @@ import java.nio.FloatBuffer; ...@@ -91,12 +90,11 @@ import java.nio.FloatBuffer;
}; };
private int stereoMode; private int stereoMode;
@Nullable private GlUtil.Program program;
@Nullable private MeshData leftMeshData; @Nullable private MeshData leftMeshData;
@Nullable private MeshData rightMeshData; @Nullable private MeshData rightMeshData;
// Program related GL items. These are only valid if program != 0. // Program related GL items. These are only valid if program != 0.
private int program;
private int mvpMatrixHandle; private int mvpMatrixHandle;
private int uTexMatrixHandle; private int uTexMatrixHandle;
private int positionHandle; private int positionHandle;
...@@ -121,12 +119,12 @@ import java.nio.FloatBuffer; ...@@ -121,12 +119,12 @@ import java.nio.FloatBuffer;
/** Initializes of the GL components. */ /** Initializes of the GL components. */
/* package */ void init() { /* package */ void init() {
program = new GlUtil.Program(VERTEX_SHADER_CODE, FRAGMENT_SHADER_CODE); program = GlUtil.compileProgram(VERTEX_SHADER_CODE, FRAGMENT_SHADER_CODE);
mvpMatrixHandle = program.glGetUniformLocation("uMvpMatrix"); mvpMatrixHandle = GLES20.glGetUniformLocation(program, "uMvpMatrix");
uTexMatrixHandle = program.glGetUniformLocation("uTexMatrix"); uTexMatrixHandle = GLES20.glGetUniformLocation(program, "uTexMatrix");
positionHandle = program.glGetAttribLocation("aPosition"); positionHandle = GLES20.glGetAttribLocation(program, "aPosition");
texCoordsHandle = program.glGetAttribLocation("aTexCoords"); texCoordsHandle = GLES20.glGetAttribLocation(program, "aTexCoords");
textureHandle = program.glGetUniformLocation("uTexture"); textureHandle = GLES20.glGetUniformLocation(program, "uTexture");
} }
/** /**
...@@ -145,7 +143,7 @@ import java.nio.FloatBuffer; ...@@ -145,7 +143,7 @@ import java.nio.FloatBuffer;
} }
// Configure shader. // Configure shader.
checkNotNull(program).use(); GLES20.glUseProgram(program);
checkGlError(); checkGlError();
GLES20.glEnableVertexAttribArray(positionHandle); GLES20.glEnableVertexAttribArray(positionHandle);
...@@ -198,9 +196,8 @@ import java.nio.FloatBuffer; ...@@ -198,9 +196,8 @@ import java.nio.FloatBuffer;
/** Cleans up the GL resources. */ /** Cleans up the GL resources. */
/* package */ void shutdown() { /* package */ void shutdown() {
if (program != null) { if (program != 0) {
program.delete(); GLES20.glDeleteProgram(program);
program = null;
} }
} }
......
library/transformer/src/main/java/com/google/android/exoplayer2/transformer/TransformerTranscodingVideoRenderer.java
...@@ -186,7 +186,6 @@ import java.nio.ByteBuffer; ...@@ -186,7 +186,6 @@ import java.nio.ByteBuffer;
} }
eglSurface = eglSurface =
GlUtil.getEglSurface(eglDisplay, checkNotNull(checkNotNull(encoder).getInputSurface())); GlUtil.getEglSurface(eglDisplay, checkNotNull(checkNotNull(encoder).getInputSurface()));
GlUtil.focusSurface( GlUtil.focusSurface(
eglDisplay, eglDisplay,
eglContext, eglContext,
...@@ -194,20 +193,17 @@ import java.nio.ByteBuffer; ...@@ -194,20 +193,17 @@ import java.nio.ByteBuffer;
encoderConfigurationOutputFormat.width, encoderConfigurationOutputFormat.width,
encoderConfigurationOutputFormat.height); encoderConfigurationOutputFormat.height);
decoderTextureId = GlUtil.createExternalTexture(); decoderTextureId = GlUtil.createExternalTexture();
String vertexShaderCode;
GlUtil.Program copyProgram; String fragmentShaderCode;
try { try {
copyProgram = vertexShaderCode = GlUtil.loadAsset(context, "shaders/blit_vertex_shader.glsl");
new GlUtil.Program( fragmentShaderCode = GlUtil.loadAsset(context, "shaders/copy_external_fragment_shader.glsl");
context,
/* vertexShaderFilePath= */ "shaders/blit_vertex_shader.glsl",
/* fragmentShaderFilePath= */ "shaders/copy_external_fragment_shader.glsl");
} catch (IOException e) { } catch (IOException e) {
throw new IllegalStateException(e); throw new IllegalStateException(e);
} }
int copyProgram = GlUtil.compileProgram(vertexShaderCode, fragmentShaderCode);
copyProgram.use(); GLES20.glUseProgram(copyProgram);
GlUtil.Attribute[] copyAttributes = copyProgram.getAttributes(); GlUtil.Attribute[] copyAttributes = GlUtil.getAttributes(copyProgram);
checkState(copyAttributes.length == 2, "Expected program to have two vertex attributes."); checkState(copyAttributes.length == 2, "Expected program to have two vertex attributes.");
for (GlUtil.Attribute copyAttribute : copyAttributes) { for (GlUtil.Attribute copyAttribute : copyAttributes) {
if (copyAttribute.name.equals("a_position")) { if (copyAttribute.name.equals("a_position")) {
...@@ -233,7 +229,7 @@ import java.nio.ByteBuffer; ...@@ -233,7 +229,7 @@ import java.nio.ByteBuffer;
} }
copyAttribute.bind(); copyAttribute.bind();
} }
GlUtil.Uniform[] copyUniforms = copyProgram.getUniforms(); GlUtil.Uniform[] copyUniforms = GlUtil.getUniforms(copyProgram);
checkState(copyUniforms.length == 2, "Expected program to have two uniforms."); checkState(copyUniforms.length == 2, "Expected program to have two uniforms.");
for (GlUtil.Uniform copyUniform : copyUniforms) { for (GlUtil.Uniform copyUniform : copyUniforms) {
if (copyUniform.name.equals("tex_sampler")) { if (copyUniform.name.equals("tex_sampler")) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment