From 534740fd46f5ec9465215eaaa03a764eebab4ac4 Mon Sep 17 00:00:00 2001
From: huangdarwin <huangdarwin@google.com>
Date: Fri, 29 Jul 2022 01:16:26 +0000
Subject: [PATCH] Transformer: Improve misc javadocs and exception logs.

PiperOrigin-RevId: 463971447
---
 .../src/main/java/androidx/media3/common/C.java    | 14 +++++++-------
 .../media3/common/util/MediaFormatUtil.java        |  4 ++--
 .../androidx/media3/transformer/DefaultCodec.java  |  5 ++++-
 .../transformer/GlEffectsFrameProcessor.java       |  2 +-
 4 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/libraries/common/src/main/java/androidx/media3/common/C.java b/libraries/common/src/main/java/androidx/media3/common/C.java
index 517dbc5810..968253e4b3 100644
--- a/libraries/common/src/main/java/androidx/media3/common/C.java
+++ b/libraries/common/src/main/java/androidx/media3/common/C.java
@@ -1046,23 +1046,23 @@ 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}.
    */
   @UnstableApi
   @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
-   */
-  @UnstableApi public static final int COLOR_SPACE_BT709 = MediaFormat.COLOR_STANDARD_BT709;
   /**
    * @see MediaFormat#COLOR_STANDARD_BT601_PAL
    */
   @UnstableApi public static final int COLOR_SPACE_BT601 = MediaFormat.COLOR_STANDARD_BT601_PAL;
+  /**
+   * @see MediaFormat#COLOR_STANDARD_BT709
+   */
+  @UnstableApi public static final int COLOR_SPACE_BT709 = MediaFormat.COLOR_STANDARD_BT709;
   /**
    * @see MediaFormat#COLOR_STANDARD_BT2020
    */
diff --git a/libraries/common/src/main/java/androidx/media3/common/util/MediaFormatUtil.java b/libraries/common/src/main/java/androidx/media3/common/util/MediaFormatUtil.java
index 90c5d4dd41..3e526c7c28 100644
--- a/libraries/common/src/main/java/androidx/media3/common/util/MediaFormatUtil.java
+++ b/libraries/common/src/main/java/androidx/media3/common/util/MediaFormatUtil.java
@@ -303,8 +303,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/libraries/transformer/src/main/java/androidx/media3/transformer/DefaultCodec.java b/libraries/transformer/src/main/java/androidx/media3/transformer/DefaultCodec.java
index 7168177b19..71a809dfc5 100644
--- a/libraries/transformer/src/main/java/androidx/media3/transformer/DefaultCodec.java
+++ b/libraries/transformer/src/main/java/androidx/media3/transformer/DefaultCodec.java
@@ -24,6 +24,7 @@ import static androidx.media3.common.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;
@@ -327,7 +328,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));
         }
@@ -445,6 +446,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,
@@ -459,6 +461,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/libraries/transformer/src/main/java/androidx/media3/transformer/GlEffectsFrameProcessor.java b/libraries/transformer/src/main/java/androidx/media3/transformer/GlEffectsFrameProcessor.java
index 808215dc41..fb02c98c8f 100644
--- a/libraries/transformer/src/main/java/androidx/media3/transformer/GlEffectsFrameProcessor.java
+++ b/libraries/transformer/src/main/java/androidx/media3/transformer/GlEffectsFrameProcessor.java
@@ -403,7 +403,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) {