From ef39fc70d9643b000d7161725de7b1bd8faca5c7 Mon Sep 17 00:00:00 2001
From: dancho <dancho@google.com>
Date: Fri, 2 May 2025 06:14:30 -0700
Subject: [PATCH] Disable codec reuse when only crop rect changes

Work around a bug where MediaCodec fails to adapt between
formats that have the same decoded picture resolution but
different crop.

Add a playlist of two MP4 files that reproduce the issue.

This CL implements the workaround for H.265 and Mp4

PiperOrigin-RevId: 753976872
---
 demos/main/src/main/assets/media.exolist.json | 11 +++
 .../java/androidx/media3/common/Format.java   | 67 +++++++++++++++++++
 .../media3/container/NalUnitUtil.java         | 27 ++++++--
 .../exoplayer/mediacodec/MediaCodecInfo.java  | 16 ++++-
 .../mediacodec/MediaCodecInfoTest.java        | 19 ++++++
 .../androidx/media3/extractor/HevcConfig.java | 20 +++++-
 .../media3/extractor/mp4/BoxParser.java       |  6 ++
 ...ixel-motion-photo-2-hevc-tracks.jpg.0.dump |  4 ++
 ...ixel-motion-photo-2-hevc-tracks.jpg.1.dump |  4 ++
 ...ixel-motion-photo-2-hevc-tracks.jpg.2.dump |  4 ++
 ...ixel-motion-photo-2-hevc-tracks.jpg.3.dump |  4 ++
 .../mp4/fragmented_captions_h265.mp4.0.dump   |  2 +
 ...ding_within_gop_sample_dependencies.0.dump |  2 +
 ...op_sample_dependencies.unknown_length.dump |  2 +
 ...nted_captions_h265.mp4.unknown_length.dump |  2 +
 .../mp4/h265_bframes.mp4.0.dump               |  2 +
 .../mp4/h265_bframes.mp4.1.dump               |  2 +
 .../mp4/h265_bframes.mp4.2.dump               |  2 +
 .../mp4/h265_bframes.mp4.3.dump               |  2 +
 ...ding_within_gop_sample_dependencies.0.dump |  2 +
 ...ding_within_gop_sample_dependencies.1.dump |  2 +
 ...ding_within_gop_sample_dependencies.2.dump |  2 +
 ...ding_within_gop_sample_dependencies.3.dump |  2 +
 ...op_sample_dependencies.unknown_length.dump |  2 +
 .../mp4/h265_bframes.mp4.unknown_length.dump  |  2 +
 ...ixel-motion-photo-2-hevc-tracks.mp4.0.dump |  4 ++
 ...ixel-motion-photo-2-hevc-tracks.mp4.1.dump |  4 ++
 ...ixel-motion-photo-2-hevc-tracks.mp4.2.dump |  4 ++
 ...ixel-motion-photo-2-hevc-tracks.mp4.3.dump |  4 ++
 ...ding_within_gop_sample_dependencies.0.dump |  4 ++
 ...ding_within_gop_sample_dependencies.1.dump |  4 ++
 ...ding_within_gop_sample_dependencies.2.dump |  4 ++
 ...ding_within_gop_sample_dependencies.3.dump |  4 ++
 ...op_sample_dependencies.unknown_length.dump |  4 ++
 ...hoto-2-hevc-tracks.mp4.unknown_length.dump |  4 ++
 .../mp4/sample_edit_list.mp4.0.dump           |  2 +
 .../mp4/sample_edit_list.mp4.1.dump           |  2 +
 .../mp4/sample_edit_list.mp4.2.dump           |  2 +
 .../mp4/sample_edit_list.mp4.3.dump           |  2 +
 ...ding_within_gop_sample_dependencies.0.dump |  2 +
 ...ding_within_gop_sample_dependencies.1.dump |  2 +
 ...ding_within_gop_sample_dependencies.2.dump |  2 +
 ...ding_within_gop_sample_dependencies.3.dump |  2 +
 ...op_sample_dependencies.unknown_length.dump |  2 +
 .../sample_edit_list.mp4.unknown_length.dump  |  2 +
 ..._list_no_sync_frame_before_edit.mp4.0.dump |  2 +
 ..._list_no_sync_frame_before_edit.mp4.1.dump |  2 +
 ..._list_no_sync_frame_before_edit.mp4.2.dump |  2 +
 ..._list_no_sync_frame_before_edit.mp4.3.dump |  2 +
 ...ding_within_gop_sample_dependencies.0.dump |  2 +
 ...ding_within_gop_sample_dependencies.1.dump |  2 +
 ...ding_within_gop_sample_dependencies.2.dump |  2 +
 ...ding_within_gop_sample_dependencies.3.dump |  2 +
 ...op_sample_dependencies.unknown_length.dump |  2 +
 ..._frame_before_edit.mp4.unknown_length.dump |  2 +
 .../mp4/sample_with_color_info.mp4.0.dump     |  2 +
 .../mp4/sample_with_color_info.mp4.1.dump     |  2 +
 .../mp4/sample_with_color_info.mp4.2.dump     |  2 +
 .../mp4/sample_with_color_info.mp4.3.dump     |  2 +
 ...ding_within_gop_sample_dependencies.0.dump |  2 +
 ...ding_within_gop_sample_dependencies.1.dump |  2 +
 ...ding_within_gop_sample_dependencies.2.dump |  2 +
 ...ding_within_gop_sample_dependencies.3.dump |  2 +
 ...op_sample_dependencies.unknown_length.dump |  2 +
 ...le_with_color_info.mp4.unknown_length.dump |  2 +
 ...riginal_quicktime_specification.mov.0.dump |  2 +
 ...riginal_quicktime_specification.mov.1.dump |  2 +
 ...riginal_quicktime_specification.mov.2.dump |  2 +
 ...riginal_quicktime_specification.mov.3.dump |  2 +
 ...ding_within_gop_sample_dependencies.0.dump |  2 +
 ...ding_within_gop_sample_dependencies.1.dump |  2 +
 ...ding_within_gop_sample_dependencies.2.dump |  2 +
 ...ding_within_gop_sample_dependencies.3.dump |  2 +
 ...op_sample_dependencies.unknown_length.dump |  2 +
 ...time_specification.mov.unknown_length.dump |  2 +
 .../mp4/water_180_mvhevc_5frames.mov.0.dump   |  2 +
 .../mp4/water_180_mvhevc_5frames.mov.1.dump   |  2 +
 .../mp4/water_180_mvhevc_5frames.mov.2.dump   |  2 +
 .../mp4/water_180_mvhevc_5frames.mov.3.dump   |  2 +
 ...ding_within_gop_sample_dependencies.0.dump |  2 +
 ...ding_within_gop_sample_dependencies.1.dump |  2 +
 ...ding_within_gop_sample_dependencies.2.dump |  2 +
 ...ding_within_gop_sample_dependencies.3.dump |  2 +
 ...op_sample_dependencies.unknown_length.dump |  2 +
 ...180_mvhevc_5frames.mov.unknown_length.dump |  2 +
 .../h265_with_metadata_track.mp4.dump         |  2 +
 ...65_with_metadata_track.mp4_fragmented.dump |  2 +
 .../assets/muxerdumps/hdr10-720p.mp4.dump     |  2 +
 .../muxerdumps/hdr10-720p.mp4_fragmented.dump |  2 +
 .../muxerdumps/partial_hdr10-720p.mp4.dump    |  2 +
 ...amable_output_disabled_hdr10-720p.mp4.dump |  2 +
 ...mple_batching_disabled_hdr10-720p.mp4.dump |  2 +
 .../muxerdumps/sample_edit_list.mp4.dump      |  4 ++
 .../sample_edit_list.mp4_fragmented.dump      |  4 ++
 .../transmuxed_with_inappmuxer.dump           |  2 +
 .../transmuxed_with_inappmuxer.dump           |  2 +
 .../media3/test/utils/DumpableFormat.java     |  2 +
 97 files changed, 368 insertions(+), 10 deletions(-)

diff --git a/demos/main/src/main/assets/media.exolist.json b/demos/main/src/main/assets/media.exolist.json
index 5351c6f8b2..fd9ea62324 100644
--- a/demos/main/src/main/assets/media.exolist.json
+++ b/demos/main/src/main/assets/media.exolist.json
@@ -618,6 +618,17 @@
             "image_duration_ms": 2000
           }
         ]
+      },
+      {
+        "name": "Change in crop b/409036359",
+        "playlist": [
+          {
+            "uri": "https://storage.googleapis.com/exoplayer-test-media-1/mp4/bbb_760x480_1mbps_60fps_hevc.mp4"
+          },
+          {
+            "uri": "https://storage.googleapis.com/exoplayer-test-media-1/mp4/bbb_760x480_1mbps_60fps_hevc_pad.mp4"
+          }
+        ]
       }
     ]
   },
