diff --git a/library/common/src/main/java/com/google/android/exoplayer2/C.java b/library/common/src/main/java/com/google/android/exoplayer2/C.java
index 40f9169b22..c2ce271b7a 100644
--- a/library/common/src/main/java/com/google/android/exoplayer2/C.java
+++ b/library/common/src/main/java/com/google/android/exoplayer2/C.java
@@ -1024,22 +1024,22 @@ public final class C {
 
   // LINT.IfChange(color_space)
   /**
-   * Video colorspaces. One of {@link Format#NO_VALUE}, {@link #COLOR_SPACE_BT709}, {@link
-   * #COLOR_SPACE_BT601} or {@link #COLOR_SPACE_BT2020}.
+   * Video colorspaces. One of {@link Format#NO_VALUE}, {@link #COLOR_SPACE_BT601}, {@link
+   * #COLOR_SPACE_BT709} or {@link #COLOR_SPACE_BT2020}.
    */
   @Documented
   @Retention(RetentionPolicy.SOURCE)
   @Target(TYPE_USE)
-  @IntDef({Format.NO_VALUE, COLOR_SPACE_BT709, COLOR_SPACE_BT601, COLOR_SPACE_BT2020})
+  @IntDef({Format.NO_VALUE, COLOR_SPACE_BT601, COLOR_SPACE_BT709, COLOR_SPACE_BT2020})
   public @interface ColorSpace {}
-  /**
-   * @see MediaFormat#COLOR_STANDARD_BT709
-   */
-  public static final int COLOR_SPACE_BT709 = MediaFormat.COLOR_STANDARD_BT709;
   /**
    * @see MediaFormat#COLOR_STANDARD_BT601_PAL
    */
   public static final int COLOR_SPACE_BT601 = MediaFormat.COLOR_STANDARD_BT601_PAL;
+  /**
+   * @see MediaFormat#COLOR_STANDARD_BT709
+   */
+  public static final int COLOR_SPACE_BT709 = MediaFormat.COLOR_STANDARD_BT709;
   /**
    * @see MediaFormat#COLOR_STANDARD_BT2020
    */
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/util/MediaFormatUtil.java b/library/common/src/main/java/com/google/android/exoplayer2/util/MediaFormatUtil.java
index fd99769a54..357fcca16a 100644
--- a/library/common/src/main/java/com/google/android/exoplayer2/util/MediaFormatUtil.java
+++ b/library/common/src/main/java/com/google/android/exoplayer2/util/MediaFormatUtil.java
@@ -302,8 +302,8 @@ public final class MediaFormatUtil {
   /** Whether this is a valid {@link C.ColorSpace} instance. */
   private static boolean isValidColorSpace(int colorSpace) {
     // LINT.IfChange(color_space)
-    return colorSpace == C.COLOR_SPACE_BT709
-        || colorSpace == C.COLOR_SPACE_BT601
+    return colorSpace == C.COLOR_SPACE_BT601
+        || colorSpace == C.COLOR_SPACE_BT709
         || colorSpace == C.COLOR_SPACE_BT2020
         || colorSpace == Format.NO_VALUE;
   }
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 98efcbd266..14fae093eb 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
@@ -24,6 +24,7 @@ import static com.google.android.exoplayer2.util.Util.SDK_INT;
 import android.content.Context;
 import android.media.MediaCodec;
 import android.media.MediaCodec.BufferInfo;
+import android.media.MediaCrypto;
 import android.media.MediaFormat;
 import android.view.Surface;
 import androidx.annotation.Nullable;
@@ -325,7 +326,7 @@ public final class DefaultCodec implements Codec {
           throw createTransformationException(
               new IllegalStateException(
                   "Codec output color format does not match configured color format. Configured: "
-                      + configurationFormat.colorInfo
+                      + configuredOutputColor
                       + ". Actual: "
                       + outputFormat.colorInfo));
         }
@@ -443,6 +444,7 @@ public final class DefaultCodec implements Codec {
     return formatBuilder.build();
   }
 
+  /** Calls and traces {@link MediaCodec#configure(MediaFormat, Surface, MediaCrypto, int)}. */
   private static void configureCodec(
       MediaCodec codec,
       MediaFormat mediaFormat,
@@ -457,6 +459,7 @@ public final class DefaultCodec implements Codec {
     TraceUtil.endSection();
   }
 
+  /** Calls and traces {@link MediaCodec#start()}. */
   private static void startCodec(MediaCodec codec) {
     TraceUtil.beginSection("startCodec");
     codec.start();
diff --git a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/GlEffectsFrameProcessor.java b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/GlEffectsFrameProcessor.java
index 27d3c9d269..92e1a123f6 100644
--- a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/GlEffectsFrameProcessor.java
+++ b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/GlEffectsFrameProcessor.java
@@ -401,7 +401,7 @@ public final class GlEffectsFrameProcessor implements FrameProcessor {
   /**
    * Expands or shrinks the frame based on the {@link FrameInfo#pixelWidthHeightRatio} and returns a
    * new {@link FrameInfo} instance with scaled dimensions and {@link
-   * FrameInfo#pixelWidthHeightRatio} 1.
+   * FrameInfo#pixelWidthHeightRatio} of {@code 1}.
    */
   private FrameInfo adjustForPixelWidthHeightRatio(FrameInfo frameInfo) {
     if (frameInfo.pixelWidthHeightRatio > 1f) {