From 27c1876c9f319a41b59c688eab373d4d27130db3 Mon Sep 17 00:00:00 2001 From: andrewlewis Date: Thu, 21 Apr 2022 15:08:05 +0100 Subject: [PATCH] Expand Samsung/1+ workaround to API 31 + 32 The issue with decoding getting stuck is still reproducible on `samsung/beyond1lteeea/beyond1:12/SP1A.210812.016/G973FXXUEGULB:user/release-keys`. PiperOrigin-RevId: 443368546 --- .../media3/transformer/VideoTranscodingSamplePipeline.java | 2 +- 1 file changed, 1 insertion(+), 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 bd8b593582..3f2b492a47 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/VideoTranscodingSamplePipeline.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/VideoTranscodingSamplePipeline.java @@ -271,7 +271,7 @@ import org.checkerframework.dataflow.qual.Pure; // TODO(b/226330223): Investigate increasing this limit. return 1; } - if (Util.SDK_INT < 31 + if (Util.SDK_INT < 33 && ("OnePlus".equals(Util.MANUFACTURER) || "samsung".equals(Util.MANUFACTURER))) { // Some OMX decoders don't correctly track their number of output buffers available, and get // stuck if too many frames are rendered without being processed, so we limit the number of