From 3e9d45f0ea2145bee758371522173e2e8a3347f7 Mon Sep 17 00:00:00 2001
From: huangdarwin <huangdarwin@google.com>
Date: Mon, 21 Feb 2022 14:11:46 +0000
Subject: [PATCH] Transformer: Work around Samsung/OnePlus decoder
 dequeueBuffer failed.

#mse-bug-week

PiperOrigin-RevId: 430028245
---
 .../media3/transformer/VideoTranscodingSamplePipeline.java   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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 6362378472..17431ea26d 100644
--- a/libraries/transformer/src/main/java/androidx/media3/transformer/VideoTranscodingSamplePipeline.java
+++ b/libraries/transformer/src/main/java/androidx/media3/transformer/VideoTranscodingSamplePipeline.java
@@ -197,7 +197,10 @@ import org.checkerframework.dataflow.qual.Pure;
       return false;
     }
 
-    if (SDK_INT >= 29) {
+    if (SDK_INT >= 29
+        && !(("samsung".equals(Util.MANUFACTURER) || "OnePlus".equals(Util.MANUFACTURER))
+            && SDK_INT < 31)) {
+      // TODO(b/213455700): Fix Samsung and OnePlus devices filling the decoder in processDataV29().
       return processDataV29();
     } else {
       return processDataDefault();