loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Destroy eglSurface as soon as Surface changes

Browse Source 
eglDestroySurface now unbinds surface from the GL
thread to ensure quick release of resources.

PiperOrigin-RevId: 650938712
This commit is contained in:
dancho 2024-07-10 03:16:40 -07:00 committed by Copybara-Service
parent dcc3e439e2
commit 70a6b5d50d
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/common/src/main/java/androidx/media3/common/util/GlUtil.java
View File

@ -16,7 +16,6 @@
package androidx.media3.common.util;
import static android.opengl.EGL14.EGL_CONTEXT_CLIENT_VERSION;
import static android.opengl.EGL14.EGL_NO_SURFACE;
import static android.opengl.GLU.gluErrorString;
import static androidx.media3.common.util.Assertions.checkArgument;
import static androidx.media3.common.util.Assertions.checkState;
@ -804,9 +803,6 @@ public final class GlUtil {
if (eglDisplay == null || eglSurface == null) {
return;
}
if (EGL14.eglGetCurrentSurface(EGL14.EGL_DRAW) == EGL_NO_SURFACE) {
return;
}
EGL14.eglDestroySurface(eglDisplay, eglSurface);
checkEglException("Error destroying surface");

18
libraries/effect/src/main/java/androidx/media3/effect/FinalShaderProgramWrapper.java
View File

@ -335,9 +335,16 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
return;
}
if (outputSurfaceInfo != null
&& this.outputSurfaceInfo != null
&& !this.outputSurfaceInfo.surface.equals(outputSurfaceInfo.surface)) {
if (this.outputSurfaceInfo != null
&& (outputSurfaceInfo == null
|| !this.outputSurfaceInfo.surface.equals(outputSurfaceInfo.surface))) {
// Destroy outputEglSurface as soon as we lose reference to the corresponding Surface.
// outputEglSurface is a graphics buffer producer for a BufferQueue, and
// this.outputSurfaceInfo.surface is the associated consumer. The consumer owns the
// BufferQueue https://source.android.com/docs/core/graphics/arch-bq-gralloc#BufferQueue.
// If the consumer and the BufferQueue are released while the producer is still alive, EGL
// gets stuck trying to dequeue a new buffer from the released BufferQueue. This probably
// happens when the previously queued back buffer is ready for display.
try {
GlUtil.destroyEglSurface(eglDisplay, outputEglSurface);
} catch (GlUtil.GlException e) {
@ -455,11 +462,8 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
}
checkNotNull(outputSizeBeforeSurfaceTransformation);
if (outputSurfaceInfo == null) {
GlUtil.destroyEglSurface(eglDisplay, outputEglSurface);
outputEglSurface = null;
}
if (outputSurfaceInfo == null && textureOutputListener == null) {
checkState(outputEglSurface == null);
if (defaultShaderProgram != null) {
defaultShaderProgram.release();
defaultShaderProgram = null;