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 533912fea6..bfb557d4c8 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
@@ -2946,7 +2946,7 @@ import java.util.concurrent.TimeoutException;
     public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) {
       maybeNotifySurfaceSizeChanged(width, height);
       sendRendererMessage(
-          TRACK_TYPE_VIDEO, MSG_SET_VIDEO_OUTPUT_RESOLUTION, Pair.create(width, height));
+          TRACK_TYPE_VIDEO, MSG_SET_VIDEO_OUTPUT_RESOLUTION, new Size(width, height));
     }
 
     @Override
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 14e99bd593..af07ce4525 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
@@ -18,7 +18,6 @@ package com.google.android.exoplayer2;
 import static java.lang.annotation.ElementType.TYPE_USE;
 
 import android.media.MediaCodec;
-import android.util.Pair;
 import android.view.Surface;
 import androidx.annotation.IntDef;
 import androidx.annotation.Nullable;
@@ -28,6 +27,7 @@ import com.google.android.exoplayer2.audio.AuxEffectInfo;
 import com.google.android.exoplayer2.source.SampleStream;
 import com.google.android.exoplayer2.util.Effect;
 import com.google.android.exoplayer2.util.MediaClock;
+import com.google.android.exoplayer2.util.Size;
 import com.google.android.exoplayer2.util.Util;
 import com.google.android.exoplayer2.video.VideoDecoderOutputBufferRenderer;
 import com.google.android.exoplayer2.video.VideoFrameMetadataListener;
@@ -207,9 +207,8 @@ public interface Renderer extends PlayerMessage.Target {
   int MSG_SET_PREFERRED_AUDIO_DEVICE = 12;
   /**
    * The type of a message that can be passed to a video renderer to set the desired output
-   * resolution. The message payload should be a {@link Pair} containing the desired output width
-   * and height, in {@link Integer} instances. Use this method only when playing with video {@link
-   * Effect}.
+   * resolution. The message payload should be a {@link Size} of the desired output width and
+   * height. Use this method only when playing with video {@link Effect}.
    */
   int MSG_SET_VIDEO_OUTPUT_RESOLUTION = 13;
   /**