From 8a02b44c96f6626ce9942b64bdf84726f4676f9e Mon Sep 17 00:00:00 2001
From: samrobinson <samrobinson@google.com>
Date: Wed, 5 Jun 2024 08:42:28 -0700
Subject: [PATCH] Refactor trim optimization getProgress for improved
 readability.

This change is a no-op refactor to improve the readability of the
states returned in this method.

PiperOrigin-RevId: 640538374
---
 .../media3/transformer/Transformer.java       | 38 ++++++++++++-------
 1 file changed, 24 insertions(+), 14 deletions(-)

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 3182a77114..fdf4477fa6 100644
--- a/libraries/transformer/src/main/java/androidx/media3/transformer/Transformer.java
+++ b/libraries/transformer/src/main/java/androidx/media3/transformer/Transformer.java
@@ -1196,13 +1196,18 @@ public final class Transformer {
       }
       @ProgressState
       int processMediaStartProgressState = transformerInternal.getProgress(progressHolder);
-      if (processMediaStartProgressState == PROGRESS_STATE_NOT_STARTED) {
-        return PROGRESS_STATE_WAITING_FOR_AVAILABILITY;
+      switch (processMediaStartProgressState) {
+        case PROGRESS_STATE_NOT_STARTED:
+        case PROGRESS_STATE_WAITING_FOR_AVAILABILITY:
+          return PROGRESS_STATE_WAITING_FOR_AVAILABILITY;
+        case PROGRESS_STATE_AVAILABLE:
+          progressHolder.progress = round(progressHolder.progress * transcodeWeighting);
+          return PROGRESS_STATE_AVAILABLE;
+        case PROGRESS_STATE_UNAVAILABLE:
+          return PROGRESS_STATE_UNAVAILABLE;
+        default:
+          throw new IllegalStateException();
       }
-      if (processMediaStartProgressState == PROGRESS_STATE_AVAILABLE) {
-        progressHolder.progress = round(progressHolder.progress * transcodeWeighting);
-      }
-      return processMediaStartProgressState;
     }
 
     float fullTranscodeProgress = 100 * transcodeWeighting;
@@ -1213,15 +1218,20 @@ public final class Transformer {
     }
     @ProgressState
     int remuxRemainingMediaProgressState = transformerInternal.getProgress(progressHolder);
-    if (remuxRemainingMediaProgressState == PROGRESS_STATE_NOT_STARTED
-        || remuxRemainingMediaProgressState == PROGRESS_STATE_WAITING_FOR_AVAILABILITY) {
-      progressHolder.progress = round(fullTranscodeProgress);
-      return PROGRESS_STATE_AVAILABLE;
-    } else if (remuxRemainingMediaProgressState == PROGRESS_STATE_AVAILABLE) {
-      progressHolder.progress =
-          round(fullTranscodeProgress + (1 - transcodeWeighting) * progressHolder.progress);
+    switch (remuxRemainingMediaProgressState) {
+      case PROGRESS_STATE_NOT_STARTED:
+      case PROGRESS_STATE_WAITING_FOR_AVAILABILITY:
+        progressHolder.progress = round(fullTranscodeProgress);
+        return PROGRESS_STATE_AVAILABLE;
+      case PROGRESS_STATE_AVAILABLE:
+        progressHolder.progress =
+            round(fullTranscodeProgress + (1 - transcodeWeighting) * progressHolder.progress);
+        return PROGRESS_STATE_AVAILABLE;
+      case PROGRESS_STATE_UNAVAILABLE:
+        return PROGRESS_STATE_UNAVAILABLE;
+      default:
+        throw new IllegalStateException();
     }
-    return remuxRemainingMediaProgressState;
   }
 
   /**