From e28d772423780c813f85b6bd3813fd62bc486a69 Mon Sep 17 00:00:00 2001
From: Copybara-Service <copybara-worker@google.com>
Date: Mon, 4 Mar 2024 09:55:00 -0800
Subject: [PATCH] Merge pull request #1025 from v-novaltd:dsparano-exo209

PiperOrigin-RevId: 612485043
(cherry picked from commit bbdaf2b092c1cf909502fc49fb7bedf7a5b5b9b8)
---
 .../media3/exoplayer/util/DebugTextViewHelper.java        | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/util/DebugTextViewHelper.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/util/DebugTextViewHelper.java
index 08a42bfc5c..2e92539fb6 100644
--- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/util/DebugTextViewHelper.java
+++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/util/DebugTextViewHelper.java
@@ -22,6 +22,7 @@ import androidx.annotation.Nullable;
 import androidx.media3.common.ColorInfo;
 import androidx.media3.common.Format;
 import androidx.media3.common.Player;
+import androidx.media3.common.VideoSize;
 import androidx.media3.common.util.Assertions;
 import androidx.media3.common.util.UnstableApi;
 import androidx.media3.exoplayer.DecoderCounters;
@@ -127,6 +128,7 @@ public class DebugTextViewHelper {
   @UnstableApi
   protected String getVideoString() {
     Format format = player.getVideoFormat();
+    VideoSize videoSize = player.getVideoSize();
     DecoderCounters decoderCounters = player.getVideoDecoderCounters();
     if (format == null || decoderCounters == null) {
       return "";
@@ -136,11 +138,11 @@ public class DebugTextViewHelper {
         + "(id:"
         + format.id
         + " r:"
-        + format.width
+        + videoSize.width
         + "x"
-        + format.height
+        + videoSize.height
         + getColorInfoString(format.colorInfo)
-        + getPixelAspectRatioString(format.pixelWidthHeightRatio)
+        + getPixelAspectRatioString(videoSize.pixelWidthHeightRatio)
         + getDecoderCountersBufferCountString(decoderCounters)
         + " vfpo: "
         + getVideoFrameProcessingOffsetAverageString(