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

Release overlay resources at end of frame processing

Browse Source 
When implementing pause and resume, overlay appears as black frame on resume, suggesting the texture isn't being remade properly due to lack of proper deletion.

PiperOrigin-RevId: 554832580
This commit is contained in:
tofunmi 2023-08-08 15:28:55 +00:00 committed by Tianyi Feng
parent 5c78290d5a
commit 7be15b7603
3 changed files with 35 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
libraries/effect/src/main/java/androidx/media3/effect/BitmapOverlay.java
View File

@ -22,6 +22,7 @@ import android.graphics.Bitmap;
import android.net.Uri;
import android.opengl.GLES20;
import android.opengl.GLUtils;
import androidx.media3.common.C;
import androidx.media3.common.VideoFrameProcessingException;
import androidx.media3.common.util.BitmapLoader;
import androidx.media3.common.util.GlUtil;
@ -31,6 +32,7 @@ import androidx.media3.datasource.DataSourceBitmapLoader;
import com.google.common.util.concurrent.ListenableFuture;
import java.util.concurrent.ExecutionException;
import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
import org.checkerframework.checker.nullness.qual.Nullable;
/**
* Creates {@link TextureOverlay}s from {@link Bitmap}s.
@ -40,7 +42,11 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
@UnstableApi
public abstract class BitmapOverlay extends TextureOverlay {
private int lastTextureId;
private @MonotonicNonNull Bitmap lastBitmap;
private @Nullable Bitmap lastBitmap;
BitmapOverlay() {
lastTextureId = C.INDEX_UNSET;
}
/**
* Returns the overlay bitmap displayed at the specified timestamp.
@ -68,6 +74,9 @@ public abstract class BitmapOverlay extends TextureOverlay {
if (bitmap != lastBitmap) {
try {
lastBitmap = bitmap;
if (lastTextureId != -1) {
GlUtil.deleteTexture(lastTextureId);
}
lastTextureId =
GlUtil.createTexture(
bitmap.getWidth(),
@ -77,7 +86,7 @@ public abstract class BitmapOverlay extends TextureOverlay {
GLUtils.texImage2D(
GLES20.GL_TEXTURE_2D,
/* level= */ 0,
BitmapUtil.flipBitmapVertically(lastBitmap),
BitmapUtil.flipBitmapVertically(checkNotNull(lastBitmap)),
/* border= */ 0);
GlUtil.checkGlError();
} catch (GlUtil.GlException e) {
@ -162,4 +171,18 @@ public abstract class BitmapOverlay extends TextureOverlay {
}
};
}
@Override
public void release() throws VideoFrameProcessingException {
super.release();
lastBitmap = null;
if (lastTextureId != -1) {
try {
GlUtil.deleteTexture(lastTextureId);
} catch (GlUtil.GlException e) {
throw new VideoFrameProcessingException(e);
}
}
lastTextureId = C.INDEX_UNSET;
}
}

3
libraries/effect/src/main/java/androidx/media3/effect/OverlayShaderProgram.java
View File

@ -299,6 +299,9 @@ import com.google.common.collect.ImmutableList;
} catch (GlUtil.GlException e) {
throw new VideoFrameProcessingException(e);
}
for (int i = 0; i < overlays.size(); i++) {
overlays.get(i).release();
}
}
private static String createVertexShader(int numOverlays) {

7
libraries/effect/src/main/java/androidx/media3/effect/TextureOverlay.java
View File

@ -60,4 +60,11 @@ public abstract class TextureOverlay {
public OverlaySettings getOverlaySettings(long presentationTimeUs) {
return new OverlaySettings.Builder().build();
}
/**
* Releases all resources.
*
* @throws VideoFrameProcessingException If an error occurs while releasing resources.
*/
public void release() throws VideoFrameProcessingException {}
}