Rollback of e2882c0

PiperOrigin-RevId: 564802194
androidx · Sep 12, 2023 · 282171c · 282171c
1 parent 885ddb1
commit 282171c
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 560 deletions.
diff --git a/libraries/effect/src/main/java/androidx/media3/effect/DebugTraceUtil.java b/libraries/effect/src/main/java/androidx/media3/effect/DebugTraceUtil.java
@@ -55,9 +55,7 @@ public final class DebugTraceUtil {
     EVENT_VFP_QUEUE_BITMAP,
     EVENT_VFP_QUEUE_TEXTURE,
     EVENT_VFP_RENDERED_TO_OUTPUT_SURFACE,
-    EVENT_VFP_OUTPUT_TEXTURE_RENDERED,
     EVENT_VFP_FINISH_PROCESSING_INPUT_STREAM,
-    EVENT_COMPOSITOR_OUTPUT_TEXTURE_RENDERED,
     EVENT_ENCODER_ENCODED_FRAME,
     EVENT_MUXER_CAN_WRITE_SAMPLE_VIDEO,
     EVENT_MUXER_WRITE_SAMPLE_VIDEO,
@@ -86,10 +84,7 @@ public final class DebugTraceUtil {
   public static final String EVENT_VFP_QUEUE_BITMAP = "VFP-QueueBitmap";
   public static final String EVENT_VFP_QUEUE_TEXTURE = "VFP-QueueTexture";
   public static final String EVENT_VFP_RENDERED_TO_OUTPUT_SURFACE = "VFP-RenderedToOutputSurface";
-  public static final String EVENT_VFP_OUTPUT_TEXTURE_RENDERED = "VFP-OutputTextureRendered";
   public static final String EVENT_VFP_FINISH_PROCESSING_INPUT_STREAM = "VFP-FinishOneInputStream";
-  public static final String EVENT_COMPOSITOR_OUTPUT_TEXTURE_RENDERED =
-      "COMP-OutputTextureRendered";
   public static final String EVENT_ENCODER_ENCODED_FRAME = "Encoder-EncodedFrame";
   public static final String EVENT_MUXER_CAN_WRITE_SAMPLE_VIDEO = "Muxer-CanWriteSample_Video";
   public static final String EVENT_MUXER_WRITE_SAMPLE_VIDEO = "Muxer-WriteSample_Video";
@@ -120,9 +115,7 @@ public final class DebugTraceUtil {
           EVENT_VFP_QUEUE_BITMAP,
           EVENT_VFP_QUEUE_TEXTURE,
           EVENT_VFP_RENDERED_TO_OUTPUT_SURFACE,
-          EVENT_VFP_OUTPUT_TEXTURE_RENDERED,
           EVENT_VFP_FINISH_PROCESSING_INPUT_STREAM,
-          EVENT_COMPOSITOR_OUTPUT_TEXTURE_RENDERED,
           EVENT_ENCODER_ENCODED_FRAME,
           EVENT_MUXER_CAN_WRITE_SAMPLE_VIDEO,
           EVENT_MUXER_WRITE_SAMPLE_VIDEO,

diff --git a/libraries/effect/src/main/java/androidx/media3/effect/DefaultVideoFrameProcessor.java b/libraries/effect/src/main/java/androidx/media3/effect/DefaultVideoFrameProcessor.java
@@ -15,6 +15,7 @@
  */
 package androidx.media3.effect;
 
+import static androidx.annotation.VisibleForTesting.PACKAGE_PRIVATE;
 import static androidx.media3.common.util.Assertions.checkArgument;
 import static androidx.media3.common.util.Assertions.checkNotNull;
 import static androidx.media3.common.util.Assertions.checkState;
@@ -86,8 +87,8 @@ public static final class Factory implements VideoFrameProcessor.Factory {
     /** A builder for {@link DefaultVideoFrameProcessor.Factory} instances. */
     public static final class Builder {
       private boolean enableColorTransfers;
-      @Nullable private ExecutorService executorService;
       private @MonotonicNonNull GlObjectsProvider glObjectsProvider;
+      private @MonotonicNonNull ExecutorService executorService;
       private GlTextureProducer.@MonotonicNonNull Listener textureOutputListener;
       private int textureOutputCapacity;
 
@@ -96,14 +97,6 @@ public Builder() {
         enableColorTransfers = true;
       }
 
-      private Builder(Factory factory) {
-        enableColorTransfers = factory.enableColorTransfers;
-        executorService = factory.executorService;
-        glObjectsProvider = factory.glObjectsProvider;
-        textureOutputListener = factory.textureOutputListener;
-        textureOutputCapacity = factory.textureOutputCapacity;
-      }
-
       /**
        * Sets whether to transfer colors to an intermediate color space when applying effects.
        *
@@ -129,18 +122,18 @@ public Builder setGlObjectsProvider(GlObjectsProvider glObjectsProvider) {
       /**
        * Sets the {@link Util#newSingleThreadScheduledExecutor} to execute GL commands from.
        *
-       * <p>If set to a non-null value, the {@link ExecutorService} must be {@linkplain
-       * ExecutorService#shutdown shut down} by the caller after all {@linkplain VideoFrameProcessor
-       * VideoFrameProcessors} using it have been {@linkplain #release released}.
+       * <p>If set, the {@link ExecutorService} must be {@linkplain ExecutorService#shutdown shut
+       * down} by the caller after all {@linkplain VideoFrameProcessor VideoFrameProcessors} using
+       * it have been {@linkplain #release released}.
        *
        * <p>The default value is a new {@link Util#newSingleThreadScheduledExecutor}, owned and
-       * {@link ExecutorService#shutdown} by the created {@link DefaultVideoFrameProcessor}. Setting
-       * a {@code null} {@link ExecutorService} is equivalent to using the default value.
+       * {@link ExecutorService#shutdown} by the created {@link DefaultVideoFrameProcessor}.
        *
        * @param executorService The {@link ExecutorService}.
        */
       @CanIgnoreReturnValue
-      public Builder setExecutorService(@Nullable ExecutorService executorService) {
+      @VisibleForTesting(otherwise = PACKAGE_PRIVATE)
+      public Builder setExecutorService(ExecutorService executorService) {
         this.executorService = executorService;
         return this;
       }
@@ -163,6 +156,7 @@ public Builder setExecutorService(@Nullable ExecutorService executorService) {
        * @param textureOutputCapacity The amount of output textures that may be allocated at a time
        *     before texture output blocks. Must be greater than or equal to 1.
        */
+      @VisibleForTesting
       @CanIgnoreReturnValue
       public Builder setTextureOutput(
           GlTextureProducer.Listener textureOutputListener,
@@ -203,10 +197,6 @@ private Factory(
       this.textureOutputCapacity = textureOutputCapacity;
     }
 
-    public Builder buildUpon() {
-      return new Builder(this);
-    }
-
     /**
      * {@inheritDoc}
      *
@@ -276,7 +266,6 @@ public DefaultVideoFrameProcessor create(
       boolean shouldShutdownExecutorService = executorService == null;
       ExecutorService instanceExecutorService =
           executorService == null ? Util.newSingleThreadExecutor(THREAD_NAME) : executorService;
-
       VideoFrameProcessingTaskExecutor videoFrameProcessingTaskExecutor =
           new VideoFrameProcessingTaskExecutor(
               instanceExecutorService, shouldShutdownExecutorService, listener::onError);
@@ -438,7 +427,6 @@ public boolean queueInputTexture(int textureId, long presentationTimeUs) {
     if (!inputStreamRegisteredCondition.isOpen()) {
       return false;
     }
-
     inputSwitcher.activeTextureManager().queueInputTexture(textureId, presentationTimeUs);
     return true;
   }