From daf1e5e2eb536d6f4fa6ccb2b7234d474bfcd248 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Tue, 30 Aug 2022 11:02:46 +0000
Subject: [PATCH] Update color info mismatch test

This should now expect transformation to succeed.

PiperOrigin-RevId: 470950411
---
 .../mh/SetHdrEditingTransformationTest.java   | 22 +++++--------------
 .../media3/transformer/DefaultCodec.java      |  2 +-
 2 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/SetHdrEditingTransformationTest.java b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/SetHdrEditingTransformationTest.java
index 68b9fdcf3c..e72544d6c1 100644
--- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/SetHdrEditingTransformationTest.java
+++ b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/SetHdrEditingTransformationTest.java
@@ -17,14 +17,11 @@ package androidx.media3.transformer.mh;
 
 import static androidx.media3.transformer.AndroidTestUtil.MP4_ASSET_1080P_1_SECOND_HDR10_VIDEO_SDR_CONTAINER;
 import static androidx.media3.transformer.AndroidTestUtil.recordTestSkipped;
-import static com.google.common.truth.Truth.assertThat;
-import static org.junit.Assert.assertThrows;
 
 import android.content.Context;
 import android.net.Uri;
 import androidx.media3.common.MediaItem;
 import androidx.media3.common.util.Util;
-import androidx.media3.transformer.TransformationException;
 import androidx.media3.transformer.TransformationRequest;
 import androidx.media3.transformer.Transformer;
 import androidx.media3.transformer.TransformerAndroidTestRunner;
@@ -37,7 +34,7 @@ import org.junit.runner.RunWith;
 @RunWith(AndroidJUnit4.class)
 public class SetHdrEditingTransformationTest {
   @Test
-  public void videoDecoderUnexpectedColorInfo_completesWithError() throws Exception {
+  public void transformUnexpectedColorInfo() throws Exception {
     Context context = ApplicationProvider.getApplicationContext();
     if (Util.SDK_INT < 29) {
       recordTestSkipped(
@@ -53,17 +50,10 @@ public class SetHdrEditingTransformationTest {
             .setTransformationRequest(
                 new TransformationRequest.Builder().experimental_setEnableHdrEditing(true).build())
             .build();
-    TransformationException exception =
-        assertThrows(
-            TransformationException.class,
-            () ->
-                new TransformerAndroidTestRunner.Builder(context, transformer)
-                    .build()
-                    .run(
-                        /* testId= */ "videoDecoderUnexpectedColorInfo_completesWithError",
-                        MediaItem.fromUri(
-                            Uri.parse(MP4_ASSET_1080P_1_SECOND_HDR10_VIDEO_SDR_CONTAINER))));
-    assertThat(exception).hasCauseThat().isInstanceOf(IllegalStateException.class);
-    assertThat(exception.errorCode).isEqualTo(TransformationException.ERROR_CODE_DECODING_FAILED);
+    new TransformerAndroidTestRunner.Builder(context, transformer)
+        .build()
+        .run(
+            /* testId= */ "transformUnexpectedColorInfo",
+            MediaItem.fromUri(Uri.parse(MP4_ASSET_1080P_1_SECOND_HDR10_VIDEO_SDR_CONTAINER)));
   }
 }
diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/DefaultCodec.java b/libraries/transformer/src/main/java/androidx/media3/transformer/DefaultCodec.java
index a4266842d5..ffb8ed106d 100644
--- a/libraries/transformer/src/main/java/androidx/media3/transformer/DefaultCodec.java
+++ b/libraries/transformer/src/main/java/androidx/media3/transformer/DefaultCodec.java
@@ -330,7 +330,7 @@ public final class DefaultCodec implements Codec {
             isToneMappingEnabled ? ColorInfo.SDR_BT709_LIMITED : configurationFormat.colorInfo;
         if (!areColorTransfersEqual(expectedColorInfo, outputFormat.colorInfo)) {
           // TODO(b/237674316): The container ColorInfo's transfer doesn't match the decoder output
-          //   MediaFormat, or we requested tone-mapping but it hasn't bee applied. We should
+          //   MediaFormat, or we requested tone-mapping but it hasn't been applied. We should
           //   reconfigure downstream components for this case instead.
           Log.w(
               TAG,