From 756845426ba1b82eb2c09a0b74203e92a47fed1c Mon Sep 17 00:00:00 2001 From: huangdarwin Date: Wed, 5 Jul 2023 13:05:51 +0000 Subject: [PATCH] HDR: Add SM-X900 to HLG10 tone mapping blocklist. PiperOrigin-RevId: 545647083 --- .../androidx/media3/transformer/DefaultDecoderFactory.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/DefaultDecoderFactory.java b/libraries/transformer/src/main/java/androidx/media3/transformer/DefaultDecoderFactory.java index deca6eb9e7..122ed1f2d1 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/DefaultDecoderFactory.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/DefaultDecoderFactory.java @@ -181,7 +181,9 @@ public final class DefaultDecoderFactory implements Codec.DecoderFactory { return true; } if (colorTransfer == C.COLOR_TRANSFER_HLG - && (Util.MODEL.startsWith("SM-F936") || Util.MODEL.startsWith("SM-F916"))) { + && (Util.MODEL.startsWith("SM-F936") + || Util.MODEL.startsWith("SM-F916") + || Util.MODEL.equals("SM-X900"))) { // Some Samsung Galaxy Z Fold devices report support for HLG tone mapping but the feature only // works on PQ (see b/282791751#comment7). return true;