HDR: Generalize Pixel 6 workaround to TP

dway123 · microkatz · commit 9b81c2d114d8 · 2022-11-01T18:09:01.000Z
PiperOrigin-RevId: 485366659 (cherry picked from commit a65ff85)
diff --git 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 @@ private static TransformationRequest createSupportedTransformationRequest(
   }
 
   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");
   }
 
   /**

Original file line number	Diff line number	Diff line change
`@@ -293,8 +293,8 @@ private static TransformationRequest createSupportedTransformationRequest(`
`293`	`293`	`}`
`294`	`294`
`295`	`295`	`private static boolean deviceNeedsNoToneMappingWorkaround() {`
`296`		`- // Pixel build ID does not support tone mapping. See http://b/249297370#comment8.`
`297`		`- return Build.ID.startsWith("TP1A.220905.004");`
	`296`	`+ // Pixel build ID prefix does not support tone mapping. See http://b/249297370#comment8.`
	`297`	`+ return Util.MANUFACTURER.equals("Google") && Build.ID.startsWith("TP1A");`
`298`	`298`	`}`
`299`	`299`
`300`	`300`	`/**`