Remove unused param from VideoSink

PiperOrigin-RevId: 740739740

libraries/container/src/main/java/androidx/media3/container/DolbyVisionConfig.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package androidx.media3.extractor;
+package androidx.media3.container;
 
 import androidx.annotation.Nullable;
 import androidx.media3.common.util.ParsableByteArray;

libraries/container/src/main/java/androidx/media3/container/Mp4Box.java

@@ -117,6 +117,9 @@ public abstract class Mp4Box {
   @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_dvvC = 0x64767643;
 
+  @SuppressWarnings("ConstantCaseForConstants")
+  public static final int TYPE_dvwC = 0x64767743;
+
   @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_s263 = 0x73323633;
 

libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/DefaultVideoSink.java

@@ -220,7 +220,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
 
   @Override
   public boolean handleInputFrame(
-      long framePresentationTimeUs, boolean isLastFrame, VideoFrameHandler videoFrameHandler) {
+      long framePresentationTimeUs, VideoFrameHandler videoFrameHandler) {
     videoFrameHandlers.add(videoFrameHandler);
     long bufferPresentationTimeUs = framePresentationTimeUs - bufferTimestampAdjustmentUs;
     videoFrameRenderControl.onFrameAvailableForRendering(bufferPresentationTimeUs);
@@ -276,14 +276,14 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
               .setHeight(videoSize.height)
               .setSampleMimeType(MimeTypes.VIDEO_RAW)
               .build();
-      listenerExecutor.execute(() -> listener.onVideoSizeChanged(DefaultVideoSink.this, videoSize));
+      listenerExecutor.execute(() -> listener.onVideoSizeChanged(videoSize));
     }
 
     @Override
     public void renderFrame(
         long renderTimeNs, long bufferPresentationTimeUs, boolean isFirstFrame) {
       if (isFirstFrame && outputSurface != null) {
-        listenerExecutor.execute(() -> listener.onFirstFrameRendered(DefaultVideoSink.this));
+        listenerExecutor.execute(() -> listener.onFirstFrameRendered());
       }
       // TODO - b/292111083: outputFormat is initialized after the first frame is rendered because
       //  onVideoSizeChanged is announced after the first frame is available for rendering.
@@ -298,7 +298,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
 
     @Override
     public void dropFrame() {
-      listenerExecutor.execute(() -> listener.onFrameDropped(DefaultVideoSink.this));
+      listenerExecutor.execute(() -> listener.onFrameDropped());
       videoFrameHandlers.remove().skip();
     }
   }

libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/MediaCodecVideoRenderer.java

@@ -884,14 +884,14 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer
       videoSink.setListener(
           new VideoSink.Listener() {
             @Override
-            public void onFirstFrameRendered(VideoSink videoSink) {
+            public void onFirstFrameRendered() {
               if (displaySurface != null) {
                 notifyRenderedFirstFrame();
               }
             }
 
             @Override
-            public void onFrameDropped(VideoSink videoSink) {
+            public void onFrameDropped() {
               if (displaySurface != null) {
                 updateDroppedBufferCounters(
                     /* droppedInputBufferCount= */ 0, /* droppedDecoderBufferCount= */ 1);
@@ -899,15 +899,14 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer
             }
 
             @Override
-            public void onVideoSizeChanged(VideoSink videoSink, VideoSize videoSize) {
+            public void onVideoSizeChanged(VideoSize videoSize) {
               // TODO: b/292111083 - Report video size change to app. Video size reporting is
               //  removed at the moment to ensure the first frame is rendered, and the video is
               //  rendered after switching on/off the screen.
             }
 
             @Override
-            public void onError(
+            public void onError(VideoSink.VideoSinkException videoSinkException) {
-                VideoSink videoSink, VideoSink.VideoSinkException videoSinkException) {
               setPendingPlaybackException(
                   createRendererException(
                       videoSinkException,
@@ -1742,7 +1741,6 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer
       long framePresentationTimeUs = bufferPresentationTimeUs + getBufferTimestampAdjustmentUs();
       return videoSink.handleInputFrame(
           framePresentationTimeUs,
-          isLastBuffer,
           new VideoSink.VideoFrameHandler() {
             @Override
             public void render(long renderTimestampNs) {

libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/PlaybackVideoGraphWrapper.java

@@ -80,43 +80,26 @@ public final class PlaybackVideoGraphWrapper implements VideoSinkProvider, Video
 
   /** Listener for {@link PlaybackVideoGraphWrapper} events. */
   public interface Listener {
-    /**
+    /** Called when the video frame processor renders the first frame. */
-     * Called when the video frame processor renders the first frame.
+    void onFirstFrameRendered();
-     *
-     * @param playbackVideoGraphWrapper The {@link PlaybackVideoGraphWrapper} which triggered this
-     *     event.
-     */
-    void onFirstFrameRendered(PlaybackVideoGraphWrapper playbackVideoGraphWrapper);
 
-    /**
+    /** Called when the video frame processor dropped a frame. */
-     * Called when the video frame processor dropped a frame.
+    void onFrameDropped();
-     *
-     * @param playbackVideoGraphWrapper The {@link PlaybackVideoGraphWrapper} which triggered this
-     *     event.
-     */
-    void onFrameDropped(PlaybackVideoGraphWrapper playbackVideoGraphWrapper);
 
     /**
      * Called before a frame is rendered for the first time since setting the surface, and each time
      * there's a change in the size, rotation or pixel aspect ratio of the video being rendered.
      *
-     * @param playbackVideoGraphWrapper The {@link PlaybackVideoGraphWrapper} which triggered this
-     *     event.
      * @param videoSize The video size.
      */
-    void onVideoSizeChanged(
+    void onVideoSizeChanged(VideoSize videoSize);
-        PlaybackVideoGraphWrapper playbackVideoGraphWrapper, VideoSize videoSize);
 
     /**
      * Called when the video frame processor encountered an error.
      *
-     * @param playbackVideoGraphWrapper The {@link PlaybackVideoGraphWrapper} which triggered this
-     *     event.
      * @param videoFrameProcessingException The error.
      */
-    void onError(
+    void onError(VideoFrameProcessingException videoFrameProcessingException);
-        PlaybackVideoGraphWrapper playbackVideoGraphWrapper,
-        VideoFrameProcessingException videoFrameProcessingException);
   }
 
   /** A builder for {@link PlaybackVideoGraphWrapper} instances. */
@@ -474,10 +457,10 @@ public final class PlaybackVideoGraphWrapper implements VideoSinkProvider, Video
       outputStreamFirstFrameReleaseInstruction = streamChangeInfo.firstFrameReleaseInstruction;
       onOutputStreamChanged();
     }
+    defaultVideoSink.handleInputFrame(framePresentationTimeUs, videoFrameHandler);
     boolean isLastFrame =
         finalBufferPresentationTimeUs != C.TIME_UNSET
             && bufferPresentationTimeUs >= finalBufferPresentationTimeUs;
-    defaultVideoSink.handleInputFrame(framePresentationTimeUs, isLastFrame, videoFrameHandler);
     if (isLastFrame) {
       // TODO b/257464707 - Support extensively modified media.
       defaultVideoSink.signalEndOfCurrentInputStream();
@@ -493,7 +476,7 @@ public final class PlaybackVideoGraphWrapper implements VideoSinkProvider, Video
   @Override
   public void onError(VideoFrameProcessingException exception) {
     for (PlaybackVideoGraphWrapper.Listener listener : listeners) {
-      listener.onError(/* playbackVideoGraphWrapper= */ this, exception);
+      listener.onError(exception);
     }
   }
 
@@ -797,9 +780,6 @@ public final class PlaybackVideoGraphWrapper implements VideoSinkProvider, Video
         @FirstFrameReleaseInstruction int firstFrameReleaseInstruction,
         List<Effect> videoEffects) {
       checkState(isInitialized());
-      if (inputType != INPUT_TYPE_SURFACE && inputType != INPUT_TYPE_BITMAP) {
-        throw new UnsupportedOperationException("Unsupported input type " + inputType);
-      }
       setPendingVideoEffects(videoEffects);
       this.inputType = inputType;
       this.inputFormat = format;
@@ -915,7 +895,7 @@ public final class PlaybackVideoGraphWrapper implements VideoSinkProvider, Video
 
     @Override
     public boolean handleInputFrame(
-        long framePresentationTimeUs, boolean isLastFrame, VideoFrameHandler videoFrameHandler) {
+        long framePresentationTimeUs, VideoFrameHandler videoFrameHandler) {
       checkState(isInitialized());
 
       if (!shouldRenderToInputVideoSink()) {
@@ -987,35 +967,29 @@ public final class PlaybackVideoGraphWrapper implements VideoSinkProvider, Video
     // PlaybackVideoGraphWrapper.Listener implementation
 
     @Override
-    public void onFirstFrameRendered(PlaybackVideoGraphWrapper playbackVideoGraphWrapper) {
+    public void onFirstFrameRendered() {
       VideoSink.Listener currentListener = listener;
-      listenerExecutor.execute(() -> currentListener.onFirstFrameRendered(/* videoSink= */ this));
+      listenerExecutor.execute(currentListener::onFirstFrameRendered);
     }
 
     @Override
-    public void onFrameDropped(PlaybackVideoGraphWrapper playbackVideoGraphWrapper) {
+    public void onFrameDropped() {
       VideoSink.Listener currentListener = listener;
-      listenerExecutor.execute(
+      listenerExecutor.execute(currentListener::onFrameDropped);
-          () -> currentListener.onFrameDropped(checkStateNotNull(/* reference= */ this)));
     }
 
     @Override
-    public void onVideoSizeChanged(
+    public void onVideoSizeChanged(VideoSize videoSize) {
-        PlaybackVideoGraphWrapper playbackVideoGraphWrapper, VideoSize videoSize) {
       VideoSink.Listener currentListener = listener;
-      listenerExecutor.execute(
+      listenerExecutor.execute(() -> currentListener.onVideoSizeChanged(videoSize));
-          () -> currentListener.onVideoSizeChanged(/* videoSink= */ this, videoSize));
     }
 
     @Override
-    public void onError(
+    public void onError(VideoFrameProcessingException videoFrameProcessingException) {
-        PlaybackVideoGraphWrapper playbackVideoGraphWrapper,
-        VideoFrameProcessingException videoFrameProcessingException) {
       VideoSink.Listener currentListener = listener;
       listenerExecutor.execute(
           () ->
               currentListener.onError(
-                  /* videoSink= */ this,
                   new VideoSinkException(
                       videoFrameProcessingException, checkStateNotNull(this.inputFormat))));
     }
@@ -1045,40 +1019,48 @@ public final class PlaybackVideoGraphWrapper implements VideoSinkProvider, Video
               .buildUpon()
               .setColorInfo(getAdjustedInputColorInfo(inputFormat.colorInfo))
               .build();
+      @VideoFrameProcessor.InputType
+      int videoGraphInputType =
+          inputType == INPUT_TYPE_SURFACE
+              ? VideoFrameProcessor.INPUT_TYPE_SURFACE
+              : VideoFrameProcessor.INPUT_TYPE_BITMAP;
       checkNotNull(videoGraph)
           .registerInputStream(
-              inputIndex, inputType, adjustedInputFormat, videoEffects, /* offsetToAddUs= */ 0);
+              inputIndex,
+              videoGraphInputType,
+              adjustedInputFormat,
+              videoEffects,
+              /* offsetToAddUs= */ 0);
     }
   }
 
   private final class DefaultVideoSinkListener implements VideoSink.Listener {
 
     @Override
-    public void onFirstFrameRendered(VideoSink videoSink) {
+    public void onFirstFrameRendered() {
       for (PlaybackVideoGraphWrapper.Listener listener : listeners) {
-        listener.onFirstFrameRendered(PlaybackVideoGraphWrapper.this);
+        listener.onFirstFrameRendered();
       }
     }
 
     @Override
-    public void onFrameDropped(VideoSink videoSink) {
+    public void onFrameDropped() {
       for (PlaybackVideoGraphWrapper.Listener listener : listeners) {
-        listener.onFrameDropped(PlaybackVideoGraphWrapper.this);
+        listener.onFrameDropped();
       }
     }
 
     @Override
-    public void onVideoSizeChanged(VideoSink videoSink, VideoSize videoSize) {
+    public void onVideoSizeChanged(VideoSize videoSize) {
       for (PlaybackVideoGraphWrapper.Listener listener : listeners) {
-        listener.onVideoSizeChanged(PlaybackVideoGraphWrapper.this, videoSize);
+        listener.onVideoSizeChanged(videoSize);
       }
     }
 
     @Override
-    public void onError(VideoSink videoSink, VideoSink.VideoSinkException videoSinkException) {
+    public void onError(VideoSink.VideoSinkException videoSinkException) {
       for (PlaybackVideoGraphWrapper.Listener listener : listeners) {
-        listener.onError(
+        listener.onError(VideoFrameProcessingException.from(videoSinkException));
-            PlaybackVideoGraphWrapper.this, VideoFrameProcessingException.from(videoSinkException));
       }
     }
   }

libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/VideoSink.java

@@ -57,36 +57,23 @@ public interface VideoSink {
   /** Listener for {@link VideoSink} events. */
   interface Listener {
     /** Called when the sink renders the first frame on the output surface. */
-    void onFirstFrameRendered(VideoSink videoSink);
+    default void onFirstFrameRendered() {}
 
     /** Called when the sink dropped a frame. */
-    void onFrameDropped(VideoSink videoSink);
+    default void onFrameDropped() {}
 
     /**
      * Called before a frame is rendered for the first time after setting the output surface, and
      * each time there's a change in the size, rotation or pixel aspect ratio of the video being
      * rendered.
      */
-    void onVideoSizeChanged(VideoSink videoSink, VideoSize videoSize);
+    default void onVideoSizeChanged(VideoSize videoSize) {}
 
     /** Called when the {@link VideoSink} encountered an error. */
-    void onError(VideoSink videoSink, VideoSinkException videoSinkException);
+    default void onError(VideoSinkException videoSinkException) {}
 
     /** A no-op listener implementation. */
-    Listener NO_OP =
+    Listener NO_OP = new Listener() {};
-        new Listener() {
-          @Override
-          public void onFirstFrameRendered(VideoSink videoSink) {}
-
-          @Override
-          public void onFrameDropped(VideoSink videoSink) {}
-
-          @Override
-          public void onVideoSizeChanged(VideoSink videoSink, VideoSize videoSize) {}
-
-          @Override
-          public void onError(VideoSink videoSink, VideoSinkException videoSinkException) {}
-        };
   }
 
   /** Handler for a video frame. */
@@ -288,15 +275,11 @@ public interface VideoSink {
    * Format, long, int, List) signaled}.
    *
    * @param framePresentationTimeUs The frame's presentation time, in microseconds.
-   * @param isLastFrame Whether this is the last frame of the video stream. This flag is set on a
-   *     best effort basis, and any logic relying on it should degrade gracefully to handle cases
-   *     where it's not set.
    * @param videoFrameHandler The {@link VideoFrameHandler} used to handle the input frame.
    * @return Whether the frame was handled successfully. If {@code false}, the caller can try again
    *     later.
    */
-  boolean handleInputFrame(
+  boolean handleInputFrame(long framePresentationTimeUs, VideoFrameHandler videoFrameHandler);
-      long framePresentationTimeUs, boolean isLastFrame, VideoFrameHandler videoFrameHandler);
 
   /**
    * Handles an input {@link Bitmap}.

libraries/extractor/src/main/java/androidx/media3/extractor/mkv/MatroskaExtractor.java

@@ -41,11 +41,11 @@ import androidx.media3.common.util.NullableType;
 import androidx.media3.common.util.ParsableByteArray;
 import androidx.media3.common.util.UnstableApi;
 import androidx.media3.common.util.Util;
+import androidx.media3.container.DolbyVisionConfig;
 import androidx.media3.container.NalUnitUtil;
 import androidx.media3.extractor.AacUtil;
 import androidx.media3.extractor.AvcConfig;
 import androidx.media3.extractor.ChunkIndex;
-import androidx.media3.extractor.DolbyVisionConfig;
 import androidx.media3.extractor.Extractor;
 import androidx.media3.extractor.ExtractorInput;
 import androidx.media3.extractor.ExtractorOutput;

libraries/extractor/src/main/java/androidx/media3/extractor/mp4/BoxParser.java

@@ -36,6 +36,7 @@ import androidx.media3.common.util.ParsableBitArray;
 import androidx.media3.common.util.ParsableByteArray;
 import androidx.media3.common.util.UnstableApi;
 import androidx.media3.common.util.Util;
+import androidx.media3.container.DolbyVisionConfig;
 import androidx.media3.container.Mp4Box;
 import androidx.media3.container.Mp4Box.LeafBox;
 import androidx.media3.container.Mp4LocationData;
@@ -45,7 +46,6 @@ import androidx.media3.extractor.AacUtil;
 import androidx.media3.extractor.Ac3Util;
 import androidx.media3.extractor.Ac4Util;
 import androidx.media3.extractor.AvcConfig;
-import androidx.media3.extractor.DolbyVisionConfig;
 import androidx.media3.extractor.ExtractorUtil;
 import androidx.media3.extractor.GaplessInfoHolder;
 import androidx.media3.extractor.HevcConfig;
@@ -1367,7 +1367,24 @@ public final class BoxParser {
                     : C.STEREO_MODE_INTERLEAVED_LEFT_PRIMARY;
           }
         }
-      } else if (childAtomType == Mp4Box.TYPE_dvcC || childAtomType == Mp4Box.TYPE_dvvC) {
+      } else if (childAtomType == Mp4Box.TYPE_dvcC
+          || childAtomType == Mp4Box.TYPE_dvvC
+          || childAtomType == Mp4Box.TYPE_dvwC) {
+        int childAtomBodySize = childAtomSize - Mp4Box.HEADER_SIZE;
+        byte[] initializationDataChunk = new byte[childAtomBodySize];
+        parent.readBytes(initializationDataChunk, /* offset= */ 0, childAtomBodySize);
+        // Add the initialization data of Dolby Vision to the existing list of initialization data.
+        if (initializationData != null) {
+          initializationData =
+              ImmutableList.<byte[]>builder()
+                  .addAll(initializationData)
+                  .add(initializationDataChunk)
+                  .build();
+        } else {
+          ExtractorUtil.checkContainerInput(
+              false, "initializationData must already be set from hvcC or avcC atom");
+        }
+        parent.setPosition(childStartPosition + Mp4Box.HEADER_SIZE);
         @Nullable DolbyVisionConfig dolbyVisionConfig = DolbyVisionConfig.parse(parent);
         if (dolbyVisionConfig != null) {
           codecs = dolbyVisionConfig.codecs;

libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list.mp4.0.dump

@@ -32,6 +32,7 @@ track 0:
     metadata = entries=[Mp4Timestamp: creation time=3788952614, modification time=3788952614, timescale=600]
     initializationData:
       data = length 97, hash 32FB3D18
+      data = length 24, hash A31E9935
   sample 0:
     time = -455000
     flags = 1

libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list.mp4.1.dump

@@ -32,6 +32,7 @@ track 0:
     metadata = entries=[Mp4Timestamp: creation time=3788952614, modification time=3788952614, timescale=600]
     initializationData:
       data = length 97, hash 32FB3D18
+      data = length 24, hash A31E9935
   sample 0:
     time = 611666
     flags = 1

libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list.mp4.2.dump

@@ -32,6 +32,7 @@ track 0:
     metadata = entries=[Mp4Timestamp: creation time=3788952614, modification time=3788952614, timescale=600]
     initializationData:
       data = length 97, hash 32FB3D18
+      data = length 24, hash A31E9935
   sample 0:
     time = 1680000
     flags = 1

libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list.mp4.3.dump

@@ -32,6 +32,7 @@ track 0:
     metadata = entries=[Mp4Timestamp: creation time=3788952614, modification time=3788952614, timescale=600]
     initializationData:
       data = length 97, hash 32FB3D18
+      data = length 24, hash A31E9935
   sample 0:
     time = 1680000
     flags = 1

libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list.mp4.reading_within_gop_sample_dependencies.0.dump

@@ -32,6 +32,7 @@ track 0:
     metadata = entries=[Mp4Timestamp: creation time=3788952614, modification time=3788952614, timescale=600]
     initializationData:
       data = length 97, hash 32FB3D18
+      data = length 24, hash A31E9935
   sample 0:
     time = -455000
     flags = 1

libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list.mp4.reading_within_gop_sample_dependencies.1.dump

@@ -32,6 +32,7 @@ track 0:
     metadata = entries=[Mp4Timestamp: creation time=3788952614, modification time=3788952614, timescale=600]
     initializationData:
       data = length 97, hash 32FB3D18
+      data = length 24, hash A31E9935
   sample 0:
     time = 611666
     flags = 1

libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list.mp4.reading_within_gop_sample_dependencies.2.dump

@@ -32,6 +32,7 @@ track 0:
     metadata = entries=[Mp4Timestamp: creation time=3788952614, modification time=3788952614, timescale=600]
     initializationData:
       data = length 97, hash 32FB3D18
+      data = length 24, hash A31E9935
   sample 0:
     time = 1680000
     flags = 1

libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list.mp4.reading_within_gop_sample_dependencies.3.dump

@@ -32,6 +32,7 @@ track 0:
     metadata = entries=[Mp4Timestamp: creation time=3788952614, modification time=3788952614, timescale=600]
     initializationData:
       data = length 97, hash 32FB3D18
+      data = length 24, hash A31E9935
   sample 0:
     time = 1680000
     flags = 1

libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list.mp4.reading_within_gop_sample_dependencies.unknown_length.dump

@@ -32,6 +32,7 @@ track 0:
     metadata = entries=[Mp4Timestamp: creation time=3788952614, modification time=3788952614, timescale=600]
     initializationData:
       data = length 97, hash 32FB3D18
+      data = length 24, hash A31E9935
   sample 0:
     time = -455000
     flags = 1

libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list.mp4.unknown_length.dump

@@ -32,6 +32,7 @@ track 0:
     metadata = entries=[Mp4Timestamp: creation time=3788952614, modification time=3788952614, timescale=600]
     initializationData:
       data = length 97, hash 32FB3D18
+      data = length 24, hash A31E9935
   sample 0:
     time = -455000
     flags = 1

libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_color_info.mp4.0.dump

@@ -32,6 +32,7 @@ track 0:
     metadata = entries=[mdta: key=com.apple.quicktime.location.accuracy.horizontal, value=3.754789, mdta: key=com.apple.quicktime.location.ISO6709, value=+37.7450-122.4301+066.374/, mdta: key=com.apple.quicktime.make, value=Apple, mdta: key=com.apple.quicktime.model, value=iPhone 12 Pro Max, mdta: key=com.apple.quicktime.software, value=14.5.1, mdta: key=com.apple.quicktime.creationdate, value=2021-05-25T09:21:51-0700, Mp4Timestamp: creation time=3704804511, modification time=3704804511, timescale=600]
     initializationData:
       data = length 526, hash 7B3FC433
+      data = length 24, hash A31E9935
   sample 0:
     time = 0
     flags = 1

libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_color_info.mp4.1.dump

@@ -32,6 +32,7 @@ track 0:
     metadata = entries=[mdta: key=com.apple.quicktime.location.accuracy.horizontal, value=3.754789, mdta: key=com.apple.quicktime.location.ISO6709, value=+37.7450-122.4301+066.374/, mdta: key=com.apple.quicktime.make, value=Apple, mdta: key=com.apple.quicktime.model, value=iPhone 12 Pro Max, mdta: key=com.apple.quicktime.software, value=14.5.1, mdta: key=com.apple.quicktime.creationdate, value=2021-05-25T09:21:51-0700, Mp4Timestamp: creation time=3704804511, modification time=3704804511, timescale=600]
     initializationData:
       data = length 526, hash 7B3FC433
+      data = length 24, hash A31E9935
   sample 0:
     time = 0
     flags = 1

libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_color_info.mp4.2.dump

@@ -32,6 +32,7 @@ track 0:
     metadata = entries=[mdta: key=com.apple.quicktime.location.accuracy.horizontal, value=3.754789, mdta: key=com.apple.quicktime.location.ISO6709, value=+37.7450-122.4301+066.374/, mdta: key=com.apple.quicktime.make, value=Apple, mdta: key=com.apple.quicktime.model, value=iPhone 12 Pro Max, mdta: key=com.apple.quicktime.software, value=14.5.1, mdta: key=com.apple.quicktime.creationdate, value=2021-05-25T09:21:51-0700, Mp4Timestamp: creation time=3704804511, modification time=3704804511, timescale=600]
     initializationData:
       data = length 526, hash 7B3FC433
+      data = length 24, hash A31E9935
   sample 0:
     time = 0
     flags = 1

libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_color_info.mp4.3.dump

@@ -32,6 +32,7 @@ track 0:
     metadata = entries=[mdta: key=com.apple.quicktime.location.accuracy.horizontal, value=3.754789, mdta: key=com.apple.quicktime.location.ISO6709, value=+37.7450-122.4301+066.374/, mdta: key=com.apple.quicktime.make, value=Apple, mdta: key=com.apple.quicktime.model, value=iPhone 12 Pro Max, mdta: key=com.apple.quicktime.software, value=14.5.1, mdta: key=com.apple.quicktime.creationdate, value=2021-05-25T09:21:51-0700, Mp4Timestamp: creation time=3704804511, modification time=3704804511, timescale=600]
     initializationData:
       data = length 526, hash 7B3FC433
+      data = length 24, hash A31E9935
   sample 0:
     time = 0
     flags = 1

libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_color_info.mp4.reading_within_gop_sample_dependencies.0.dump

@@ -32,6 +32,7 @@ track 0:
     metadata = entries=[mdta: key=com.apple.quicktime.location.accuracy.horizontal, value=3.754789, mdta: key=com.apple.quicktime.location.ISO6709, value=+37.7450-122.4301+066.374/, mdta: key=com.apple.quicktime.make, value=Apple, mdta: key=com.apple.quicktime.model, value=iPhone 12 Pro Max, mdta: key=com.apple.quicktime.software, value=14.5.1, mdta: key=com.apple.quicktime.creationdate, value=2021-05-25T09:21:51-0700, Mp4Timestamp: creation time=3704804511, modification time=3704804511, timescale=600]
     initializationData:
       data = length 526, hash 7B3FC433
+      data = length 24, hash A31E9935
   sample 0:
     time = 0
     flags = 1

libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_color_info.mp4.reading_within_gop_sample_dependencies.1.dump

@@ -32,6 +32,7 @@ track 0:
     metadata = entries=[mdta: key=com.apple.quicktime.location.accuracy.horizontal, value=3.754789, mdta: key=com.apple.quicktime.location.ISO6709, value=+37.7450-122.4301+066.374/, mdta: key=com.apple.quicktime.make, value=Apple, mdta: key=com.apple.quicktime.model, value=iPhone 12 Pro Max, mdta: key=com.apple.quicktime.software, value=14.5.1, mdta: key=com.apple.quicktime.creationdate, value=2021-05-25T09:21:51-0700, Mp4Timestamp: creation time=3704804511, modification time=3704804511, timescale=600]
     initializationData:
       data = length 526, hash 7B3FC433
+      data = length 24, hash A31E9935
   sample 0:
     time = 0
     flags = 1

libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_color_info.mp4.reading_within_gop_sample_dependencies.2.dump

@@ -32,6 +32,7 @@ track 0:
     metadata = entries=[mdta: key=com.apple.quicktime.location.accuracy.horizontal, value=3.754789, mdta: key=com.apple.quicktime.location.ISO6709, value=+37.7450-122.4301+066.374/, mdta: key=com.apple.quicktime.make, value=Apple, mdta: key=com.apple.quicktime.model, value=iPhone 12 Pro Max, mdta: key=com.apple.quicktime.software, value=14.5.1, mdta: key=com.apple.quicktime.creationdate, value=2021-05-25T09:21:51-0700, Mp4Timestamp: creation time=3704804511, modification time=3704804511, timescale=600]
     initializationData:
       data = length 526, hash 7B3FC433
+      data = length 24, hash A31E9935
   sample 0:
     time = 0
     flags = 1

libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_color_info.mp4.reading_within_gop_sample_dependencies.3.dump

@@ -32,6 +32,7 @@ track 0:
     metadata = entries=[mdta: key=com.apple.quicktime.location.accuracy.horizontal, value=3.754789, mdta: key=com.apple.quicktime.location.ISO6709, value=+37.7450-122.4301+066.374/, mdta: key=com.apple.quicktime.make, value=Apple, mdta: key=com.apple.quicktime.model, value=iPhone 12 Pro Max, mdta: key=com.apple.quicktime.software, value=14.5.1, mdta: key=com.apple.quicktime.creationdate, value=2021-05-25T09:21:51-0700, Mp4Timestamp: creation time=3704804511, modification time=3704804511, timescale=600]
     initializationData:
       data = length 526, hash 7B3FC433
+      data = length 24, hash A31E9935
   sample 0:
     time = 0
     flags = 1

libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_color_info.mp4.reading_within_gop_sample_dependencies.unknown_length.dump

@@ -32,6 +32,7 @@ track 0:
     metadata = entries=[mdta: key=com.apple.quicktime.location.accuracy.horizontal, value=3.754789, mdta: key=com.apple.quicktime.location.ISO6709, value=+37.7450-122.4301+066.374/, mdta: key=com.apple.quicktime.make, value=Apple, mdta: key=com.apple.quicktime.model, value=iPhone 12 Pro Max, mdta: key=com.apple.quicktime.software, value=14.5.1, mdta: key=com.apple.quicktime.creationdate, value=2021-05-25T09:21:51-0700, Mp4Timestamp: creation time=3704804511, modification time=3704804511, timescale=600]
     initializationData:
       data = length 526, hash 7B3FC433
+      data = length 24, hash A31E9935
   sample 0:
     time = 0
     flags = 1

libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_color_info.mp4.unknown_length.dump

@@ -32,6 +32,7 @@ track 0:
     metadata = entries=[mdta: key=com.apple.quicktime.location.accuracy.horizontal, value=3.754789, mdta: key=com.apple.quicktime.location.ISO6709, value=+37.7450-122.4301+066.374/, mdta: key=com.apple.quicktime.make, value=Apple, mdta: key=com.apple.quicktime.model, value=iPhone 12 Pro Max, mdta: key=com.apple.quicktime.software, value=14.5.1, mdta: key=com.apple.quicktime.creationdate, value=2021-05-25T09:21:51-0700, Mp4Timestamp: creation time=3704804511, modification time=3704804511, timescale=600]
     initializationData:
       data = length 526, hash 7B3FC433
+      data = length 24, hash A31E9935
   sample 0:
     time = 0
     flags = 1

libraries/transformer/src/main/java/androidx/media3/transformer/BufferingVideoSink.java

@@ -234,9 +234,9 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
    */
   @Override
   public boolean handleInputFrame(
-      long framePresentationTimeUs, boolean isLastFrame, VideoFrameHandler videoFrameHandler) {
+      long framePresentationTimeUs, VideoFrameHandler videoFrameHandler) {
     return videoSink != null
-        && videoSink.handleInputFrame(framePresentationTimeUs, isLastFrame, videoFrameHandler);
+        && videoSink.handleInputFrame(framePresentationTimeUs, videoFrameHandler);
   }
 
   /**

libraries/transformer/src/main/java/androidx/media3/transformer/CompositionPlayer.java

@@ -408,7 +408,7 @@ public final class CompositionPlayer extends SimpleBasePlayer
   // PlaybackVideoGraphWrapper.Listener methods. Called on playback thread.
 
   @Override
-  public void onFirstFrameRendered(PlaybackVideoGraphWrapper playbackVideoGraphWrapper) {
+  public void onFirstFrameRendered() {
     applicationHandler.post(
         () -> {
           CompositionPlayer.this.renderedFirstFrame = true;
@@ -417,21 +417,18 @@ public final class CompositionPlayer extends SimpleBasePlayer
   }
 
   @Override
-  public void onFrameDropped(PlaybackVideoGraphWrapper playbackVideoGraphWrapper) {
+  public void onFrameDropped() {
     // Do not post to application thread on each dropped frame, because onFrameDropped
     // may be called frequently when resources are already scarce.
   }
 
   @Override
-  public void onVideoSizeChanged(
+  public void onVideoSizeChanged(VideoSize videoSize) {
-      PlaybackVideoGraphWrapper playbackVideoGraphWrapper, VideoSize videoSize) {
     // TODO: b/328219481 - Report video size change to app.
   }
 
   @Override
-  public void onError(
+  public void onError(VideoFrameProcessingException videoFrameProcessingException) {
-      PlaybackVideoGraphWrapper playbackVideoGraphWrapper,
-      VideoFrameProcessingException videoFrameProcessingException) {
     // The error will also be surfaced from the underlying ExoPlayer instance via
     // PlayerListener.onPlayerError, and it will arrive to the composition player twice.
     applicationHandler.post(