From 9b81c2d114d815b39cec4bd06e21a245a6f0f11f Mon Sep 17 00:00:00 2001 From: huangdarwin Date: Tue, 1 Nov 2022 18:09:01 +0000 Subject: [PATCH] HDR: Generalize Pixel 6 workaround to TP PiperOrigin-RevId: 485366659 (cherry picked from commit a65ff85a98f25ae73a08842f1f3f6c5d1433e7e9) --- .../media3/transformer/VideoTranscodingSamplePipeline.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/VideoTranscodingSamplePipeline.java b/libraries/transformer/src/main/java/androidx/media3/transformer/VideoTranscodingSamplePipeline.java index 2c786483dc..6d91aff09f 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/VideoTranscodingSamplePipeline.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/VideoTranscodingSamplePipeline.java @@ -293,8 +293,8 @@ import org.checkerframework.dataflow.qual.Pure; } private static boolean deviceNeedsNoToneMappingWorkaround() { - // Pixel build ID does not support tone mapping. See http://b/249297370#comment8. - return Build.ID.startsWith("TP1A.220905.004"); + // Pixel build ID prefix does not support tone mapping. See http://b/249297370#comment8. + return Util.MANUFACTURER.equals("Google") && Build.ID.startsWith("TP1A"); } /**