From 3a23383bc3e7ebda0743e7d36eab29c507903026 Mon Sep 17 00:00:00 2001
From: kimvde <kimvde@google.com>
Date: Thu, 27 Jan 2022 21:40:34 +0000
Subject: [PATCH] Fix NPE in Transformer.getProgress()

If muxerWrapper.release() was throwing an exception, the progress state
was not updated and getProgress could throw an exception.

#minor-release

PiperOrigin-RevId: 424696783
---
 .../src/main/java/androidx/media3/transformer/Transformer.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/Transformer.java b/libraries/transformer/src/main/java/androidx/media3/transformer/Transformer.java
index be2601f72c..26969d2211 100644
--- a/libraries/transformer/src/main/java/androidx/media3/transformer/Transformer.java
+++ b/libraries/transformer/src/main/java/androidx/media3/transformer/Transformer.java
@@ -776,6 +776,7 @@ public final class Transformer {
    */
   private void releaseResources(boolean forCancellation) throws TransformationException {
     verifyApplicationThread();
+    progressState = PROGRESS_STATE_NO_TRANSFORMATION;
     if (player != null) {
       player.release();
       player = null;
@@ -789,7 +790,6 @@ public final class Transformer {
       }
       muxerWrapper = null;
     }
-    progressState = PROGRESS_STATE_NO_TRANSFORMATION;
   }
 
   private void verifyApplicationThread() {