From 3ebad1533891b2a1e2370129267b716aaaba3dff Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Mon, 4 May 2020 11:04:53 +0100
Subject: [PATCH] Fix usage of deprecated IntDef.

And allow default value constant to be assigned as valid value.

PiperOrigin-RevId: 309708888
---
 .../java/com/google/android/exoplayer2/Player.java    | 11 +++++------
 .../java/com/google/android/exoplayer2/Renderer.java  |  9 ++++++++-
 .../google/android/exoplayer2/SimpleExoPlayer.java    |  9 +++++----
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/Player.java b/library/core/src/main/java/com/google/android/exoplayer2/Player.java
index 83609e90d2..b06484aef2 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/Player.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/Player.java
@@ -23,7 +23,6 @@ import android.view.SurfaceView;
 import android.view.TextureView;
 import androidx.annotation.IntDef;
 import androidx.annotation.Nullable;
-import com.google.android.exoplayer2.C.VideoScalingMode;
 import com.google.android.exoplayer2.audio.AudioAttributes;
 import com.google.android.exoplayer2.audio.AudioListener;
 import com.google.android.exoplayer2.audio.AuxEffectInfo;
@@ -173,14 +172,14 @@ public interface Player {
   interface VideoComponent {
 
     /**
-     * Sets the {@link VideoScalingMode}.
+     * Sets the {@link Renderer.VideoScalingMode}.
      *
-     * @param videoScalingMode The {@link VideoScalingMode}.
+     * @param videoScalingMode The {@link Renderer.VideoScalingMode}.
      */
-    void setVideoScalingMode(@VideoScalingMode int videoScalingMode);
+    void setVideoScalingMode(@Renderer.VideoScalingMode int videoScalingMode);
 
-    /** Returns the {@link VideoScalingMode}. */
-    @VideoScalingMode
+    /** Returns the {@link Renderer.VideoScalingMode}. */
+    @Renderer.VideoScalingMode
     int getVideoScalingMode();
 
     /**
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/Renderer.java b/library/core/src/main/java/com/google/android/exoplayer2/Renderer.java
index 217060647b..fa73f9257d 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/Renderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/Renderer.java
@@ -148,9 +148,16 @@ public interface Renderer extends PlayerMessage.Target {
    * Video scaling modes for {@link MediaCodec}-based renderers. One of {@link
    * #VIDEO_SCALING_MODE_SCALE_TO_FIT} or {@link #VIDEO_SCALING_MODE_SCALE_TO_FIT_WITH_CROPPING}.
    */
+  // VIDEO_SCALING_MODE_DEFAULT is an intentionally duplicated constant.
+  @SuppressWarnings("UniqueConstants")
   @Documented
   @Retention(RetentionPolicy.SOURCE)
-  @IntDef(value = {VIDEO_SCALING_MODE_SCALE_TO_FIT, VIDEO_SCALING_MODE_SCALE_TO_FIT_WITH_CROPPING})
+  @IntDef(
+      value = {
+        VIDEO_SCALING_MODE_DEFAULT,
+        VIDEO_SCALING_MODE_SCALE_TO_FIT,
+        VIDEO_SCALING_MODE_SCALE_TO_FIT_WITH_CROPPING
+      })
   @interface VideoScalingMode {}
   /** See {@link MediaCodec#VIDEO_SCALING_MODE_SCALE_TO_FIT}. */
   @SuppressWarnings("deprecation")
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java b/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
index 56c4d751ff..c067a05925 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
@@ -367,7 +367,7 @@ public class SimpleExoPlayer extends BasePlayer
   @Nullable private VideoDecoderOutputBufferRenderer videoDecoderOutputBufferRenderer;
   @Nullable private Surface surface;
   private boolean ownsSurface;
-  private @C.VideoScalingMode int videoScalingMode;
+  @Renderer.VideoScalingMode private int videoScalingMode;
   @Nullable private SurfaceHolder surfaceHolder;
   @Nullable private TextureView textureView;
   private int surfaceWidth;
@@ -510,10 +510,10 @@ public class SimpleExoPlayer extends BasePlayer
    * <p>Note that the scaling mode only applies if a {@link MediaCodec}-based video {@link Renderer}
    * is enabled and if the output surface is owned by a {@link android.view.SurfaceView}.
    *
-   * @param videoScalingMode The video scaling mode.
+   * @param videoScalingMode The {@link Renderer.VideoScalingMode}.
    */
   @Override
-  public void setVideoScalingMode(@C.VideoScalingMode int videoScalingMode) {
+  public void setVideoScalingMode(@Renderer.VideoScalingMode int videoScalingMode) {
     verifyApplicationThread();
     this.videoScalingMode = videoScalingMode;
     for (Renderer renderer : renderers) {
@@ -528,7 +528,8 @@ public class SimpleExoPlayer extends BasePlayer
   }
 
   @Override
-  public @C.VideoScalingMode int getVideoScalingMode() {
+  @Renderer.VideoScalingMode
+  public int getVideoScalingMode() {
     return videoScalingMode;
   }