Fix MediaCodec tone mapping in CompositionPlayer

Previously an incorrect ColorInfo was being set on the VideoGraph when the input was tone mapped with MediaCodec.

PiperOrigin-RevId: 765093463

Author: kggibson

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

@@ -253,6 +253,7 @@ public PlaybackVideoGraphWrapper build() {
   private @MonotonicNonNull VideoGraph videoGraph;
   private @MonotonicNonNull VideoFrameMetadataListener videoFrameMetadataListener;
   private boolean requestOpenGlToneMapping;
+  private boolean isInputSdrToneMapped;
   private long outputStreamStartPositionUs;
   private @VideoSink.FirstFrameReleaseInstruction int outputStreamFirstFrameReleaseInstruction;
   @Nullable private Pair<Surface, Size> currentSurfaceAndSize;
@@ -390,6 +391,11 @@ public void setRequestOpenGlToneMapping(boolean requestOpenGlToneMapping) {
     this.requestOpenGlToneMapping = requestOpenGlToneMapping;
   }
 
+  /** Sets whether the input should be treated as if it has been tone mapped to SDR. */
+  public void setIsInputSdrToneMapped(boolean isInputSdrToneMapped) {
+    this.isInputSdrToneMapped = isInputSdrToneMapped;
+  }
+
   public void release() {
     if (state == STATE_RELEASED) {
       return;
@@ -642,8 +648,8 @@ private boolean shouldRenderToInputVideoSink() {
         && totalVideoInputCount == registeredVideoInputCount;
   }
 
-  private static ColorInfo getAdjustedInputColorInfo(@Nullable ColorInfo inputColorInfo) {
-    if (inputColorInfo == null || !inputColorInfo.isDataSpaceValid()) {
+  private ColorInfo getAdjustedInputColorInfo(@Nullable ColorInfo inputColorInfo) {
+    if (inputColorInfo == null || !inputColorInfo.isDataSpaceValid() || isInputSdrToneMapped) {
       return ColorInfo.SDR_BT709_LIMITED;
     }
 

libraries/exoplayer/src/test/java/androidx/media3/exoplayer/video/PlaybackVideoGraphWrapperTest.java

@@ -19,7 +19,6 @@
 import static androidx.media3.exoplayer.video.VideoSink.RELEASE_FIRST_FRAME_WHEN_PREVIOUS_STREAM_PROCESSED;
 import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.assertThrows;
-import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.ArgumentMatchers.anyLong;
 import static org.mockito.ArgumentMatchers.eq;
@@ -28,6 +27,7 @@
 import static org.mockito.Mockito.when;
 
 import android.content.Context;
+import androidx.media3.common.C;
 import androidx.media3.common.ColorInfo;
 import androidx.media3.common.DebugViewProvider;
 import androidx.media3.common.Effect;
@@ -100,11 +100,100 @@ public void onInputStreamChanged_setsVideoSinkVideoEffects() throws VideoSink.Vi
         startPositionUs,
         RELEASE_FIRST_FRAME_WHEN_PREVIOUS_STREAM_PROCESSED,
         ImmutableList.of());
-    testVideoGraphFactory.verifyRegisteredEffectsMatches(/* invocationTimes= */ 3);
+    testVideoGraphFactory.verifyRegisterInputStream(/* invocationTimes= */ 3);
     assertThat(testVideoGraphFactory.getCapturedEffects())
         .isEqualTo(ImmutableList.of(firstEffects, secondEffects, ImmutableList.of()));
   }
 
+  @Test
+  public void onInputStreamChanged_withNoToneMapping_initializesGraphWithInputColorInfo()
+      throws VideoSink.VideoSinkException {
+    TestVideoGraphFactory testVideoGraphFactory = new TestVideoGraphFactory();
+    PlaybackVideoGraphWrapper playbackVideoGraphWrapper =
+        createPlaybackVideoGraphWrapper(testVideoGraphFactory);
+    ColorInfo hlgColorInfo =
+        new ColorInfo.Builder()
+            .setColorRange(C.COLOR_RANGE_FULL)
+            .setColorSpace(C.COLOR_SPACE_BT2020)
+            .setColorTransfer(C.COLOR_TRANSFER_HLG)
+            .build();
+    Format inputFormat = new Format.Builder().setColorInfo(hlgColorInfo).build();
+    long startPositionUs = 0;
+    VideoSink sink = playbackVideoGraphWrapper.getSink(/* inputIndex= */ 0);
+
+    sink.initialize(inputFormat);
+    sink.onInputStreamChanged(
+        VideoSink.INPUT_TYPE_SURFACE,
+        inputFormat,
+        startPositionUs,
+        RELEASE_FIRST_FRAME_IMMEDIATELY,
+        /* videoEffects= */ ImmutableList.of());
+
+    testVideoGraphFactory.verifyRegisterInputStream(/* invocationTimes= */ 1);
+    assertThat(testVideoGraphFactory.getCapturedFormats()).containsExactly(inputFormat);
+  }
+
+  @Test
+  public void onInputStreamChanged_withInputSdrToneMapped_initializesGraphWithBt709Input()
+      throws VideoSink.VideoSinkException {
+    TestVideoGraphFactory testVideoGraphFactory = new TestVideoGraphFactory();
+    PlaybackVideoGraphWrapper playbackVideoGraphWrapper =
+        createPlaybackVideoGraphWrapper(testVideoGraphFactory);
+    ColorInfo hlgColorInfo =
+        new ColorInfo.Builder()
+            .setColorRange(C.COLOR_RANGE_FULL)
+            .setColorSpace(C.COLOR_SPACE_BT2020)
+            .setColorTransfer(C.COLOR_TRANSFER_HLG)
+            .build();
+    Format inputFormat = new Format.Builder().setColorInfo(hlgColorInfo).build();
+    long startPositionUs = 0;
+    VideoSink sink = playbackVideoGraphWrapper.getSink(/* inputIndex= */ 0);
+
+    playbackVideoGraphWrapper.setIsInputSdrToneMapped(true);
+    sink.initialize(inputFormat);
+    sink.onInputStreamChanged(
+        VideoSink.INPUT_TYPE_SURFACE,
+        inputFormat,
+        startPositionUs,
+        RELEASE_FIRST_FRAME_IMMEDIATELY,
+        /* videoEffects= */ ImmutableList.of());
+
+    testVideoGraphFactory.verifyRegisterInputStream(/* invocationTimes= */ 1);
+    Format bt709ColorInfoInputFormat =
+        inputFormat.buildUpon().setColorInfo(ColorInfo.SDR_BT709_LIMITED).build();
+    assertThat(testVideoGraphFactory.getCapturedFormats())
+        .containsExactly(bt709ColorInfoInputFormat);
+  }
+
+  @Test
+  public void onInputStreamChanged_withOpenGlToneMapping_initializesGraphWithInputColorInfo()
+      throws VideoSink.VideoSinkException {
+    TestVideoGraphFactory testVideoGraphFactory = new TestVideoGraphFactory();
+    PlaybackVideoGraphWrapper playbackVideoGraphWrapper =
+        createPlaybackVideoGraphWrapper(testVideoGraphFactory);
+    ColorInfo hlgColorInfo =
+        new ColorInfo.Builder()
+            .setColorRange(C.COLOR_RANGE_FULL)
+            .setColorSpace(C.COLOR_SPACE_BT2020)
+            .setColorTransfer(C.COLOR_TRANSFER_HLG)
+            .build();
+    Format inputFormat = new Format.Builder().setColorInfo(hlgColorInfo).build();
+    long startPositionUs = 0;
+    VideoSink sink = playbackVideoGraphWrapper.getSink(/* inputIndex= */ 0);
+
+    playbackVideoGraphWrapper.setRequestOpenGlToneMapping(true);
+    sink.initialize(inputFormat);
+    sink.onInputStreamChanged(
+        VideoSink.INPUT_TYPE_SURFACE,
+        inputFormat,
+        startPositionUs,
+        RELEASE_FIRST_FRAME_IMMEDIATELY,
+        /* videoEffects= */ ImmutableList.of());
+
+    testVideoGraphFactory.verifyRegisterInputStream(/* invocationTimes= */ 1);
+    assertThat(testVideoGraphFactory.getCapturedFormats()).containsExactly(inputFormat);
+  }
+
   private static PlaybackVideoGraphWrapper createPlaybackVideoGraphWrapper(
       VideoGraph.Factory videoGraphFactory) {
     Context context = ApplicationProvider.getApplicationContext();
@@ -150,6 +239,8 @@ private static class TestVideoGraphFactory implements VideoGraph.Factory {
     @SuppressWarnings("unchecked")
     private final ArgumentCaptor<List<Effect>> effectsCaptor = ArgumentCaptor.forClass(List.class);
 
+    private final ArgumentCaptor<Format> formatCaptor = ArgumentCaptor.forClass(Format.class);
+
     @Override
     public VideoGraph create(
         Context context,
@@ -171,18 +262,22 @@ public boolean supportsMultipleInputs() {
       return false;
     }
 
-    public void verifyRegisteredEffectsMatches(int invocationTimes) {
+    public void verifyRegisterInputStream(int invocationTimes) {
       verify(videoGraph, times(invocationTimes))
           .registerInputStream(
               /* inputIndex= */ anyInt(),
               /* inputType= */ eq(VideoSink.INPUT_TYPE_SURFACE),
-              /* format= */ any(),
+              formatCaptor.capture(),
               effectsCaptor.capture(),
               /* offsetToAddUs= */ anyLong());
     }
 
     public List<List<Effect>> getCapturedEffects() {
       return effectsCaptor.getAllValues();
     }
+
+    public List<Format> getCapturedFormats() {
+      return formatCaptor.getAllValues();
+    }
   }
 }

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

@@ -212,6 +212,8 @@ private void setCompositionInternal(Composition composition) {
     playbackVideoGraphWrapper.setCompositorSettings(composition.videoCompositorSettings);
     playbackVideoGraphWrapper.setRequestOpenGlToneMapping(
         composition.hdrMode == Composition.HDR_MODE_TONE_MAP_HDR_TO_SDR_USING_OPEN_GL);
+    playbackVideoGraphWrapper.setIsInputSdrToneMapped(
+        composition.hdrMode == Composition.HDR_MODE_TONE_MAP_HDR_TO_SDR_USING_MEDIACODEC);
   }
 
   private void releaseInternal(ConditionVariable conditionVariable) {