From e094ceb079d1226dac4c93690e25f45d4da79de7 Mon Sep 17 00:00:00 2001
From: hschlueter <hschlueter@google.com>
Date: Wed, 15 Dec 2021 22:21:58 +0000
Subject: [PATCH] Use C.LENGTH_UNSET for resolution parameter instead of
 Format.NO_VALUE.

Format.NO_VALUE should only be used for Format fields.

PiperOrigin-RevId: 416646415
---
 .../main/java/androidx/media3/transformer/FrameEditor.java  | 6 +++---
 .../main/java/androidx/media3/transformer/Transformer.java  | 5 ++---
 .../media3/transformer/TransformerVideoRenderer.java        | 2 +-
 .../androidx/media3/transformer/VideoSamplePipeline.java    | 2 +-
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/FrameEditor.java b/libraries/transformer/src/main/java/androidx/media3/transformer/FrameEditor.java
index b76e3c1b87..d5a1e1b904 100644
--- a/libraries/transformer/src/main/java/androidx/media3/transformer/FrameEditor.java
+++ b/libraries/transformer/src/main/java/androidx/media3/transformer/FrameEditor.java
@@ -29,7 +29,7 @@ import android.opengl.GLES20;
 import android.view.Surface;
 import android.view.SurfaceView;
 import androidx.annotation.Nullable;
-import androidx.media3.common.Format;
+import androidx.media3.common.C;
 import androidx.media3.common.util.GlUtil;
 import java.io.IOException;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -109,8 +109,8 @@ import java.util.concurrent.atomic.AtomicInteger;
       debugPreviewHeight = debugSurfaceView.getHeight();
     } else {
       debugPreviewEglSurface = null;
-      debugPreviewWidth = Format.NO_VALUE;
-      debugPreviewHeight = Format.NO_VALUE;
+      debugPreviewWidth = C.LENGTH_UNSET;
+      debugPreviewHeight = C.LENGTH_UNSET;
     }
     return new FrameEditor(
         eglDisplay,
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 3fbc5082cf..6608d19c3e 100644
--- a/libraries/transformer/src/main/java/androidx/media3/transformer/Transformer.java
+++ b/libraries/transformer/src/main/java/androidx/media3/transformer/Transformer.java
@@ -35,7 +35,6 @@ import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
 import androidx.annotation.VisibleForTesting;
 import androidx.media3.common.C;
-import androidx.media3.common.Format;
 import androidx.media3.common.MediaItem;
 import androidx.media3.common.MediaLibraryInfo;
 import androidx.media3.common.MimeTypes;
@@ -115,7 +114,7 @@ public final class Transformer {
     @Deprecated
     public Builder() {
       muxerFactory = new FrameworkMuxer.Factory();
-      outputHeight = Format.NO_VALUE;
+      outputHeight = C.LENGTH_UNSET;
       transformationMatrix = new Matrix();
       containerMimeType = MimeTypes.VIDEO_MP4;
       listener = new Listener() {};
@@ -132,7 +131,7 @@ public final class Transformer {
     public Builder(Context context) {
       this.context = context.getApplicationContext();
       muxerFactory = new FrameworkMuxer.Factory();
-      outputHeight = Format.NO_VALUE;
+      outputHeight = C.LENGTH_UNSET;
       transformationMatrix = new Matrix();
       containerMimeType = MimeTypes.VIDEO_MP4;
       listener = new Listener() {};
diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/TransformerVideoRenderer.java b/libraries/transformer/src/main/java/androidx/media3/transformer/TransformerVideoRenderer.java
index 8e3fe1609d..e2e5d2fcf7 100644
--- a/libraries/transformer/src/main/java/androidx/media3/transformer/TransformerVideoRenderer.java
+++ b/libraries/transformer/src/main/java/androidx/media3/transformer/TransformerVideoRenderer.java
@@ -89,7 +89,7 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
         && !transformation.videoMimeType.equals(inputFormat.sampleMimeType)) {
       return true;
     }
-    if (transformation.outputHeight != Format.NO_VALUE
+    if (transformation.outputHeight != C.LENGTH_UNSET
         && transformation.outputHeight != inputFormat.height) {
       return true;
     }
diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/VideoSamplePipeline.java b/libraries/transformer/src/main/java/androidx/media3/transformer/VideoSamplePipeline.java
index ef589047fb..52705612ce 100644
--- a/libraries/transformer/src/main/java/androidx/media3/transformer/VideoSamplePipeline.java
+++ b/libraries/transformer/src/main/java/androidx/media3/transformer/VideoSamplePipeline.java
@@ -66,7 +66,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
     // TODO(internal b/209781577): Think about which edge length should be set for portrait videos.
     int outputWidth = inputFormat.width;
     int outputHeight = inputFormat.height;
-    if (transformation.outputHeight != Format.NO_VALUE
+    if (transformation.outputHeight != C.LENGTH_UNSET
         && transformation.outputHeight != inputFormat.height) {
       outputWidth = inputFormat.width * transformation.outputHeight / inputFormat.height;
       outputHeight = transformation.outputHeight;