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 71bc09c6d1..73ced8b10d 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 final class CastPlayer extends BasePlayer {
 
   /** 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 90289a6fca..887ca7b082 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 class ForwardingPlayer implements Player {
     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 9c384ef5f5..a8fa9873f6 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 @@ public interface Player {
    *
    * @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 c56347edda..2437262315 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 abstract class SimpleBasePlayer extends BasePlayer {
   }
 
   @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 6f60dc4247..0a91d7b693 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 @@ import java.util.concurrent.TimeoutException;
   }
 
   @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 0f0e334246..589780dfb6 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 class SimpleExoPlayer extends BasePlayer
   }
 
   @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 ae245c5d8c..f60a65ce32 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 class StubPlayer extends BasePlayer {
   }
 
   @Override
-  public Size getVideoSurfaceSize() {
+  public Size getSurfaceSize() {
     throw new UnsupportedOperationException();
   }