diff --git a/libraries/common/src/main/java/androidx/media3/common/Format.java b/libraries/common/src/main/java/androidx/media3/common/Format.java
index 25a490d209..32da706cec 100644
--- a/libraries/common/src/main/java/androidx/media3/common/Format.java
+++ b/libraries/common/src/main/java/androidx/media3/common/Format.java
@@ -97,6 +97,8 @@ import java.util.UUID;
  * <ul>
  *   <li>{@link #width}
  *   <li>{@link #height}
+ *   <li>{@link #decodedWidth}
+ *   <li>{@link #decodedHeight}
  *   <li>{@link #frameRate}
  *   <li>{@link #rotationDegrees}
  *   <li>{@link #pixelWidthHeightRatio}
@@ -174,6 +176,8 @@ public final class Format {
 
     private int width;
     private int height;
+    private int decodedWidth;
+    private int decodedHeight;
     private float frameRate;
     private int rotationDegrees;
     private float pixelWidthHeightRatio;
@@ -216,6 +220,8 @@ public final class Format {
       // Video specific.
       width = NO_VALUE;
       height = NO_VALUE;
+      decodedWidth = NO_VALUE;
+      decodedHeight = NO_VALUE;
       frameRate = NO_VALUE;
       pixelWidthHeightRatio = 1.0f;
       stereoMode = NO_VALUE;
@@ -265,6 +271,8 @@ public final class Format {
       // Video specific.
       this.width = format.width;
       this.height = format.height;
+      this.decodedWidth = format.decodedWidth;
+      this.decodedHeight = format.decodedHeight;
       this.frameRate = format.frameRate;
       this.rotationDegrees = format.rotationDegrees;
       this.pixelWidthHeightRatio = format.pixelWidthHeightRatio;
@@ -588,6 +596,30 @@ public final class Format {
       return this;
     }
 
+    /**
+     * Sets {@link Format#decodedWidth}. The default value is {@link #NO_VALUE}.
+     *
+     * @param decodedWidth The {@link Format#decodedWidth}.
+     * @return The builder.
+     */
+    @CanIgnoreReturnValue
+    public Builder setDecodedWidth(int decodedWidth) {
+      this.decodedWidth = decodedWidth;
+      return this;
+    }
+
+    /**
+     * Sets {@link Format#decodedHeight}. The default value is {@link #NO_VALUE}.
+     *
+     * @param decodedHeight The {@link Format#decodedHeight}.
+     * @return The builder.
+     */
+    @CanIgnoreReturnValue
+    public Builder setDecodedHeight(int decodedHeight) {
+      this.decodedHeight = decodedHeight;
+      return this;
+    }
+
     /**
      * Sets {@link Format#frameRate}. The default value is {@link #NO_VALUE}.
      *
@@ -1000,6 +1032,22 @@ public final class Format {
   /** The height of the video in pixels, or {@link #NO_VALUE} if unknown or not applicable. */
   public final int height;
 
+  /**
+   * The width of the video decoded picture in pixels, or {@link #NO_VALUE} if unknown or not
+   * applicable.
+   *
+   * <p>May be larger than {@link #width} if cropping is applied before display.
+   */
+  @UnstableApi public final int decodedWidth;
+
+  /**
+   * The height of the video decoded picture in pixels, or {@link #NO_VALUE} if unknown or not
+   * applicable.
+   *
+   * <p>May be larger than {@link #height} if cropping is applied before display.
+   */
+  @UnstableApi public final int decodedHeight;
+
   /** The frame rate in frames per second, or {@link #NO_VALUE} if unknown or not applicable. */
   public final float frameRate;
 
@@ -1145,6 +1193,8 @@ public final class Format {
     // Video specific.
     width = builder.width;
     height = builder.height;
+    decodedWidth = builder.decodedWidth;
+    decodedHeight = builder.decodedHeight;
     frameRate = builder.frameRate;
     rotationDegrees = builder.rotationDegrees == NO_VALUE ? 0 : builder.rotationDegrees;
     pixelWidthHeightRatio =
@@ -1329,6 +1379,8 @@ public final class Format {
       // Video specific.
       result = 31 * result + width;
       result = 31 * result + height;
+      result = 31 * result + decodedWidth;
+      result = 31 * result + decodedHeight;
       result = 31 * result + Float.floatToIntBits(frameRate);
       result = 31 * result + rotationDegrees;
       result = 31 * result + Float.floatToIntBits(pixelWidthHeightRatio);
@@ -1376,6 +1428,8 @@ public final class Format {
         && subsampleOffsetUs == other.subsampleOffsetUs
         && width == other.width
         && height == other.height
+        && decodedWidth == other.decodedWidth
+        && decodedHeight == other.decodedHeight
         && rotationDegrees == other.rotationDegrees
         && stereoMode == other.stereoMode
         && maxSubLayers == other.maxSubLayers
@@ -1471,6 +1525,13 @@ public final class Format {
     if (format.width != NO_VALUE && format.height != NO_VALUE) {
       builder.append(", res=").append(format.width).append("x").append(format.height);
     }
+    if (format.decodedWidth != NO_VALUE && format.decodedHeight != NO_VALUE) {
+      builder
+          .append(", decRes=")
+          .append(format.decodedWidth)
+          .append("x")
+          .append(format.decodedHeight);
+    }
     if (!fuzzyEquals(format.pixelWidthHeightRatio, 1, 0.001)) {
       builder.append(", par=").append(Util.formatInvariant("%.3f", format.pixelWidthHeightRatio));
     }
@@ -1555,6 +1616,8 @@ public final class Format {
   private static final String FIELD_LABELS = Util.intToStringMaxRadix(32);
   private static final String FIELD_AUXILIARY_TRACK_TYPE = Util.intToStringMaxRadix(33);
   private static final String FIELD_MAX_SUB_LAYERS = Util.intToStringMaxRadix(34);
+  private static final String FIELD_DECODED_WIDTH = Util.intToStringMaxRadix(35);
+  private static final String FIELD_DECODED_HEIGHT = Util.intToStringMaxRadix(36);
 
   /**
    * Returns a {@link Bundle} representing the information stored in this object. If {@code
@@ -1592,6 +1655,8 @@ public final class Format {
     // Video specific.
     bundle.putInt(FIELD_WIDTH, width);
     bundle.putInt(FIELD_HEIGHT, height);
+    bundle.putInt(FIELD_DECODED_WIDTH, decodedWidth);
+    bundle.putInt(FIELD_DECODED_HEIGHT, decodedHeight);
     bundle.putFloat(FIELD_FRAME_RATE, frameRate);
     bundle.putInt(FIELD_ROTATION_DEGREES, rotationDegrees);
     bundle.putFloat(FIELD_PIXEL_WIDTH_HEIGHT_RATIO, pixelWidthHeightRatio);
@@ -1663,6 +1728,8 @@ public final class Format {
         // Video specific.
         .setWidth(bundle.getInt(FIELD_WIDTH, DEFAULT.width))
         .setHeight(bundle.getInt(FIELD_HEIGHT, DEFAULT.height))
+        .setDecodedWidth(bundle.getInt(FIELD_DECODED_WIDTH, DEFAULT.decodedWidth))
+        .setDecodedHeight(bundle.getInt(FIELD_DECODED_HEIGHT, DEFAULT.decodedHeight))
         .setFrameRate(bundle.getFloat(FIELD_FRAME_RATE, DEFAULT.frameRate))
         .setRotationDegrees(bundle.getInt(FIELD_ROTATION_DEGREES, DEFAULT.rotationDegrees))
         .setPixelWidthHeightRatio(
diff --git a/libraries/container/src/main/java/androidx/media3/container/NalUnitUtil.java b/libraries/container/src/main/java/androidx/media3/container/NalUnitUtil.java
index 0b39395a4b..14911606b9 100644
--- a/libraries/container/src/main/java/androidx/media3/container/NalUnitUtil.java
+++ b/libraries/container/src/main/java/androidx/media3/container/NalUnitUtil.java
@@ -398,6 +398,8 @@ public final class NalUnitUtil {
     public final int seqParameterSetId;
     public final int width;
     public final int height;
+    public final int decodedWidth;
+    public final int decodedHeight;
     public final float pixelWidthHeightRatio;
     public final int maxNumReorderPics;
     public final @C.ColorSpace int colorSpace;
@@ -414,6 +416,8 @@ public final class NalUnitUtil {
         int seqParameterSetId,
         int width,
         int height,
+        int decodedWidth,
+        int decodedHeight,
         float pixelWidthHeightRatio,
         int maxNumReorderPics,
         @C.ColorSpace int colorSpace,
@@ -433,6 +437,8 @@ public final class NalUnitUtil {
       this.colorSpace = colorSpace;
       this.colorRange = colorRange;
       this.colorTransfer = colorTransfer;
+      this.decodedWidth = decodedWidth;
+      this.decodedHeight = decodedHeight;
     }
   }
 
@@ -1558,6 +1564,8 @@ public final class NalUnitUtil {
     int chromaFormatIdc = 0;
     int frameWidth = 0;
     int frameHeight = 0;
+    int decodedWidth = 0;
+    int decodedHeight = 0;
     int bitDepthLumaMinus8 = 0;
     int bitDepthChromaMinus8 = 0;
     int spsRepFormatIdx = C.INDEX_UNSET;
@@ -1573,8 +1581,10 @@ public final class NalUnitUtil {
             && vpsData.repFormatsAndIndices.repFormats.size() > spsRepFormatIdx) {
           H265RepFormat repFormat = vpsData.repFormatsAndIndices.repFormats.get(spsRepFormatIdx);
           chromaFormatIdc = repFormat.chromaFormatIdc;
-          frameWidth = repFormat.width;
-          frameHeight = repFormat.height;
+          decodedWidth = repFormat.width;
+          decodedHeight = repFormat.height;
+          frameWidth = decodedWidth;
+          frameHeight = decodedHeight;
           bitDepthLumaMinus8 = repFormat.bitDepthLumaMinus8;
           bitDepthChromaMinus8 = repFormat.bitDepthChromaMinus8;
         }
@@ -1584,8 +1594,8 @@ public final class NalUnitUtil {
       if (chromaFormatIdc == 3) {
         data.skipBit(); // separate_colour_plane_flag
       }
-      frameWidth = data.readUnsignedExpGolombCodedInt();
-      frameHeight = data.readUnsignedExpGolombCodedInt();
+      decodedWidth = data.readUnsignedExpGolombCodedInt();
+      decodedHeight = data.readUnsignedExpGolombCodedInt();
       if (data.readBit()) { // conformance_window_flag
         int confWinLeftOffset = data.readUnsignedExpGolombCodedInt();
         int confWinRightOffset = data.readUnsignedExpGolombCodedInt();
@@ -1593,10 +1603,13 @@ public final class NalUnitUtil {
         int confWinBottomOffset = data.readUnsignedExpGolombCodedInt();
         frameWidth =
             applyConformanceWindowToWidth(
-                frameWidth, chromaFormatIdc, confWinLeftOffset, confWinRightOffset);
+                decodedWidth, chromaFormatIdc, confWinLeftOffset, confWinRightOffset);
         frameHeight =
             applyConformanceWindowToHeight(
-                frameHeight, chromaFormatIdc, confWinTopOffset, confWinBottomOffset);
+                decodedHeight, chromaFormatIdc, confWinTopOffset, confWinBottomOffset);
+      } else {
+        frameWidth = decodedWidth;
+        frameHeight = decodedHeight;
       }
       bitDepthLumaMinus8 = data.readUnsignedExpGolombCodedInt();
       bitDepthChromaMinus8 = data.readUnsignedExpGolombCodedInt();
@@ -1714,6 +1727,8 @@ public final class NalUnitUtil {
         seqParameterSetId,
         frameWidth,
         frameHeight,
+        decodedWidth,
+        decodedHeight,
         pixelWidthHeightRatio,
         maxNumReorderPics,
         colorSpace,
diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/mediacodec/MediaCodecInfo.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/mediacodec/MediaCodecInfo.java
index fafdbcb017..b6268fb35b 100644
--- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/mediacodec/MediaCodecInfo.java
+++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/mediacodec/MediaCodecInfo.java
@@ -436,8 +436,9 @@ public final class MediaCodecInfo {
       if (oldFormat.rotationDegrees != newFormat.rotationDegrees) {
         discardReasons |= DISCARD_REASON_VIDEO_ROTATION_CHANGED;
       }
-      if (!adaptive
-          && (oldFormat.width != newFormat.width || oldFormat.height != newFormat.height)) {
+      boolean resolutionChanged =
+          oldFormat.width != newFormat.width || oldFormat.height != newFormat.height;
+      if (!adaptive && resolutionChanged) {
         discardReasons |= DISCARD_REASON_VIDEO_RESOLUTION_CHANGED;
       }
       if ((!ColorInfo.isEquivalentToAssumedSdrDefault(oldFormat.colorInfo)
@@ -451,6 +452,17 @@ public final class MediaCodecInfo {
         discardReasons |= DISCARD_REASON_WORKAROUND;
       }
 
+      if (oldFormat.decodedWidth != Format.NO_VALUE
+          && oldFormat.decodedHeight != Format.NO_VALUE
+          && oldFormat.decodedWidth == newFormat.decodedWidth
+          && oldFormat.decodedHeight == newFormat.decodedHeight
+          && resolutionChanged) {
+        // Work around a bug where MediaCodec fails to adapt between formats if the compressed
+        // picture dimensions match but the cropped region for display differs.
+        // See b/409036359.
+        discardReasons |= DISCARD_REASON_WORKAROUND;
+      }
+
       if (discardReasons == 0) {
         return new DecoderReuseEvaluation(
             name,
diff --git a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/mediacodec/MediaCodecInfoTest.java b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/mediacodec/MediaCodecInfoTest.java
index 5be9127024..ded29cb8f5 100644
--- a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/mediacodec/MediaCodecInfoTest.java
+++ b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/mediacodec/MediaCodecInfoTest.java
@@ -24,6 +24,7 @@ import static androidx.media3.exoplayer.DecoderReuseEvaluation.DISCARD_REASON_MI
 import static androidx.media3.exoplayer.DecoderReuseEvaluation.DISCARD_REASON_VIDEO_COLOR_INFO_CHANGED;
 import static androidx.media3.exoplayer.DecoderReuseEvaluation.DISCARD_REASON_VIDEO_RESOLUTION_CHANGED;
 import static androidx.media3.exoplayer.DecoderReuseEvaluation.DISCARD_REASON_VIDEO_ROTATION_CHANGED;
+import static androidx.media3.exoplayer.DecoderReuseEvaluation.DISCARD_REASON_WORKAROUND;
 import static androidx.media3.exoplayer.DecoderReuseEvaluation.REUSE_RESULT_NO;
 import static androidx.media3.exoplayer.DecoderReuseEvaluation.REUSE_RESULT_YES_WITH_FLUSH;
 import static androidx.media3.exoplayer.DecoderReuseEvaluation.REUSE_RESULT_YES_WITH_RECONFIGURATION;
@@ -299,6 +300,24 @@ public final class MediaCodecInfoTest {
                 DISCARD_REASON_INITIALIZATION_DATA_CHANGED));
   }
 
+  @Test
+  public void canReuseCodec_differentVideoCrop_returnsNo() {
+    MediaCodecInfo codecInfo = buildH264CodecInfo(/* adaptive= */ true);
+    Format hdCodedAs4K =
+        FORMAT_H264_HD.buildUpon().setDecodedWidth(3840).setDecodedHeight(2160).build();
+    Format uhdCodedAs4K =
+        FORMAT_H264_4K.buildUpon().setDecodedWidth(3840).setDecodedHeight(2160).build();
+
+    assertThat(codecInfo.canReuseCodec(hdCodedAs4K, uhdCodedAs4K))
+        .isEqualTo(
+            new DecoderReuseEvaluation(
+                codecInfo.name,
+                hdCodedAs4K,
+                uhdCodedAs4K,
+                REUSE_RESULT_NO,
+                DISCARD_REASON_WORKAROUND));
+  }
+
   private static MediaCodecInfo buildH264CodecInfo(boolean adaptive) {
     return new MediaCodecInfo(
         "h264",
diff --git a/libraries/extractor/src/main/java/androidx/media3/extractor/HevcConfig.java b/libraries/extractor/src/main/java/androidx/media3/extractor/HevcConfig.java
index 682b3630ee..ca80a9c5c7 100644
--- a/libraries/extractor/src/main/java/androidx/media3/extractor/HevcConfig.java
+++ b/libraries/extractor/src/main/java/androidx/media3/extractor/HevcConfig.java
@@ -99,6 +99,8 @@ public final class HevcConfig {
       int bufferPosition = 0;
       int width = Format.NO_VALUE;
       int height = Format.NO_VALUE;
+      int decodedWidth = Format.NO_VALUE;
+      int decodedHeight = Format.NO_VALUE;
       int bitdepthLuma = Format.NO_VALUE;
       int bitdepthChroma = Format.NO_VALUE;
       @C.ColorSpace int colorSpace = Format.NO_VALUE;
@@ -135,6 +137,8 @@ public final class HevcConfig {
             maxSubLayers = spsData.maxSubLayersMinus1 + 1;
             width = spsData.width;
             height = spsData.height;
+            decodedWidth = spsData.decodedWidth;
+            decodedHeight = spsData.decodedHeight;
             bitdepthLuma = spsData.bitDepthLumaMinus8 + 8;
             bitdepthChroma = spsData.bitDepthChromaMinus8 + 8;
             colorSpace = spsData.colorSpace;
@@ -177,6 +181,8 @@ public final class HevcConfig {
           maxSubLayers,
           width,
           height,
+          decodedWidth,
+          decodedHeight,
           bitdepthLuma,
           bitdepthChroma,
           colorSpace,
@@ -206,12 +212,18 @@ public final class HevcConfig {
   /** The {@code sps_max_sub_layers_minus1 + 1} value: the number of temporal sub-layers. */
   public final int maxSubLayers;
 
-  /** The width of each decoded frame, or {@link Format#NO_VALUE} if unknown. */
+  /** The width of each cropped decoded picture, or {@link Format#NO_VALUE} if unknown. */
   public final int width;
 
-  /** The height of each decoded frame, or {@link Format#NO_VALUE} if unknown. */
+  /** The height of each cropped decoded picture, or {@link Format#NO_VALUE} if unknown. */
   public final int height;
 
+  /** The width of each decoded picture, or {@link Format#NO_VALUE} if unknown. */
+  public final int decodedWidth;
+
+  /** The height of each decoded picture, or {@link Format#NO_VALUE} if unknown. */
+  public final int decodedHeight;
+
   /** The bit depth of the luma samples, or {@link Format#NO_VALUE} if unknown. */
   public final int bitdepthLuma;
 
@@ -267,6 +279,8 @@ public final class HevcConfig {
       int maxSubLayers,
       int width,
       int height,
+      int decodedWidth,
+      int decodedHeight,
       int bitdepthLuma,
       int bitdepthChroma,
       @C.ColorSpace int colorSpace,
@@ -282,6 +296,8 @@ public final class HevcConfig {
     this.maxSubLayers = maxSubLayers;
     this.width = width;
     this.height = height;
+    this.decodedWidth = decodedWidth;
+    this.decodedHeight = decodedHeight;
     this.bitdepthLuma = bitdepthLuma;
     this.bitdepthChroma = bitdepthChroma;
     this.colorSpace = colorSpace;
diff --git a/libraries/extractor/src/main/java/androidx/media3/extractor/mp4/BoxParser.java b/libraries/extractor/src/main/java/androidx/media3/extractor/mp4/BoxParser.java
index cb0bac3fd6..c8af5ad79f 100644
--- a/libraries/extractor/src/main/java/androidx/media3/extractor/mp4/BoxParser.java
+++ b/libraries/extractor/src/main/java/androidx/media3/extractor/mp4/BoxParser.java
@@ -1279,6 +1279,8 @@ public final class BoxParser {
     int maxNumReorderSamples = Format.NO_VALUE;
     int maxSubLayers = Format.NO_VALUE;
     @Nullable NalUnitUtil.H265VpsData vpsData = null;
+    int decodedWidth = Format.NO_VALUE;
+    int decodedHeight = Format.NO_VALUE;
 
     // HDR related metadata.
     @C.ColorSpace int colorSpace = Format.NO_VALUE;
@@ -1331,6 +1333,8 @@ public final class BoxParser {
           // HEVCDecoderConfigurationRecord may include 3D reference displays information SEI.
           stereoMode = hevcConfig.stereoMode;
         }
+        decodedWidth = hevcConfig.decodedWidth;
+        decodedHeight = hevcConfig.decodedHeight;
         colorSpace = hevcConfig.colorSpace;
         colorRange = hevcConfig.colorRange;
         colorTransfer = hevcConfig.colorTransfer;
@@ -1607,6 +1611,8 @@ public final class BoxParser {
             .setCodecs(codecs)
             .setWidth(width)
             .setHeight(height)
+            .setDecodedWidth(decodedWidth)
+            .setDecodedHeight(decodedHeight)
             .setPixelWidthHeightRatio(pixelWidthHeightRatio)
             .setRotationDegrees(rotationDegrees)
             .setProjectionData(projectionData)
diff --git a/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-2-hevc-tracks.jpg.0.dump b/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-2-hevc-tracks.jpg.0.dump
index fa1cbe8a47..571c2b225a 100644
--- a/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-2-hevc-tracks.jpg.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-2-hevc-tracks.jpg.0.dump
@@ -20,6 +20,8 @@ track 0:
     maxNumReorderSamples = 0
     width = 1024
     height = 768
+    decodedWidth = 1024
+    decodedHeight = 768
     frameRate = 27.61
     rotationDegrees = 90
     maxSubLayers = 1
@@ -279,6 +281,8 @@ track 1:
     maxNumReorderSamples = 0
     width = 2048
     height = 1536
+    decodedWidth = 2048
+    decodedHeight = 1536
     frameRate = 2.14
     rotationDegrees = 90
     maxSubLayers = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-2-hevc-tracks.jpg.1.dump b/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-2-hevc-tracks.jpg.1.dump
index a89e4567c5..3086c7c228 100644
--- a/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-2-hevc-tracks.jpg.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-2-hevc-tracks.jpg.1.dump
@@ -20,6 +20,8 @@ track 0:
     maxNumReorderSamples = 0
     width = 1024
     height = 768
+    decodedWidth = 1024
+    decodedHeight = 768
     frameRate = 27.61
     rotationDegrees = 90
     maxSubLayers = 1
@@ -223,6 +225,8 @@ track 1:
     maxNumReorderSamples = 0
     width = 2048
     height = 1536
+    decodedWidth = 2048
+    decodedHeight = 1536
     frameRate = 2.14
     rotationDegrees = 90
     maxSubLayers = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-2-hevc-tracks.jpg.2.dump b/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-2-hevc-tracks.jpg.2.dump
index 67a325da7a..14fa006003 100644
--- a/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-2-hevc-tracks.jpg.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-2-hevc-tracks.jpg.2.dump
@@ -20,6 +20,8 @@ track 0:
     maxNumReorderSamples = 0
     width = 1024
     height = 768
+    decodedWidth = 1024
+    decodedHeight = 768
     frameRate = 27.61
     rotationDegrees = 90
     maxSubLayers = 1
@@ -139,6 +141,8 @@ track 1:
     maxNumReorderSamples = 0
     width = 2048
     height = 1536
+    decodedWidth = 2048
+    decodedHeight = 1536
     frameRate = 2.14
     rotationDegrees = 90
     maxSubLayers = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-2-hevc-tracks.jpg.3.dump b/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-2-hevc-tracks.jpg.3.dump
index 83777a832a..c9dbc12494 100644
--- a/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-2-hevc-tracks.jpg.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-2-hevc-tracks.jpg.3.dump
@@ -20,6 +20,8 @@ track 0:
     maxNumReorderSamples = 0
     width = 1024
     height = 768
+    decodedWidth = 1024
+    decodedHeight = 768
     frameRate = 27.61
     rotationDegrees = 90
     maxSubLayers = 1
@@ -55,6 +57,8 @@ track 1:
     maxNumReorderSamples = 0
     width = 2048
     height = 1536
+    decodedWidth = 2048
+    decodedHeight = 1536
     frameRate = 2.14
     rotationDegrees = 90
     maxSubLayers = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/fragmented_captions_h265.mp4.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/fragmented_captions_h265.mp4.0.dump
index 9f99c8393e..07c4357fb8 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/fragmented_captions_h265.mp4.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/fragmented_captions_h265.mp4.0.dump
@@ -14,6 +14,8 @@ track 0:
     maxNumReorderSamples = 2
     width = 416
     height = 234
+    decodedWidth = 416
+    decodedHeight = 240
     maxSubLayers = 1
     colorInfo:
       colorSpace = 2
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/fragmented_captions_h265.mp4.reading_within_gop_sample_dependencies.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/fragmented_captions_h265.mp4.reading_within_gop_sample_dependencies.0.dump
index ccbd7af3bc..bf1be0d44c 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/fragmented_captions_h265.mp4.reading_within_gop_sample_dependencies.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/fragmented_captions_h265.mp4.reading_within_gop_sample_dependencies.0.dump
@@ -14,6 +14,8 @@ track 0:
     maxNumReorderSamples = 2
     width = 416
     height = 234
+    decodedWidth = 416
+    decodedHeight = 240
     maxSubLayers = 1
     colorInfo:
       colorSpace = 2
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/fragmented_captions_h265.mp4.reading_within_gop_sample_dependencies.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/fragmented_captions_h265.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
index ccbd7af3bc..bf1be0d44c 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/fragmented_captions_h265.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/fragmented_captions_h265.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
@@ -14,6 +14,8 @@ track 0:
     maxNumReorderSamples = 2
     width = 416
     height = 234
+    decodedWidth = 416
+    decodedHeight = 240
     maxSubLayers = 1
     colorInfo:
       colorSpace = 2
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/fragmented_captions_h265.mp4.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/fragmented_captions_h265.mp4.unknown_length.dump
index 9f99c8393e..07c4357fb8 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/fragmented_captions_h265.mp4.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/fragmented_captions_h265.mp4.unknown_length.dump
@@ -14,6 +14,8 @@ track 0:
     maxNumReorderSamples = 2
     width = 416
     height = 234
+    decodedWidth = 416
+    decodedHeight = 240
     maxSubLayers = 1
     colorInfo:
       colorSpace = 2
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/h265_bframes.mp4.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/h265_bframes.mp4.0.dump
index 5770ef6abd..45680785af 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/h265_bframes.mp4.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/h265_bframes.mp4.0.dump
@@ -21,6 +21,8 @@ track 0:
     maxNumReorderSamples = 2
     width = 854
     height = 480
+    decodedWidth = 856
+    decodedHeight = 480
     frameRate = 30.00
     maxSubLayers = 1
     colorInfo:
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/h265_bframes.mp4.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/h265_bframes.mp4.1.dump
index 5770ef6abd..45680785af 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/h265_bframes.mp4.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/h265_bframes.mp4.1.dump
@@ -21,6 +21,8 @@ track 0:
     maxNumReorderSamples = 2
     width = 854
     height = 480
+    decodedWidth = 856
+    decodedHeight = 480
     frameRate = 30.00
     maxSubLayers = 1
     colorInfo:
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/h265_bframes.mp4.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/h265_bframes.mp4.2.dump
index 5770ef6abd..45680785af 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/h265_bframes.mp4.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/h265_bframes.mp4.2.dump
@@ -21,6 +21,8 @@ track 0:
     maxNumReorderSamples = 2
     width = 854
     height = 480
+    decodedWidth = 856
+    decodedHeight = 480
     frameRate = 30.00
     maxSubLayers = 1
     colorInfo:
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/h265_bframes.mp4.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/h265_bframes.mp4.3.dump
index 5770ef6abd..45680785af 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/h265_bframes.mp4.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/h265_bframes.mp4.3.dump
@@ -21,6 +21,8 @@ track 0:
     maxNumReorderSamples = 2
     width = 854
     height = 480
+    decodedWidth = 856
+    decodedHeight = 480
     frameRate = 30.00
     maxSubLayers = 1
     colorInfo:
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/h265_bframes.mp4.reading_within_gop_sample_dependencies.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/h265_bframes.mp4.reading_within_gop_sample_dependencies.0.dump
index 3d9fb8e18b..e98aed6406 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/h265_bframes.mp4.reading_within_gop_sample_dependencies.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/h265_bframes.mp4.reading_within_gop_sample_dependencies.0.dump
@@ -21,6 +21,8 @@ track 0:
     maxNumReorderSamples = 2
     width = 854
     height = 480
+    decodedWidth = 856
+    decodedHeight = 480
     frameRate = 30.00
     maxSubLayers = 1
     colorInfo:
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/h265_bframes.mp4.reading_within_gop_sample_dependencies.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/h265_bframes.mp4.reading_within_gop_sample_dependencies.1.dump
index 3d9fb8e18b..e98aed6406 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/h265_bframes.mp4.reading_within_gop_sample_dependencies.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/h265_bframes.mp4.reading_within_gop_sample_dependencies.1.dump
@@ -21,6 +21,8 @@ track 0:
     maxNumReorderSamples = 2
     width = 854
     height = 480
+    decodedWidth = 856
+    decodedHeight = 480
     frameRate = 30.00
     maxSubLayers = 1
     colorInfo:
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/h265_bframes.mp4.reading_within_gop_sample_dependencies.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/h265_bframes.mp4.reading_within_gop_sample_dependencies.2.dump
index 3d9fb8e18b..e98aed6406 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/h265_bframes.mp4.reading_within_gop_sample_dependencies.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/h265_bframes.mp4.reading_within_gop_sample_dependencies.2.dump
@@ -21,6 +21,8 @@ track 0:
     maxNumReorderSamples = 2
     width = 854
     height = 480
+    decodedWidth = 856
+    decodedHeight = 480
     frameRate = 30.00
     maxSubLayers = 1
     colorInfo:
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/h265_bframes.mp4.reading_within_gop_sample_dependencies.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/h265_bframes.mp4.reading_within_gop_sample_dependencies.3.dump
index 3d9fb8e18b..e98aed6406 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/h265_bframes.mp4.reading_within_gop_sample_dependencies.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/h265_bframes.mp4.reading_within_gop_sample_dependencies.3.dump
@@ -21,6 +21,8 @@ track 0:
     maxNumReorderSamples = 2
     width = 854
     height = 480
+    decodedWidth = 856
+    decodedHeight = 480
     frameRate = 30.00
     maxSubLayers = 1
     colorInfo:
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/h265_bframes.mp4.reading_within_gop_sample_dependencies.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/h265_bframes.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
index 3d9fb8e18b..e98aed6406 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/h265_bframes.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/h265_bframes.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
@@ -21,6 +21,8 @@ track 0:
     maxNumReorderSamples = 2
     width = 854
     height = 480
+    decodedWidth = 856
+    decodedHeight = 480
     frameRate = 30.00
     maxSubLayers = 1
     colorInfo:
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/h265_bframes.mp4.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/h265_bframes.mp4.unknown_length.dump
index 5770ef6abd..45680785af 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/h265_bframes.mp4.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/h265_bframes.mp4.unknown_length.dump
@@ -21,6 +21,8 @@ track 0:
     maxNumReorderSamples = 2
     width = 854
     height = 480
+    decodedWidth = 856
+    decodedHeight = 480
     frameRate = 30.00
     maxSubLayers = 1
     colorInfo:
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.0.dump
index 95d9ca55b1..a6aec17296 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.0.dump
@@ -20,6 +20,8 @@ track 0:
     maxNumReorderSamples = 0
     width = 1024
     height = 768
+    decodedWidth = 1024
+    decodedHeight = 768
     frameRate = 27.61
     rotationDegrees = 90
     maxSubLayers = 1
@@ -278,6 +280,8 @@ track 1:
     maxNumReorderSamples = 0
     width = 2048
     height = 1536
+    decodedWidth = 2048
+    decodedHeight = 1536
     frameRate = 2.14
     rotationDegrees = 90
     maxSubLayers = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.1.dump
index f47a39726e..10531a420e 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.1.dump
@@ -20,6 +20,8 @@ track 0:
     maxNumReorderSamples = 0
     width = 1024
     height = 768
+    decodedWidth = 1024
+    decodedHeight = 768
     frameRate = 27.61
     rotationDegrees = 90
     maxSubLayers = 1
@@ -222,6 +224,8 @@ track 1:
     maxNumReorderSamples = 0
     width = 2048
     height = 1536
+    decodedWidth = 2048
+    decodedHeight = 1536
     frameRate = 2.14
     rotationDegrees = 90
     maxSubLayers = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.2.dump
index 9c356fbbd1..38076248f4 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.2.dump
@@ -20,6 +20,8 @@ track 0:
     maxNumReorderSamples = 0
     width = 1024
     height = 768
+    decodedWidth = 1024
+    decodedHeight = 768
     frameRate = 27.61
     rotationDegrees = 90
     maxSubLayers = 1
@@ -138,6 +140,8 @@ track 1:
     maxNumReorderSamples = 0
     width = 2048
     height = 1536
+    decodedWidth = 2048
+    decodedHeight = 1536
     frameRate = 2.14
     rotationDegrees = 90
     maxSubLayers = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.3.dump
index b7e1baba9f..b21f8aa637 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.3.dump
@@ -20,6 +20,8 @@ track 0:
     maxNumReorderSamples = 0
     width = 1024
     height = 768
+    decodedWidth = 1024
+    decodedHeight = 768
     frameRate = 27.61
     rotationDegrees = 90
     maxSubLayers = 1
@@ -54,6 +56,8 @@ track 1:
     maxNumReorderSamples = 0
     width = 2048
     height = 1536
+    decodedWidth = 2048
+    decodedHeight = 1536
     frameRate = 2.14
     rotationDegrees = 90
     maxSubLayers = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.reading_within_gop_sample_dependencies.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.reading_within_gop_sample_dependencies.0.dump
index 95d9ca55b1..a6aec17296 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.reading_within_gop_sample_dependencies.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.reading_within_gop_sample_dependencies.0.dump
@@ -20,6 +20,8 @@ track 0:
     maxNumReorderSamples = 0
     width = 1024
     height = 768
+    decodedWidth = 1024
+    decodedHeight = 768
     frameRate = 27.61
     rotationDegrees = 90
     maxSubLayers = 1
@@ -278,6 +280,8 @@ track 1:
     maxNumReorderSamples = 0
     width = 2048
     height = 1536
+    decodedWidth = 2048
+    decodedHeight = 1536
     frameRate = 2.14
     rotationDegrees = 90
     maxSubLayers = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.reading_within_gop_sample_dependencies.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.reading_within_gop_sample_dependencies.1.dump
index f47a39726e..10531a420e 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.reading_within_gop_sample_dependencies.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.reading_within_gop_sample_dependencies.1.dump
@@ -20,6 +20,8 @@ track 0:
     maxNumReorderSamples = 0
     width = 1024
     height = 768
+    decodedWidth = 1024
+    decodedHeight = 768
     frameRate = 27.61
     rotationDegrees = 90
     maxSubLayers = 1
@@ -222,6 +224,8 @@ track 1:
     maxNumReorderSamples = 0
     width = 2048
     height = 1536
+    decodedWidth = 2048
+    decodedHeight = 1536
     frameRate = 2.14
     rotationDegrees = 90
     maxSubLayers = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.reading_within_gop_sample_dependencies.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.reading_within_gop_sample_dependencies.2.dump
index 9c356fbbd1..38076248f4 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.reading_within_gop_sample_dependencies.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.reading_within_gop_sample_dependencies.2.dump
@@ -20,6 +20,8 @@ track 0:
     maxNumReorderSamples = 0
     width = 1024
     height = 768
+    decodedWidth = 1024
+    decodedHeight = 768
     frameRate = 27.61
     rotationDegrees = 90
     maxSubLayers = 1
@@ -138,6 +140,8 @@ track 1:
     maxNumReorderSamples = 0
     width = 2048
     height = 1536
+    decodedWidth = 2048
+    decodedHeight = 1536
     frameRate = 2.14
     rotationDegrees = 90
     maxSubLayers = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.reading_within_gop_sample_dependencies.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.reading_within_gop_sample_dependencies.3.dump
index b7e1baba9f..b21f8aa637 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.reading_within_gop_sample_dependencies.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.reading_within_gop_sample_dependencies.3.dump
@@ -20,6 +20,8 @@ track 0:
     maxNumReorderSamples = 0
     width = 1024
     height = 768
+    decodedWidth = 1024
+    decodedHeight = 768
     frameRate = 27.61
     rotationDegrees = 90
     maxSubLayers = 1
@@ -54,6 +56,8 @@ track 1:
     maxNumReorderSamples = 0
     width = 2048
     height = 1536
+    decodedWidth = 2048
+    decodedHeight = 1536
     frameRate = 2.14
     rotationDegrees = 90
     maxSubLayers = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.reading_within_gop_sample_dependencies.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
index 95d9ca55b1..a6aec17296 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
@@ -20,6 +20,8 @@ track 0:
     maxNumReorderSamples = 0
     width = 1024
     height = 768
+    decodedWidth = 1024
+    decodedHeight = 768
     frameRate = 27.61
     rotationDegrees = 90
     maxSubLayers = 1
@@ -278,6 +280,8 @@ track 1:
     maxNumReorderSamples = 0
     width = 2048
     height = 1536
+    decodedWidth = 2048
+    decodedHeight = 1536
     frameRate = 2.14
     rotationDegrees = 90
     maxSubLayers = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.unknown_length.dump
index 95d9ca55b1..a6aec17296 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.unknown_length.dump
@@ -20,6 +20,8 @@ track 0:
     maxNumReorderSamples = 0
     width = 1024
     height = 768
+    decodedWidth = 1024
+    decodedHeight = 768
     frameRate = 27.61
     rotationDegrees = 90
     maxSubLayers = 1
@@ -278,6 +280,8 @@ track 1:
     maxNumReorderSamples = 0
     width = 2048
     height = 1536
+    decodedWidth = 2048
+    decodedHeight = 1536
     frameRate = 2.14
     rotationDegrees = 90
     maxSubLayers = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list.mp4.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list.mp4.0.dump
index a63d318185..b858ce7afc 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list.mp4.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list.mp4.0.dump
@@ -20,6 +20,8 @@ track 0:
     maxNumReorderSamples = 2
     width = 1920
     height = 1080
+    decodedWidth = 1920
+    decodedHeight = 1088
     frameRate = 28.03
     rotationDegrees = 90
     maxSubLayers = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list.mp4.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list.mp4.1.dump
index 3715173c68..0d7fa7c169 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list.mp4.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list.mp4.1.dump
@@ -20,6 +20,8 @@ track 0:
     maxNumReorderSamples = 2
     width = 1920
     height = 1080
+    decodedWidth = 1920
+    decodedHeight = 1088
     frameRate = 28.03
     rotationDegrees = 90
     maxSubLayers = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list.mp4.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list.mp4.2.dump
index 1d0c2b779c..cf1ce11845 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list.mp4.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list.mp4.2.dump
@@ -20,6 +20,8 @@ track 0:
     maxNumReorderSamples = 2
     width = 1920
     height = 1080
+    decodedWidth = 1920
+    decodedHeight = 1088
     frameRate = 28.03
     rotationDegrees = 90
     maxSubLayers = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list.mp4.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list.mp4.3.dump
index f797f714a2..22ac03c62d 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list.mp4.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list.mp4.3.dump
@@ -20,6 +20,8 @@ track 0:
     maxNumReorderSamples = 2
     width = 1920
     height = 1080
+    decodedWidth = 1920
+    decodedHeight = 1088
     frameRate = 28.03
     rotationDegrees = 90
     maxSubLayers = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list.mp4.reading_within_gop_sample_dependencies.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list.mp4.reading_within_gop_sample_dependencies.0.dump
index a63d318185..b858ce7afc 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list.mp4.reading_within_gop_sample_dependencies.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list.mp4.reading_within_gop_sample_dependencies.0.dump
@@ -20,6 +20,8 @@ track 0:
     maxNumReorderSamples = 2
     width = 1920
     height = 1080
+    decodedWidth = 1920
+    decodedHeight = 1088
     frameRate = 28.03
     rotationDegrees = 90
     maxSubLayers = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list.mp4.reading_within_gop_sample_dependencies.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list.mp4.reading_within_gop_sample_dependencies.1.dump
index 3715173c68..0d7fa7c169 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list.mp4.reading_within_gop_sample_dependencies.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list.mp4.reading_within_gop_sample_dependencies.1.dump
@@ -20,6 +20,8 @@ track 0:
     maxNumReorderSamples = 2
     width = 1920
     height = 1080
+    decodedWidth = 1920
+    decodedHeight = 1088
     frameRate = 28.03
     rotationDegrees = 90
     maxSubLayers = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list.mp4.reading_within_gop_sample_dependencies.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list.mp4.reading_within_gop_sample_dependencies.2.dump
index 1d0c2b779c..cf1ce11845 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list.mp4.reading_within_gop_sample_dependencies.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list.mp4.reading_within_gop_sample_dependencies.2.dump
@@ -20,6 +20,8 @@ track 0:
     maxNumReorderSamples = 2
     width = 1920
     height = 1080
+    decodedWidth = 1920
+    decodedHeight = 1088
     frameRate = 28.03
     rotationDegrees = 90
     maxSubLayers = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list.mp4.reading_within_gop_sample_dependencies.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list.mp4.reading_within_gop_sample_dependencies.3.dump
index f797f714a2..22ac03c62d 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list.mp4.reading_within_gop_sample_dependencies.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list.mp4.reading_within_gop_sample_dependencies.3.dump
@@ -20,6 +20,8 @@ track 0:
     maxNumReorderSamples = 2
     width = 1920
     height = 1080
+    decodedWidth = 1920
+    decodedHeight = 1088
     frameRate = 28.03
     rotationDegrees = 90
     maxSubLayers = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list.mp4.reading_within_gop_sample_dependencies.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
index a63d318185..b858ce7afc 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
@@ -20,6 +20,8 @@ track 0:
     maxNumReorderSamples = 2
     width = 1920
     height = 1080
+    decodedWidth = 1920
+    decodedHeight = 1088
     frameRate = 28.03
     rotationDegrees = 90
     maxSubLayers = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list.mp4.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list.mp4.unknown_length.dump
index a63d318185..b858ce7afc 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list.mp4.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list.mp4.unknown_length.dump
@@ -20,6 +20,8 @@ track 0:
     maxNumReorderSamples = 2
     width = 1920
     height = 1080
+    decodedWidth = 1920
+    decodedHeight = 1088
     frameRate = 28.03
     rotationDegrees = 90
     maxSubLayers = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list_no_sync_frame_before_edit.mp4.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list_no_sync_frame_before_edit.mp4.0.dump
index 060902d188..fc8cfabb42 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list_no_sync_frame_before_edit.mp4.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list_no_sync_frame_before_edit.mp4.0.dump
@@ -20,6 +20,8 @@ track 0:
     maxNumReorderSamples = 2
     width = 1920
     height = 1080
+    decodedWidth = 1920
+    decodedHeight = 1088
     frameRate = 27.70
     rotationDegrees = 90
     maxSubLayers = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list_no_sync_frame_before_edit.mp4.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list_no_sync_frame_before_edit.mp4.1.dump
index 6bd6681834..0995e727aa 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list_no_sync_frame_before_edit.mp4.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list_no_sync_frame_before_edit.mp4.1.dump
@@ -20,6 +20,8 @@ track 0:
     maxNumReorderSamples = 2
     width = 1920
     height = 1080
+    decodedWidth = 1920
+    decodedHeight = 1088
     frameRate = 27.70
     rotationDegrees = 90
     maxSubLayers = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list_no_sync_frame_before_edit.mp4.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list_no_sync_frame_before_edit.mp4.2.dump
index 197e851b53..e581ca8e41 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list_no_sync_frame_before_edit.mp4.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list_no_sync_frame_before_edit.mp4.2.dump
@@ -20,6 +20,8 @@ track 0:
     maxNumReorderSamples = 2
     width = 1920
     height = 1080
+    decodedWidth = 1920
+    decodedHeight = 1088
     frameRate = 27.70
     rotationDegrees = 90
     maxSubLayers = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list_no_sync_frame_before_edit.mp4.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list_no_sync_frame_before_edit.mp4.3.dump
index 153b537009..d04edf882f 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list_no_sync_frame_before_edit.mp4.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list_no_sync_frame_before_edit.mp4.3.dump
@@ -20,6 +20,8 @@ track 0:
     maxNumReorderSamples = 2
     width = 1920
     height = 1080
+    decodedWidth = 1920
+    decodedHeight = 1088
     frameRate = 27.70
     rotationDegrees = 90
     maxSubLayers = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list_no_sync_frame_before_edit.mp4.reading_within_gop_sample_dependencies.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list_no_sync_frame_before_edit.mp4.reading_within_gop_sample_dependencies.0.dump
index 060902d188..fc8cfabb42 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list_no_sync_frame_before_edit.mp4.reading_within_gop_sample_dependencies.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list_no_sync_frame_before_edit.mp4.reading_within_gop_sample_dependencies.0.dump
@@ -20,6 +20,8 @@ track 0:
     maxNumReorderSamples = 2
     width = 1920
     height = 1080
+    decodedWidth = 1920
+    decodedHeight = 1088
     frameRate = 27.70
     rotationDegrees = 90
     maxSubLayers = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list_no_sync_frame_before_edit.mp4.reading_within_gop_sample_dependencies.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list_no_sync_frame_before_edit.mp4.reading_within_gop_sample_dependencies.1.dump
index 6bd6681834..0995e727aa 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list_no_sync_frame_before_edit.mp4.reading_within_gop_sample_dependencies.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list_no_sync_frame_before_edit.mp4.reading_within_gop_sample_dependencies.1.dump
@@ -20,6 +20,8 @@ track 0:
     maxNumReorderSamples = 2
     width = 1920
     height = 1080
+    decodedWidth = 1920
+    decodedHeight = 1088
     frameRate = 27.70
     rotationDegrees = 90
     maxSubLayers = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list_no_sync_frame_before_edit.mp4.reading_within_gop_sample_dependencies.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list_no_sync_frame_before_edit.mp4.reading_within_gop_sample_dependencies.2.dump
index 197e851b53..e581ca8e41 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list_no_sync_frame_before_edit.mp4.reading_within_gop_sample_dependencies.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list_no_sync_frame_before_edit.mp4.reading_within_gop_sample_dependencies.2.dump
@@ -20,6 +20,8 @@ track 0:
     maxNumReorderSamples = 2
     width = 1920
     height = 1080
+    decodedWidth = 1920
+    decodedHeight = 1088
     frameRate = 27.70
     rotationDegrees = 90
     maxSubLayers = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list_no_sync_frame_before_edit.mp4.reading_within_gop_sample_dependencies.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list_no_sync_frame_before_edit.mp4.reading_within_gop_sample_dependencies.3.dump
index 153b537009..d04edf882f 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list_no_sync_frame_before_edit.mp4.reading_within_gop_sample_dependencies.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list_no_sync_frame_before_edit.mp4.reading_within_gop_sample_dependencies.3.dump
@@ -20,6 +20,8 @@ track 0:
     maxNumReorderSamples = 2
     width = 1920
     height = 1080
+    decodedWidth = 1920
+    decodedHeight = 1088
     frameRate = 27.70
     rotationDegrees = 90
     maxSubLayers = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list_no_sync_frame_before_edit.mp4.reading_within_gop_sample_dependencies.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list_no_sync_frame_before_edit.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
index 060902d188..fc8cfabb42 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list_no_sync_frame_before_edit.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list_no_sync_frame_before_edit.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
@@ -20,6 +20,8 @@ track 0:
     maxNumReorderSamples = 2
     width = 1920
     height = 1080
+    decodedWidth = 1920
+    decodedHeight = 1088
     frameRate = 27.70
     rotationDegrees = 90
     maxSubLayers = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list_no_sync_frame_before_edit.mp4.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list_no_sync_frame_before_edit.mp4.unknown_length.dump
index 060902d188..fc8cfabb42 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list_no_sync_frame_before_edit.mp4.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list_no_sync_frame_before_edit.mp4.unknown_length.dump
@@ -20,6 +20,8 @@ track 0:
     maxNumReorderSamples = 2
     width = 1920
     height = 1080
+    decodedWidth = 1920
+    decodedHeight = 1088
     frameRate = 27.70
     rotationDegrees = 90
     maxSubLayers = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_color_info.mp4.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_color_info.mp4.0.dump
index e1aba0416d..b002b70ec1 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_color_info.mp4.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_color_info.mp4.0.dump
@@ -20,6 +20,8 @@ track 0:
     maxNumReorderSamples = 2
     width = 1920
     height = 1080
+    decodedWidth = 1920
+    decodedHeight = 1088
     frameRate = 30.00
     rotationDegrees = 90
     maxSubLayers = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_color_info.mp4.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_color_info.mp4.1.dump
index 494215afee..4648a3c648 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_color_info.mp4.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_color_info.mp4.1.dump
@@ -20,6 +20,8 @@ track 0:
     maxNumReorderSamples = 2
     width = 1920
     height = 1080
+    decodedWidth = 1920
+    decodedHeight = 1088
     frameRate = 30.00
     rotationDegrees = 90
     maxSubLayers = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_color_info.mp4.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_color_info.mp4.2.dump
index d77dfe6771..70fc8a5c80 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_color_info.mp4.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_color_info.mp4.2.dump
@@ -20,6 +20,8 @@ track 0:
     maxNumReorderSamples = 2
     width = 1920
     height = 1080
+    decodedWidth = 1920
+    decodedHeight = 1088
     frameRate = 30.00
     rotationDegrees = 90
     maxSubLayers = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_color_info.mp4.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_color_info.mp4.3.dump
index f4212dcd0a..da57f7f2ed 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_color_info.mp4.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_color_info.mp4.3.dump
@@ -20,6 +20,8 @@ track 0:
     maxNumReorderSamples = 2
     width = 1920
     height = 1080
+    decodedWidth = 1920
+    decodedHeight = 1088
     frameRate = 30.00
     rotationDegrees = 90
     maxSubLayers = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_color_info.mp4.reading_within_gop_sample_dependencies.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_color_info.mp4.reading_within_gop_sample_dependencies.0.dump
index e1aba0416d..b002b70ec1 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_color_info.mp4.reading_within_gop_sample_dependencies.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_color_info.mp4.reading_within_gop_sample_dependencies.0.dump
@@ -20,6 +20,8 @@ track 0:
     maxNumReorderSamples = 2
     width = 1920
     height = 1080
+    decodedWidth = 1920
+    decodedHeight = 1088
     frameRate = 30.00
     rotationDegrees = 90
     maxSubLayers = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_color_info.mp4.reading_within_gop_sample_dependencies.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_color_info.mp4.reading_within_gop_sample_dependencies.1.dump
index 494215afee..4648a3c648 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_color_info.mp4.reading_within_gop_sample_dependencies.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_color_info.mp4.reading_within_gop_sample_dependencies.1.dump
@@ -20,6 +20,8 @@ track 0:
     maxNumReorderSamples = 2
     width = 1920
     height = 1080
+    decodedWidth = 1920
+    decodedHeight = 1088
     frameRate = 30.00
     rotationDegrees = 90
     maxSubLayers = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_color_info.mp4.reading_within_gop_sample_dependencies.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_color_info.mp4.reading_within_gop_sample_dependencies.2.dump
index d77dfe6771..70fc8a5c80 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_color_info.mp4.reading_within_gop_sample_dependencies.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_color_info.mp4.reading_within_gop_sample_dependencies.2.dump
@@ -20,6 +20,8 @@ track 0:
     maxNumReorderSamples = 2
     width = 1920
     height = 1080
+    decodedWidth = 1920
+    decodedHeight = 1088
     frameRate = 30.00
     rotationDegrees = 90
     maxSubLayers = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_color_info.mp4.reading_within_gop_sample_dependencies.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_color_info.mp4.reading_within_gop_sample_dependencies.3.dump
index f4212dcd0a..da57f7f2ed 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_color_info.mp4.reading_within_gop_sample_dependencies.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_color_info.mp4.reading_within_gop_sample_dependencies.3.dump
@@ -20,6 +20,8 @@ track 0:
     maxNumReorderSamples = 2
     width = 1920
     height = 1080
+    decodedWidth = 1920
+    decodedHeight = 1088
     frameRate = 30.00
     rotationDegrees = 90
     maxSubLayers = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_color_info.mp4.reading_within_gop_sample_dependencies.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_color_info.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
index e1aba0416d..b002b70ec1 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_color_info.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_color_info.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
@@ -20,6 +20,8 @@ track 0:
     maxNumReorderSamples = 2
     width = 1920
     height = 1080
+    decodedWidth = 1920
+    decodedHeight = 1088
     frameRate = 30.00
     rotationDegrees = 90
     maxSubLayers = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_color_info.mp4.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_color_info.mp4.unknown_length.dump
index e1aba0416d..b002b70ec1 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_color_info.mp4.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_color_info.mp4.unknown_length.dump
@@ -20,6 +20,8 @@ track 0:
     maxNumReorderSamples = 2
     width = 1920
     height = 1080
+    decodedWidth = 1920
+    decodedHeight = 1088
     frameRate = 30.00
     rotationDegrees = 90
     maxSubLayers = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.0.dump
index d9cdd7950e..1f8e8915b0 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.0.dump
@@ -20,6 +20,8 @@ track 0:
     maxNumReorderSamples = 2
     width = 1920
     height = 1440
+    decodedWidth = 1920
+    decodedHeight = 1440
     frameRate = 28.81
     rotationDegrees = 90
     maxSubLayers = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.1.dump
index b9709c032b..7d7fcad23d 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.1.dump
@@ -20,6 +20,8 @@ track 0:
     maxNumReorderSamples = 2
     width = 1920
     height = 1440
+    decodedWidth = 1920
+    decodedHeight = 1440
     frameRate = 28.81
     rotationDegrees = 90
     maxSubLayers = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.2.dump
index 75ec7874c0..bf79148cff 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.2.dump
@@ -20,6 +20,8 @@ track 0:
     maxNumReorderSamples = 2
     width = 1920
     height = 1440
+    decodedWidth = 1920
+    decodedHeight = 1440
     frameRate = 28.81
     rotationDegrees = 90
     maxSubLayers = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.3.dump
index ca57062e3b..40a73263dc 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.3.dump
@@ -20,6 +20,8 @@ track 0:
     maxNumReorderSamples = 2
     width = 1920
     height = 1440
+    decodedWidth = 1920
+    decodedHeight = 1440
     frameRate = 28.81
     rotationDegrees = 90
     maxSubLayers = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.reading_within_gop_sample_dependencies.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.reading_within_gop_sample_dependencies.0.dump
index d9cdd7950e..1f8e8915b0 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.reading_within_gop_sample_dependencies.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.reading_within_gop_sample_dependencies.0.dump
@@ -20,6 +20,8 @@ track 0:
     maxNumReorderSamples = 2
     width = 1920
     height = 1440
+    decodedWidth = 1920
+    decodedHeight = 1440
     frameRate = 28.81
     rotationDegrees = 90
     maxSubLayers = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.reading_within_gop_sample_dependencies.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.reading_within_gop_sample_dependencies.1.dump
index b9709c032b..7d7fcad23d 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.reading_within_gop_sample_dependencies.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.reading_within_gop_sample_dependencies.1.dump
@@ -20,6 +20,8 @@ track 0:
     maxNumReorderSamples = 2
     width = 1920
     height = 1440
+    decodedWidth = 1920
+    decodedHeight = 1440
     frameRate = 28.81
     rotationDegrees = 90
     maxSubLayers = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.reading_within_gop_sample_dependencies.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.reading_within_gop_sample_dependencies.2.dump
index 75ec7874c0..bf79148cff 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.reading_within_gop_sample_dependencies.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.reading_within_gop_sample_dependencies.2.dump
@@ -20,6 +20,8 @@ track 0:
     maxNumReorderSamples = 2
     width = 1920
     height = 1440
+    decodedWidth = 1920
+    decodedHeight = 1440
     frameRate = 28.81
     rotationDegrees = 90
     maxSubLayers = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.reading_within_gop_sample_dependencies.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.reading_within_gop_sample_dependencies.3.dump
index ca57062e3b..40a73263dc 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.reading_within_gop_sample_dependencies.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.reading_within_gop_sample_dependencies.3.dump
@@ -20,6 +20,8 @@ track 0:
     maxNumReorderSamples = 2
     width = 1920
     height = 1440
+    decodedWidth = 1920
+    decodedHeight = 1440
     frameRate = 28.81
     rotationDegrees = 90
     maxSubLayers = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.reading_within_gop_sample_dependencies.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.reading_within_gop_sample_dependencies.unknown_length.dump
index d9cdd7950e..1f8e8915b0 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.reading_within_gop_sample_dependencies.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.reading_within_gop_sample_dependencies.unknown_length.dump
@@ -20,6 +20,8 @@ track 0:
     maxNumReorderSamples = 2
     width = 1920
     height = 1440
+    decodedWidth = 1920
+    decodedHeight = 1440
     frameRate = 28.81
     rotationDegrees = 90
     maxSubLayers = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.unknown_length.dump
index d9cdd7950e..1f8e8915b0 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.unknown_length.dump
@@ -20,6 +20,8 @@ track 0:
     maxNumReorderSamples = 2
     width = 1920
     height = 1440
+    decodedWidth = 1920
+    decodedHeight = 1440
     frameRate = 28.81
     rotationDegrees = 90
     maxSubLayers = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/water_180_mvhevc_5frames.mov.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/water_180_mvhevc_5frames.mov.0.dump
index 7ef19dc698..7df8fda58d 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/water_180_mvhevc_5frames.mov.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/water_180_mvhevc_5frames.mov.0.dump
@@ -20,6 +20,8 @@ track 0:
     maxNumReorderSamples = 2
     width = 1934
     height = 2160
+    decodedWidth = 1936
+    decodedHeight = 2160
     frameRate = 90.00
     maxSubLayers = 1
     colorInfo:
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/water_180_mvhevc_5frames.mov.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/water_180_mvhevc_5frames.mov.1.dump
index 7ef19dc698..7df8fda58d 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/water_180_mvhevc_5frames.mov.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/water_180_mvhevc_5frames.mov.1.dump
@@ -20,6 +20,8 @@ track 0:
     maxNumReorderSamples = 2
     width = 1934
     height = 2160
+    decodedWidth = 1936
+    decodedHeight = 2160
     frameRate = 90.00
     maxSubLayers = 1
     colorInfo:
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/water_180_mvhevc_5frames.mov.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/water_180_mvhevc_5frames.mov.2.dump
index 7ef19dc698..7df8fda58d 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/water_180_mvhevc_5frames.mov.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/water_180_mvhevc_5frames.mov.2.dump
@@ -20,6 +20,8 @@ track 0:
     maxNumReorderSamples = 2
     width = 1934
     height = 2160
+    decodedWidth = 1936
+    decodedHeight = 2160
     frameRate = 90.00
     maxSubLayers = 1
     colorInfo:
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/water_180_mvhevc_5frames.mov.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/water_180_mvhevc_5frames.mov.3.dump
index 7ef19dc698..7df8fda58d 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/water_180_mvhevc_5frames.mov.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/water_180_mvhevc_5frames.mov.3.dump
@@ -20,6 +20,8 @@ track 0:
     maxNumReorderSamples = 2
     width = 1934
     height = 2160
+    decodedWidth = 1936
+    decodedHeight = 2160
     frameRate = 90.00
     maxSubLayers = 1
     colorInfo:
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/water_180_mvhevc_5frames.mov.reading_within_gop_sample_dependencies.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/water_180_mvhevc_5frames.mov.reading_within_gop_sample_dependencies.0.dump
index 7ef19dc698..7df8fda58d 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/water_180_mvhevc_5frames.mov.reading_within_gop_sample_dependencies.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/water_180_mvhevc_5frames.mov.reading_within_gop_sample_dependencies.0.dump
@@ -20,6 +20,8 @@ track 0:
     maxNumReorderSamples = 2
     width = 1934
     height = 2160
+    decodedWidth = 1936
+    decodedHeight = 2160
     frameRate = 90.00
     maxSubLayers = 1
     colorInfo:
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/water_180_mvhevc_5frames.mov.reading_within_gop_sample_dependencies.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/water_180_mvhevc_5frames.mov.reading_within_gop_sample_dependencies.1.dump
index 7ef19dc698..7df8fda58d 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/water_180_mvhevc_5frames.mov.reading_within_gop_sample_dependencies.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/water_180_mvhevc_5frames.mov.reading_within_gop_sample_dependencies.1.dump
@@ -20,6 +20,8 @@ track 0:
     maxNumReorderSamples = 2
     width = 1934
     height = 2160
+    decodedWidth = 1936
+    decodedHeight = 2160
     frameRate = 90.00
     maxSubLayers = 1
     colorInfo:
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/water_180_mvhevc_5frames.mov.reading_within_gop_sample_dependencies.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/water_180_mvhevc_5frames.mov.reading_within_gop_sample_dependencies.2.dump
index 7ef19dc698..7df8fda58d 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/water_180_mvhevc_5frames.mov.reading_within_gop_sample_dependencies.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/water_180_mvhevc_5frames.mov.reading_within_gop_sample_dependencies.2.dump
@@ -20,6 +20,8 @@ track 0:
     maxNumReorderSamples = 2
     width = 1934
     height = 2160
+    decodedWidth = 1936
+    decodedHeight = 2160
     frameRate = 90.00
     maxSubLayers = 1
     colorInfo:
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/water_180_mvhevc_5frames.mov.reading_within_gop_sample_dependencies.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/water_180_mvhevc_5frames.mov.reading_within_gop_sample_dependencies.3.dump
index 7ef19dc698..7df8fda58d 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/water_180_mvhevc_5frames.mov.reading_within_gop_sample_dependencies.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/water_180_mvhevc_5frames.mov.reading_within_gop_sample_dependencies.3.dump
@@ -20,6 +20,8 @@ track 0:
     maxNumReorderSamples = 2
     width = 1934
     height = 2160
+    decodedWidth = 1936
+    decodedHeight = 2160
     frameRate = 90.00
     maxSubLayers = 1
     colorInfo:
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/water_180_mvhevc_5frames.mov.reading_within_gop_sample_dependencies.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/water_180_mvhevc_5frames.mov.reading_within_gop_sample_dependencies.unknown_length.dump
index 7ef19dc698..7df8fda58d 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/water_180_mvhevc_5frames.mov.reading_within_gop_sample_dependencies.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/water_180_mvhevc_5frames.mov.reading_within_gop_sample_dependencies.unknown_length.dump
@@ -20,6 +20,8 @@ track 0:
     maxNumReorderSamples = 2
     width = 1934
     height = 2160
+    decodedWidth = 1936
+    decodedHeight = 2160
     frameRate = 90.00
     maxSubLayers = 1
     colorInfo:
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/water_180_mvhevc_5frames.mov.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/water_180_mvhevc_5frames.mov.unknown_length.dump
index 7ef19dc698..7df8fda58d 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/water_180_mvhevc_5frames.mov.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/water_180_mvhevc_5frames.mov.unknown_length.dump
@@ -20,6 +20,8 @@ track 0:
     maxNumReorderSamples = 2
     width = 1934
     height = 2160
+    decodedWidth = 1936
+    decodedHeight = 2160
     frameRate = 90.00
     maxSubLayers = 1
     colorInfo:
diff --git a/libraries/test_data/src/test/assets/muxerdumps/h265_with_metadata_track.mp4.dump b/libraries/test_data/src/test/assets/muxerdumps/h265_with_metadata_track.mp4.dump
index 7fd0ad2170..e8efebcc2a 100644
--- a/libraries/test_data/src/test/assets/muxerdumps/h265_with_metadata_track.mp4.dump
+++ b/libraries/test_data/src/test/assets/muxerdumps/h265_with_metadata_track.mp4.dump
@@ -72,6 +72,8 @@ track 2:
     maxNumReorderSamples = 0
     width = 1920
     height = 1080
+    decodedWidth = 1920
+    decodedHeight = 1088
     frameRate = 29.98
     maxSubLayers = 1
     colorInfo:
diff --git a/libraries/test_data/src/test/assets/muxerdumps/h265_with_metadata_track.mp4_fragmented.dump b/libraries/test_data/src/test/assets/muxerdumps/h265_with_metadata_track.mp4_fragmented.dump
index 8bc8cb4311..20af9685cf 100644
--- a/libraries/test_data/src/test/assets/muxerdumps/h265_with_metadata_track.mp4_fragmented.dump
+++ b/libraries/test_data/src/test/assets/muxerdumps/h265_with_metadata_track.mp4_fragmented.dump
@@ -59,6 +59,8 @@ track 2:
     maxNumReorderSamples = 0
     width = 1920
     height = 1080
+    decodedWidth = 1920
+    decodedHeight = 1088
     maxSubLayers = 1
     colorInfo:
       colorSpace = 2
diff --git a/libraries/test_data/src/test/assets/muxerdumps/hdr10-720p.mp4.dump b/libraries/test_data/src/test/assets/muxerdumps/hdr10-720p.mp4.dump
index 8a2ecbeac6..e128e0928a 100644
--- a/libraries/test_data/src/test/assets/muxerdumps/hdr10-720p.mp4.dump
+++ b/libraries/test_data/src/test/assets/muxerdumps/hdr10-720p.mp4.dump
@@ -20,6 +20,8 @@ track 0:
     maxNumReorderSamples = 0
     width = 1280
     height = 720
+    decodedWidth = 1280
+    decodedHeight = 720
     frameRate = 29.98
     maxSubLayers = 1
     colorInfo:
diff --git a/libraries/test_data/src/test/assets/muxerdumps/hdr10-720p.mp4_fragmented.dump b/libraries/test_data/src/test/assets/muxerdumps/hdr10-720p.mp4_fragmented.dump
index ee77c50859..9b5414e9fc 100644
--- a/libraries/test_data/src/test/assets/muxerdumps/hdr10-720p.mp4_fragmented.dump
+++ b/libraries/test_data/src/test/assets/muxerdumps/hdr10-720p.mp4_fragmented.dump
@@ -14,6 +14,8 @@ track 0:
     maxNumReorderSamples = 0
     width = 1280
     height = 720
+    decodedWidth = 1280
+    decodedHeight = 720
     maxSubLayers = 1
     colorInfo:
       colorSpace = 6
diff --git a/libraries/test_data/src/test/assets/muxerdumps/partial_hdr10-720p.mp4.dump b/libraries/test_data/src/test/assets/muxerdumps/partial_hdr10-720p.mp4.dump
index b61aeae8ab..c13eb6f033 100644
--- a/libraries/test_data/src/test/assets/muxerdumps/partial_hdr10-720p.mp4.dump
+++ b/libraries/test_data/src/test/assets/muxerdumps/partial_hdr10-720p.mp4.dump
@@ -20,6 +20,8 @@ track 0:
     maxNumReorderSamples = 0
     width = 1280
     height = 720
+    decodedWidth = 1280
+    decodedHeight = 720
     frameRate = 29.97
     maxSubLayers = 1
     colorInfo:
diff --git a/libraries/test_data/src/test/assets/muxerdumps/sample_batching_and_attempt_streamable_output_disabled_hdr10-720p.mp4.dump b/libraries/test_data/src/test/assets/muxerdumps/sample_batching_and_attempt_streamable_output_disabled_hdr10-720p.mp4.dump
index fa4e28a222..8f77df3ed0 100644
--- a/libraries/test_data/src/test/assets/muxerdumps/sample_batching_and_attempt_streamable_output_disabled_hdr10-720p.mp4.dump
+++ b/libraries/test_data/src/test/assets/muxerdumps/sample_batching_and_attempt_streamable_output_disabled_hdr10-720p.mp4.dump
@@ -20,6 +20,8 @@ track 0:
     maxNumReorderSamples = 0
     width = 1280
     height = 720
+    decodedWidth = 1280
+    decodedHeight = 720
     frameRate = 29.98
     maxSubLayers = 1
     colorInfo:
diff --git a/libraries/test_data/src/test/assets/muxerdumps/sample_batching_disabled_hdr10-720p.mp4.dump b/libraries/test_data/src/test/assets/muxerdumps/sample_batching_disabled_hdr10-720p.mp4.dump
index 8a2ecbeac6..e128e0928a 100644
--- a/libraries/test_data/src/test/assets/muxerdumps/sample_batching_disabled_hdr10-720p.mp4.dump
+++ b/libraries/test_data/src/test/assets/muxerdumps/sample_batching_disabled_hdr10-720p.mp4.dump
@@ -20,6 +20,8 @@ track 0:
     maxNumReorderSamples = 0
     width = 1280
     height = 720
+    decodedWidth = 1280
+    decodedHeight = 720
     frameRate = 29.98
     maxSubLayers = 1
     colorInfo:
diff --git a/libraries/test_data/src/test/assets/muxerdumps/sample_edit_list.mp4.dump b/libraries/test_data/src/test/assets/muxerdumps/sample_edit_list.mp4.dump
index 79619edae2..9857a9266d 100644
--- a/libraries/test_data/src/test/assets/muxerdumps/sample_edit_list.mp4.dump
+++ b/libraries/test_data/src/test/assets/muxerdumps/sample_edit_list.mp4.dump
@@ -20,6 +20,8 @@ track 0:
     maxNumReorderSamples = 2
     width = 1920
     height = 1080
+    decodedWidth = 1920
+    decodedHeight = 1088
     frameRate = 27.11
     maxSubLayers = 1
     colorInfo:
@@ -387,6 +389,8 @@ track 1:
     maxNumReorderSamples = 2
     width = 1920
     height = 1080
+    decodedWidth = 1920
+    decodedHeight = 1088
     frameRate = 27.11
     maxSubLayers = 1
     colorInfo:
diff --git a/libraries/test_data/src/test/assets/muxerdumps/sample_edit_list.mp4_fragmented.dump b/libraries/test_data/src/test/assets/muxerdumps/sample_edit_list.mp4_fragmented.dump
index d1e1676889..2fb23a4f94 100644
--- a/libraries/test_data/src/test/assets/muxerdumps/sample_edit_list.mp4_fragmented.dump
+++ b/libraries/test_data/src/test/assets/muxerdumps/sample_edit_list.mp4_fragmented.dump
@@ -14,6 +14,8 @@ track 0:
     maxNumReorderSamples = 2
     width = 1920
     height = 1080
+    decodedWidth = 1920
+    decodedHeight = 1088
     maxSubLayers = 1
     colorInfo:
       colorSpace = 6
@@ -376,6 +378,8 @@ track 1:
     maxNumReorderSamples = 2
     width = 1920
     height = 1080
+    decodedWidth = 1920
+    decodedHeight = 1088
     maxSubLayers = 1
     colorInfo:
       colorSpace = 6
diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/dolbyVision-hdr.MOV/transmuxed_with_inappmuxer.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/dolbyVision-hdr.MOV/transmuxed_with_inappmuxer.dump
index 34fcc2bc3b..263d79a25f 100644
--- a/libraries/test_data/src/test/assets/transformerdumps/mp4/dolbyVision-hdr.MOV/transmuxed_with_inappmuxer.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/mp4/dolbyVision-hdr.MOV/transmuxed_with_inappmuxer.dump
@@ -20,6 +20,8 @@ track 0:
     maxNumReorderSamples = 2
     width = 1280
     height = 720
+    decodedWidth = 1280
+    decodedHeight = 720
     frameRate = 30.00
     rotationDegrees = 90
     maxSubLayers = 1
diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/h265_with_metadata_track.mp4/transmuxed_with_inappmuxer.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/h265_with_metadata_track.mp4/transmuxed_with_inappmuxer.dump
index 08b6f9827a..1790aba40b 100644
--- a/libraries/test_data/src/test/assets/transformerdumps/mp4/h265_with_metadata_track.mp4/transmuxed_with_inappmuxer.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/mp4/h265_with_metadata_track.mp4/transmuxed_with_inappmuxer.dump
@@ -20,6 +20,8 @@ track 0:
     maxNumReorderSamples = 0
     width = 1920
     height = 1080
+    decodedWidth = 1920
+    decodedHeight = 1088
     frameRate = 29.98
     rotationDegrees = 90
     maxSubLayers = 1
diff --git a/libraries/test_utils/src/main/java/androidx/media3/test/utils/DumpableFormat.java b/libraries/test_utils/src/main/java/androidx/media3/test/utils/DumpableFormat.java
index 09cf5b020a..be7cd1e4ed 100644
--- a/libraries/test_utils/src/main/java/androidx/media3/test/utils/DumpableFormat.java
+++ b/libraries/test_utils/src/main/java/androidx/media3/test/utils/DumpableFormat.java
@@ -56,6 +56,8 @@ public final class DumpableFormat implements Dumper.Dumpable {
         "maxNumReorderSamples", format, DEFAULT_FORMAT, format -> format.maxNumReorderSamples);
     dumper.addIfNonDefault("width", format, DEFAULT_FORMAT, format -> format.width);
     dumper.addIfNonDefault("height", format, DEFAULT_FORMAT, format -> format.height);
+    dumper.addIfNonDefault("decodedWidth", format, DEFAULT_FORMAT, format -> format.decodedWidth);
+    dumper.addIfNonDefault("decodedHeight", format, DEFAULT_FORMAT, format -> format.decodedHeight);
     dumper.addIfNonDefault(
         "frameRate",
         format,