From 9b2cd6a4e9ef20c81880d726685f098bbb67c95b Mon Sep 17 00:00:00 2001
From: kimvde <kimvde@google.com>
Date: Fri, 27 Aug 2021 15:42:20 +0100
Subject: [PATCH] Fix NPE in TransformerTranscodingVideoRenderer

The NPE was caused by the fact that the encoder surface was passed to
the decoder before configuring the encoder.

PiperOrigin-RevId: 393349794
---
 .../transformer/TransformerTranscodingVideoRenderer.java  | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/TransformerTranscodingVideoRenderer.java b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/TransformerTranscodingVideoRenderer.java
index 545bbc6fc7..3122371b07 100644
--- a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/TransformerTranscodingVideoRenderer.java
+++ b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/TransformerTranscodingVideoRenderer.java
@@ -69,14 +69,12 @@ import java.nio.ByteBuffer;
       return;
     }
 
-    if (!ensureDecoderConfigured()) {
+    if (!ensureEncoderConfigured() || !ensureDecoderConfigured()) {
       return;
     }
 
-    if (ensureEncoderConfigured()) {
-      while (feedMuxerFromEncoder()) {}
-      while (feedEncoderFromDecoder()) {}
-    }
+    while (feedMuxerFromEncoder()) {}
+    while (feedEncoderFromDecoder()) {}
     while (feedDecoderFromInput()) {}
   }