From 1143edc59ac96ec8524e8203d9445dbb0f006630 Mon Sep 17 00:00:00 2001 From: tonihei 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 --- RELEASENOTES.md | 2 +- .../cast/src/main/java/androidx/media3/cast/CastPlayer.java | 2 +- .../main/java/androidx/media3/common/ForwardingPlayer.java | 6 +++--- .../common/src/main/java/androidx/media3/common/Player.java | 2 +- .../main/java/androidx/media3/common/SimpleBasePlayer.java | 2 +- .../main/java/androidx/media3/exoplayer/ExoPlayerImpl.java | 2 +- .../java/androidx/media3/exoplayer/SimpleExoPlayer.java | 4 ++-- .../main/java/androidx/media3/session/MediaController.java | 6 +++--- .../androidx/media3/session/MediaControllerImplBase.java | 2 +- .../androidx/media3/session/MediaControllerImplLegacy.java | 2 +- .../src/main/java/androidx/media3/session/MockPlayer.java | 2 +- .../main/java/androidx/media3/test/utils/StubPlayer.java | 2 +- 12 files changed, 17 insertions(+), 17 deletions(-) diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 6fb471c892..c844584e99 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -28,7 +28,7 @@ Release notes ([#10667](https://github.com/google/ExoPlayer/issues/10667)). * Enforce minimum `compileSdkVersion` to avoid compilation errors ([#10684](https://github.com/google/ExoPlayer/issues/10684)). - * Add `Player.getVideoSurfaceSize` that returns the size of the surface on + * Add `Player.getSurfaceSize` that returns the size of the surface on which the video is rendered. * Tweak the renderer's decoder ordering logic to uphold the `MediaCodecSelector`'s preferences, even if a decoder reports it may not diff --git a/libraries/cast/src/main/java/androidx/media3/cast/CastPlayer.java b/libraries/cast/src/main/java/androidx/media3/cast/CastPlayer.java index 195f6c62ee..57b81b3fa5 100644 --- a/libraries/cast/src/main/java/androidx/media3/cast/CastPlayer.java +++ b/libraries/cast/src/main/java/androidx/media3/cast/CastPlayer.java @@ -730,7 +730,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/libraries/common/src/main/java/androidx/media3/common/ForwardingPlayer.java b/libraries/common/src/main/java/androidx/media3/common/ForwardingPlayer.java index 6afdb840b5..2640a0a7e4 100644 --- a/libraries/common/src/main/java/androidx/media3/common/ForwardingPlayer.java +++ b/libraries/common/src/main/java/androidx/media3/common/ForwardingPlayer.java @@ -760,10 +760,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/libraries/common/src/main/java/androidx/media3/common/Player.java b/libraries/common/src/main/java/androidx/media3/common/Player.java index d066aa3237..5ad4cf90ad 100644 --- a/libraries/common/src/main/java/androidx/media3/common/Player.java +++ b/libraries/common/src/main/java/androidx/media3/common/Player.java @@ -2519,7 +2519,7 @@ public interface Player { * @see Listener#onSurfaceSizeChanged(int, int) */ @UnstableApi - Size getVideoSurfaceSize(); + Size getSurfaceSize(); /** Returns the current {@link CueGroup}. */ CueGroup getCurrentCues(); diff --git a/libraries/common/src/main/java/androidx/media3/common/SimpleBasePlayer.java b/libraries/common/src/main/java/androidx/media3/common/SimpleBasePlayer.java index c305e76809..f3a073be7f 100644 --- a/libraries/common/src/main/java/androidx/media3/common/SimpleBasePlayer.java +++ b/libraries/common/src/main/java/androidx/media3/common/SimpleBasePlayer.java @@ -591,7 +591,7 @@ public abstract class SimpleBasePlayer extends BasePlayer { } @Override - public final Size getVideoSurfaceSize() { + public final Size getSurfaceSize() { // TODO: implement. throw new IllegalStateException(); } diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/ExoPlayerImpl.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/ExoPlayerImpl.java index f3fc2357e1..1d087d23b3 100644 --- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/ExoPlayerImpl.java +++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/ExoPlayerImpl.java @@ -1231,7 +1231,7 @@ import java.util.concurrent.TimeoutException; } @Override - public Size getVideoSurfaceSize() { + public Size getSurfaceSize() { verifyApplicationThread(); return surfaceSize; } diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/SimpleExoPlayer.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/SimpleExoPlayer.java index 01bc7fe708..c5150e5c7f 100644 --- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/SimpleExoPlayer.java +++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/SimpleExoPlayer.java @@ -530,9 +530,9 @@ public class SimpleExoPlayer extends BasePlayer } @Override - public Size getVideoSurfaceSize() { + public Size getSurfaceSize() { blockUntilConstructorFinished(); - return player.getVideoSurfaceSize(); + return player.getSurfaceSize(); } @Override diff --git a/libraries/session/src/main/java/androidx/media3/session/MediaController.java b/libraries/session/src/main/java/androidx/media3/session/MediaController.java index 37bf64666c..5affe5c695 100644 --- a/libraries/session/src/main/java/androidx/media3/session/MediaController.java +++ b/libraries/session/src/main/java/androidx/media3/session/MediaController.java @@ -1501,9 +1501,9 @@ public class MediaController implements Player { @UnstableApi @Override - public Size getVideoSurfaceSize() { + public Size getSurfaceSize() { verifyApplicationThread(); - return isConnected() ? impl.getVideoSurfaceSize() : Size.UNKNOWN; + return isConnected() ? impl.getSurfaceSize() : Size.UNKNOWN; } @Override @@ -1976,7 +1976,7 @@ public class MediaController implements Player { VideoSize getVideoSize(); - Size getVideoSurfaceSize(); + Size getSurfaceSize(); void clearVideoSurface(); diff --git a/libraries/session/src/main/java/androidx/media3/session/MediaControllerImplBase.java b/libraries/session/src/main/java/androidx/media3/session/MediaControllerImplBase.java index 6b6d2fe7f3..75849ae157 100644 --- a/libraries/session/src/main/java/androidx/media3/session/MediaControllerImplBase.java +++ b/libraries/session/src/main/java/androidx/media3/session/MediaControllerImplBase.java @@ -1566,7 +1566,7 @@ import org.checkerframework.checker.nullness.qual.NonNull; } @Override - public Size getVideoSurfaceSize() { + public Size getSurfaceSize() { return surfaceSize; } diff --git a/libraries/session/src/main/java/androidx/media3/session/MediaControllerImplLegacy.java b/libraries/session/src/main/java/androidx/media3/session/MediaControllerImplLegacy.java index aafc21450a..2c670fa855 100644 --- a/libraries/session/src/main/java/androidx/media3/session/MediaControllerImplLegacy.java +++ b/libraries/session/src/main/java/androidx/media3/session/MediaControllerImplLegacy.java @@ -963,7 +963,7 @@ import org.checkerframework.checker.nullness.compatqual.NullableType; } @Override - public Size getVideoSurfaceSize() { + public Size getSurfaceSize() { Log.w(TAG, "Session doesn't support getting VideoSurfaceSize"); return Size.UNKNOWN; } diff --git a/libraries/test_session_current/src/main/java/androidx/media3/session/MockPlayer.java b/libraries/test_session_current/src/main/java/androidx/media3/session/MockPlayer.java index 2f1460035e..23e30bf4b8 100644 --- a/libraries/test_session_current/src/main/java/androidx/media3/session/MockPlayer.java +++ b/libraries/test_session_current/src/main/java/androidx/media3/session/MockPlayer.java @@ -1138,7 +1138,7 @@ public class MockPlayer implements Player { } @Override - public Size getVideoSurfaceSize() { + public Size getSurfaceSize() { return surfaceSize; } diff --git a/libraries/test_utils/src/main/java/androidx/media3/test/utils/StubPlayer.java b/libraries/test_utils/src/main/java/androidx/media3/test/utils/StubPlayer.java index 77a9a609c9..8638745a56 100644 --- a/libraries/test_utils/src/main/java/androidx/media3/test/utils/StubPlayer.java +++ b/libraries/test_utils/src/main/java/androidx/media3/test/utils/StubPlayer.java @@ -353,7 +353,7 @@ public class StubPlayer extends BasePlayer { } @Override - public Size getVideoSurfaceSize() { + public Size getSurfaceSize() { throw new UnsupportedOperationException(); }