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 7b71200a7d..da3b1836e4 100644
--- a/libraries/common/src/main/java/androidx/media3/common/Player.java
+++ b/libraries/common/src/main/java/androidx/media3/common/Player.java
@@ -3326,6 +3326,12 @@ public interface Player {
    * Sets the {@link TextureView} onto which video will be rendered. The player will track the
    * lifecycle of the surface automatically.
    *
+   * <p>Consider using {@link SurfaceView} via {@link #setVideoSurfaceView} instead of {@link
+   * TextureView}. {@link SurfaceView} generally causes lower battery consumption, and has better
+   * handling for HDR and secure content. See <a
+   * href="https://developer.android.com/guide/topics/media/ui/playerview#surfacetype">Choosing a
+   * surface type</a> for more information.
+   *
    * <p>The thread that calls the {@link TextureView.SurfaceTextureListener} methods must be the
    * thread associated with {@link #getApplicationLooper()}.
    *
diff --git a/libraries/ui/src/main/java/androidx/media3/ui/PlayerView.java b/libraries/ui/src/main/java/androidx/media3/ui/PlayerView.java
index caa827f0c4..5b6e962b63 100644
--- a/libraries/ui/src/main/java/androidx/media3/ui/PlayerView.java
+++ b/libraries/ui/src/main/java/androidx/media3/ui/PlayerView.java
@@ -146,8 +146,9 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
  *       values are {@code surface_view}, {@code texture_view}, {@code spherical_gl_surface_view},
  *       {@code video_decoder_gl_surface_view} and {@code none}. Using {@code none} is recommended
  *       for audio only applications, since creating the surface can be expensive. Using {@code
- *       surface_view} is recommended for video applications. Note, TextureView can only be used in
- *       a hardware accelerated window. When rendered in software, TextureView will draw nothing.
+ *       surface_view} is recommended for video applications. See <a
+ *       href="https://developer.android.com/guide/topics/media/ui/playerview#surfacetype">Choosing
+ *       a surface type</a> for more information.
  *       <ul>
  *         <li>Corresponding method: None
  *         <li>Default: {@code surface_view}