From 6108c053ce5d0090dbcd8c4ffa27cbbd8b53f8df Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Tue, 15 Nov 2022 16:51:12 +0000
Subject: [PATCH] Rename getVideoSurfaceSize to getSurfaceSize

This better matches the callback name (onSurfaceSizeChanged) and
probably cause less confusion with getVideoSize.

PiperOrigin-RevId: 488669786
(cherry picked from commit 8438daca1f8cbea24aa414ee500044baf1a28367)
---
 .../com/google/android/exoplayer2/ext/cast/CastPlayer.java  | 2 +-
 .../com/google/android/exoplayer2/ForwardingPlayer.java     | 6 +++---
 .../src/main/java/com/google/android/exoplayer2/Player.java | 2 +-
 .../com/google/android/exoplayer2/SimpleBasePlayer.java     | 2 +-
 .../java/com/google/android/exoplayer2/ExoPlayerImpl.java   | 2 +-
 .../java/com/google/android/exoplayer2/SimpleExoPlayer.java | 4 ++--
 .../com/google/android/exoplayer2/testutil/StubPlayer.java  | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastPlayer.java b/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastPlayer.java
index 71bc09c6d17..73ced8b10dc 100644
--- a/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastPlayer.java
+++ b/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastPlayer.java
@@ -728,7 +728,7 @@ public VideoSize getVideoSize() {
 
   /** This method is not supported and returns {@link Size#UNKNOWN}. */
   @Override
-  public Size getVideoSurfaceSize() {
+  public Size getSurfaceSize() {
     return Size.UNKNOWN;
   }
 
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/ForwardingPlayer.java b/library/common/src/main/java/com/google/android/exoplayer2/ForwardingPlayer.java
index 90289a6fcab..887ca7b082a 100644
--- a/library/common/src/main/java/com/google/android/exoplayer2/ForwardingPlayer.java
+++ b/library/common/src/main/java/com/google/android/exoplayer2/ForwardingPlayer.java
@@ -762,10 +762,10 @@ public VideoSize getVideoSize() {
     return player.getVideoSize();
   }
 
-  /** Calls {@link Player#getVideoSurfaceSize()} on the delegate and returns the result. */
+  /** Calls {@link Player#getSurfaceSize()} on the delegate and returns the result. */
   @Override
-  public Size getVideoSurfaceSize() {
-    return player.getVideoSurfaceSize();
+  public Size getSurfaceSize() {
+    return player.getSurfaceSize();
   }
 
   /** Calls {@link Player#clearVideoSurface()} on the delegate. */
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/Player.java b/library/common/src/main/java/com/google/android/exoplayer2/Player.java
index 9c384ef5f55..a8fa9873f67 100644
--- a/library/common/src/main/java/com/google/android/exoplayer2/Player.java
+++ b/library/common/src/main/java/com/google/android/exoplayer2/Player.java
@@ -2477,7 +2477,7 @@ default void onMetadata(Metadata metadata) {}
    *
    * @see Listener#onSurfaceSizeChanged(int, int)
    */
-  Size getVideoSurfaceSize();
+  Size getSurfaceSize();
 
   /** Returns the current {@link CueGroup}. */
   CueGroup getCurrentCues();
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/SimpleBasePlayer.java b/library/common/src/main/java/com/google/android/exoplayer2/SimpleBasePlayer.java
index c56347eddaf..24372623157 100644
--- a/library/common/src/main/java/com/google/android/exoplayer2/SimpleBasePlayer.java
+++ b/library/common/src/main/java/com/google/android/exoplayer2/SimpleBasePlayer.java
@@ -592,7 +592,7 @@ public final VideoSize getVideoSize() {
   }
 
   @Override
-  public final Size getVideoSurfaceSize() {
+  public final Size getSurfaceSize() {
     // TODO: implement.
     throw new IllegalStateException();
   }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
index 6f60dc42471..0a91d7b6933 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
@@ -1220,7 +1220,7 @@ public VideoSize getVideoSize() {
   }
 
   @Override
-  public Size getVideoSurfaceSize() {
+  public Size getSurfaceSize() {
     verifyApplicationThread();
     return surfaceSize;
   }
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 0f0e334246c..589780dfb6e 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
@@ -519,9 +519,9 @@ public VideoSize getVideoSize() {
   }
 
   @Override
-  public Size getVideoSurfaceSize() {
+  public Size getSurfaceSize() {
     blockUntilConstructorFinished();
-    return player.getVideoSurfaceSize();
+    return player.getSurfaceSize();
   }
 
   @Override
diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/StubPlayer.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/StubPlayer.java
index ae245c5d8c3..f60a65ce32f 100644
--- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/StubPlayer.java
+++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/StubPlayer.java
@@ -351,7 +351,7 @@ public VideoSize getVideoSize() {
   }
 
   @Override
-  public Size getVideoSurfaceSize() {
+  public Size getSurfaceSize() {
     throw new UnsupportedOperationException();
   }