diff --git a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/DefaultCodec.java b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/DefaultCodec.java
index a298e38630b..40c9eda96f2 100644
--- a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/DefaultCodec.java
+++ b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/DefaultCodec.java
@@ -39,7 +39,6 @@
 import com.google.android.exoplayer2.util.MediaFormatUtil;
 import com.google.android.exoplayer2.util.MimeTypes;
 import com.google.android.exoplayer2.util.TraceUtil;
-import com.google.android.exoplayer2.util.Util;
 import com.google.android.exoplayer2.video.ColorInfo;
 import com.google.common.base.Ascii;
 import com.google.common.collect.ImmutableList;
@@ -106,7 +105,7 @@ public DefaultCodec(
     @Nullable Surface inputSurface = null;
     try {
       boolean requestedHdrToneMapping =
-          Util.SDK_INT >= 29 && Api29.isSdrToneMappingEnabled(configurationMediaFormat);
+          SDK_INT >= 29 && Api29.isSdrToneMappingEnabled(configurationMediaFormat);
       mediaCodec = MediaCodec.createByCodecName(mediaCodecName);
       configureCodec(mediaCodec, configurationMediaFormat, isDecoder, outputSurface);
       if (SDK_INT >= 29 && requestedHdrToneMapping) {
diff --git a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/EncoderUtil.java b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/EncoderUtil.java
index 30503dd3bfb..b86c808840a 100644
--- a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/EncoderUtil.java
+++ b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/EncoderUtil.java
@@ -86,7 +86,7 @@ public static ImmutableList<String> getSupportedEncoderNamesForHdrEditing(
     for (int i = 0; i < mediaCodecInfos.size(); i++) {
       MediaCodecInfo mediaCodecInfo = mediaCodecInfos.get(i);
       if (mediaCodecInfo.isAlias()
-          || !EncoderUtil.isFeatureSupported(
+          || !isFeatureSupported(
               mediaCodecInfo, mimeType, MediaCodecInfo.CodecCapabilities.FEATURE_HdrEditing)) {
         continue;
       }
diff --git a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/Transformer.java b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/Transformer.java
index f37345e344c..53122700a95 100644
--- a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/Transformer.java
+++ b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/Transformer.java
@@ -535,8 +535,9 @@ default void onTransformationError(
      * @param originalTransformationRequest The unsupported {@link TransformationRequest} used when
      *     building {@link Transformer}.
      * @param fallbackTransformationRequest The alternative {@link TransformationRequest}, with
-     *     supported {@link TransformationRequest#outputHeight} and {@link
-     *     TransformationRequest#videoMimeType} values set.
+     *     supported {@link TransformationRequest#audioMimeType}, {@link
+     *     TransformationRequest#videoMimeType}, {@link TransformationRequest#outputHeight}, and
+     *     {@link TransformationRequest#enableRequestSdrToneMapping} values set.
      */
     default void onFallbackApplied(
         MediaItem inputMediaItem,