From 7df09fe4b7ad1ade1cc3f65ae0394dc95672cc53 Mon Sep 17 00:00:00 2001 From: andrewlewis Date: Tue, 11 Jul 2023 13:32:28 +0100 Subject: [PATCH] Disable codec tone-mapping on Fold 4 API 33 The codec plugin sets crop values incorrectly. PiperOrigin-RevId: 547160088 --- .../androidx/media3/transformer/DefaultDecoderFactory.java | 7 +++++++ 1 file changed, 7 insertions(+) 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 9baacc4332..2165207d2a 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/DefaultDecoderFactory.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/DefaultDecoderFactory.java @@ -184,6 +184,13 @@ public final class DefaultDecoderFactory implements Codec.DecoderFactory { // works on PQ (see b/282791751#comment7). return true; } + if (SDK_INT < 34 + && colorTransfer == C.COLOR_TRANSFER_ST2084 + && Util.MODEL.startsWith("SM-F936")) { + // The Samsung Fold 4 HDR10 codec plugin for tonemapping sets incorrect crop values, so block + // using it (see b/290725189). + return true; + } return false; }