From 1df2210cf4bcce91d36f3f59c47d4dc8b1d5fad0 Mon Sep 17 00:00:00 2001 From: huangdarwin Date: Wed, 27 Sep 2023 12:02:28 -0700 Subject: [PATCH] Test: Update HDR GL tone-map fallback string. PiperOrigin-RevId: 568920716 --- .../media3/transformer/mh/HdrEditingTest.java | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/HdrEditingTest.java b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/HdrEditingTest.java index 18cc0a4d08..d542a1f46b 100644 --- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/HdrEditingTest.java +++ b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/HdrEditingTest.java @@ -271,11 +271,9 @@ public final class HdrEditingTest { if (exception.getCause() != null && (Objects.equals( exception.getCause().getMessage(), - "Tone-mapping HDR is not supported on this device.") + "Decoding HDR is not supported on this device.") || Objects.equals( - exception.getCause().getMessage(), - "Tone-mapping requested but not supported by the decoder."))) { - // Expected on devices without a tone-mapping plugin for the this codec. + exception.getCause().getMessage(), "Device lacks YUV extension support."))) { return; } throw exception; @@ -303,7 +301,6 @@ public final class HdrEditingTest { return; } - AtomicBoolean isFallbackListenerInvoked = new AtomicBoolean(); AtomicBoolean isToneMappingFallbackApplied = new AtomicBoolean(); Transformer transformer = new Transformer.Builder(context) @@ -314,7 +311,6 @@ public final class HdrEditingTest { MediaItem inputMediaItem, TransformationRequest originalTransformationRequest, TransformationRequest fallbackTransformationRequest) { - isFallbackListenerInvoked.set(true); assertThat(originalTransformationRequest.hdrMode).isEqualTo(HDR_MODE_KEEP_HDR); isToneMappingFallbackApplied.set( fallbackTransformationRequest.hdrMode @@ -337,11 +333,9 @@ public final class HdrEditingTest { if (exception.getCause() != null && (Objects.equals( exception.getCause().getMessage(), - "Tone-mapping HDR is not supported on this device.") + "Decoding HDR is not supported on this device.") || Objects.equals( - exception.getCause().getMessage(), - "Tone-mapping requested but not supported by the decoder."))) { - // Expected on devices without a tone-mapping plugin for this codec. + exception.getCause().getMessage(), "Device lacks YUV extension support."))) { return; } throw exception;