From 96f8771de0bb0083373ccfc62f94f989e56772c9 Mon Sep 17 00:00:00 2001
From: hschlueter <hschlueter@google.com>
Date: Fri, 18 Mar 2022 14:10:07 +0000
Subject: [PATCH] Always use FrameEditor for Nexus 5 and Moto Z Play.

PiperOrigin-RevId: 435628703
---
 .../VideoTranscodingSamplePipeline.java            | 14 +++++++++++++-
 1 file changed, 13 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 3585f73b4a..0b25425bd9 100644
--- a/libraries/transformer/src/main/java/androidx/media3/transformer/VideoTranscodingSamplePipeline.java
+++ b/libraries/transformer/src/main/java/androidx/media3/transformer/VideoTranscodingSamplePipeline.java
@@ -101,7 +101,8 @@ import org.checkerframework.dataflow.qual.Pure;
     if (transformationRequest.enableHdrEditing
         || inputFormat.height != encoderSupportedFormat.height
         || inputFormat.width != encoderSupportedFormat.width
-        || scaleToFitFrameProcessor.shouldProcess()) {
+        || scaleToFitFrameProcessor.shouldProcess()
+        || shouldAlwaysUseFrameEditor()) {
       frameEditor =
           FrameEditor.create(
               context,
@@ -275,6 +276,17 @@ import org.checkerframework.dataflow.qual.Pure;
         .build();
   }
 
+  /** Always use {@link FrameEditor} to work around device-specific encoder issues. */
+  private static boolean shouldAlwaysUseFrameEditor() {
+    switch (Util.MODEL) {
+      case "XT1635-02":
+      case "Nexus 5":
+        return true;
+      default:
+        return false;
+    }
+  }
+
   /**
    * Feeds at most one decoder output frame to the next step of the pipeline.
    *