loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-04-30 06:46:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Prevent repeated release of the same EGLContext

Browse Source 
All instances of PlaybackVideoGraphWrapper use the same
VIDEO_FRAME_PROCESSOR_FACTORY_SUPPLIER which uses the same
DefaultGlObjectsProvider.

Each call to DefaultGlObjectsProvider.release() releases
all previously created EGLContexts.

Lazily create a new DefaultGlObjectsProvider for each
DefaultVideoFrameProcessor (not one per factory).

PiperOrigin-RevId: 693658458
This commit is contained in:
dancho 2024-11-06 03:12:49 -08:00 committed by Copybara-Service
parent ab723fc8ff
commit f9fd8badec
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libraries/effect/src/main/java/androidx/media3/effect/DefaultVideoFrameProcessor.java
View File

@ -327,7 +327,7 @@ public final class DefaultVideoFrameProcessor implements VideoFrameProcessor {
return new DefaultVideoFrameProcessor.Factory( return new DefaultVideoFrameProcessor.Factory(
sdrWorkingColorSpace, sdrWorkingColorSpace,
/* repeatLastRegisteredFrame= */ !requireRegisteringAllInputFrames, /* repeatLastRegisteredFrame= */ !requireRegisteringAllInputFrames,
glObjectsProvider == null ? new DefaultGlObjectsProvider() : glObjectsProvider, glObjectsProvider,
executorService, executorService,
textureOutputListener, textureOutputListener,
textureOutputCapacity, textureOutputCapacity,
@ -338,7 +338,7 @@ public final class DefaultVideoFrameProcessor implements VideoFrameProcessor {
private final @WorkingColorSpace int sdrWorkingColorSpace; private final @WorkingColorSpace int sdrWorkingColorSpace;
private final boolean repeatLastRegisteredFrame; private final boolean repeatLastRegisteredFrame;
private final GlObjectsProvider glObjectsProvider; @Nullable private final GlObjectsProvider glObjectsProvider;
@Nullable private final ExecutorService executorService; @Nullable private final ExecutorService executorService;
@Nullable private final GlTextureProducer.Listener textureOutputListener; @Nullable private final GlTextureProducer.Listener textureOutputListener;
private final int textureOutputCapacity; private final int textureOutputCapacity;
@ -348,7 +348,7 @@ public final class DefaultVideoFrameProcessor implements VideoFrameProcessor {
private Factory( private Factory(
@WorkingColorSpace int sdrWorkingColorSpace, @WorkingColorSpace int sdrWorkingColorSpace,
boolean repeatLastRegisteredFrame, boolean repeatLastRegisteredFrame,
GlObjectsProvider glObjectsProvider, @Nullable GlObjectsProvider glObjectsProvider,
@Nullable ExecutorService executorService, @Nullable ExecutorService executorService,
@Nullable GlTextureProducer.Listener textureOutputListener, @Nullable GlTextureProducer.Listener textureOutputListener,
int textureOutputCapacity, int textureOutputCapacity,
@ -411,6 +411,9 @@ public final class DefaultVideoFrameProcessor implements VideoFrameProcessor {
new VideoFrameProcessingTaskExecutor( new VideoFrameProcessingTaskExecutor(
instanceExecutorService, shouldShutdownExecutorService, listener::onError); instanceExecutorService, shouldShutdownExecutorService, listener::onError);
GlObjectsProvider glObjectsProvider =
this.glObjectsProvider == null ? new DefaultGlObjectsProvider() : this.glObjectsProvider;
Future<DefaultVideoFrameProcessor> defaultVideoFrameProcessorFuture = Future<DefaultVideoFrameProcessor> defaultVideoFrameProcessorFuture =
instanceExecutorService.submit( instanceExecutorService.submit(
() -> () ->