From 253486d4af057776da0eb5926e31190f43dbe3b3 Mon Sep 17 00:00:00 2001
From: huangdarwin <huangdarwin@google.com>
Date: Tue, 4 Oct 2022 13:01:27 +0000
Subject: [PATCH] HDR: Check isToneMappingApplied in HDR editing test.

Assert that tone mapping is applied when an HDR edit cannot be HDR, but is successfully tone mapped. Meanwhile, assert that fallback, which is applied after codec configuration (which throws the "Tone-mapping requested but not supported by the decoder" error) is not applied when that error is called.

PiperOrigin-RevId: 478762951
---
 .../transformer/mh/SetHdrEditingTest.java     | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/SetHdrEditingTest.java b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/SetHdrEditingTest.java
index ff5914aaa3..a62ba5acd1 100644
--- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/SetHdrEditingTest.java
+++ b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/SetHdrEditingTest.java
@@ -85,8 +85,9 @@ public class SetHdrEditingTest {
   }
 
   @Test
-  public void transformAndTranscode_hdr10File_whenHdrEditingIsSupported() throws Exception {
-    String testId = "transformAndTranscode_hdr10File_whenHdrEditingIsSupported";
+  public void transformAndTranscode_hdr10File_whenHdrEditingIsSupported_transforms()
+      throws Exception {
+    String testId = "transformAndTranscode_hdr10File_whenHdrEditingIsSupported_transforms";
     Context context = ApplicationProvider.getApplicationContext();
     if (!deviceSupportsHdrEditing(VIDEO_H265, HDR10_DEFAULT_COLOR_INFO)) {
       recordTestSkipped(context, testId, /* reason= */ "Device lacks HDR10 editing support.");
@@ -110,15 +111,16 @@ public class SetHdrEditingTest {
   }
 
   @Test
-  public void transformAndTranscode_hdr10File_toneMapsOrThrows_whenHdrEditingUnsupported()
+  public void transformAndTranscode_hdr10File_whenHdrEditingUnsupported_toneMapsOrThrows()
       throws Exception {
-    String testId = "transformAndTranscode_hdr10File_toneMapsOrThrows_whenHdrEditingUnsupported";
+    String testId = "transformAndTranscode_hdr10File_whenHdrEditingUnsupported_toneMapsOrThrows";
     Context context = ApplicationProvider.getApplicationContext();
     if (deviceSupportsHdrEditing(VIDEO_H265, HDR10_DEFAULT_COLOR_INFO)) {
       recordTestSkipped(context, testId, /* reason= */ "Device supports HDR10 editing.");
       return;
     }
 
+    AtomicBoolean isFallbackListenerInvoked = new AtomicBoolean();
     AtomicBoolean isToneMappingFallbackApplied = new AtomicBoolean();
     Transformer transformer =
         new Transformer.Builder(context)
@@ -134,10 +136,10 @@ public class SetHdrEditingTest {
                       MediaItem inputMediaItem,
                       TransformationRequest originalTransformationRequest,
                       TransformationRequest fallbackTransformationRequest) {
+                    isFallbackListenerInvoked.set(true);
                     assertThat(originalTransformationRequest.enableRequestSdrToneMapping).isFalse();
-                    if (fallbackTransformationRequest.enableRequestSdrToneMapping) {
-                      isToneMappingFallbackApplied.set(true);
-                    }
+                    isToneMappingFallbackApplied.set(
+                        fallbackTransformationRequest.enableRequestSdrToneMapping);
                   }
                 })
             .build();
@@ -148,12 +150,11 @@ public class SetHdrEditingTest {
               .build()
               .run(testId, MediaItem.fromUri(Uri.parse(MP4_ASSET_1080P_4_SECOND_HDR10)));
       Log.i(TAG, "Tone mapped.");
+      assertThat(isToneMappingFallbackApplied.get()).isTrue();
       assertFileHasColorTransfer(transformationTestResult.filePath, C.COLOR_TRANSFER_SDR);
     } catch (TransformationException exception) {
       Log.i(TAG, checkNotNull(exception.getCause()).toString());
       assertThat(exception).hasCauseThat().isInstanceOf(IllegalArgumentException.class);
-      // TODO(b/245364266): After fixing the bug, replace the API version check with a check that
-      // isToneMappingFallbackApplied.get() is true.
       if (Util.SDK_INT < 31) {
         assertThat(exception.errorCode)
             .isEqualTo(TransformationException.ERROR_CODE_HDR_EDITING_UNSUPPORTED);
@@ -168,6 +169,7 @@ public class SetHdrEditingTest {
             .hasCauseThat()
             .hasMessageThat()
             .isEqualTo("Tone-mapping requested but not supported by the decoder.");
+        assertThat(isFallbackListenerInvoked.get()).isFalse();
       }
       return;
     }