From 66adeabb1b98a6c899fd63af666f259bc9dfbda6 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
---
 .../google/android/exoplayer2/transformer/FrameEditor.java  | 6 +++---
 .../google/android/exoplayer2/transformer/Transformer.java  | 5 ++---
 .../exoplayer2/transformer/TransformerVideoRenderer.java    | 2 +-
 .../android/exoplayer2/transformer/VideoSamplePipeline.java | 2 +-
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/FrameEditor.java b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/FrameEditor.java
index bce0d98026..6d531237d6 100644
--- a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/FrameEditor.java
+++ b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/FrameEditor.java
@@ -29,7 +29,7 @@ import android.opengl.GLES20;
 import android.view.Surface;
 import android.view.SurfaceView;
 import androidx.annotation.Nullable;
-import com.google.android.exoplayer2.Format;
+import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.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/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/Transformer.java b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/Transformer.java
index 3ceb6710e8..6a0f4ced9a 100644
--- a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/Transformer.java
+++ b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/Transformer.java
@@ -38,7 +38,6 @@ import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.DefaultLoadControl;
 import com.google.android.exoplayer2.ExoPlayer;
 import com.google.android.exoplayer2.ExoPlayerLibraryInfo;
-import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.MediaItem;
 import com.google.android.exoplayer2.PlaybackException;
 import com.google.android.exoplayer2.Player;
@@ -113,7 +112,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() {};
@@ -130,7 +129,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/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/TransformerVideoRenderer.java b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/TransformerVideoRenderer.java
index f88cc1745b..b70fae078a 100644
--- a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/TransformerVideoRenderer.java
+++ b/library/transformer/src/main/java/com/google/android/exoplayer2/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/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/VideoSamplePipeline.java b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/VideoSamplePipeline.java
index 1fc359b4c9..1c621e96d1 100644
--- a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/VideoSamplePipeline.java
+++ b/library/transformer/src/main/java/com/google/android/exoplayer2/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;