diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/upstream/CmcdConfiguration.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/upstream/CmcdConfiguration.java
index a16f06dd44..c1c50f9087 100644
--- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/upstream/CmcdConfiguration.java
+++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/upstream/CmcdConfiguration.java
@@ -285,7 +285,7 @@ public final class CmcdConfiguration {
   }
 
   /**
-   * Returns whether logging object duration is allowed based on the {@linkplain RequestConfig
+   * Returns whether logging measured throughput is allowed based on the {@linkplain RequestConfig
    * request configuration}.
    */
   public boolean isMeasuredThroughputLoggingAllowed() {
diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/upstream/CmcdLog.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/upstream/CmcdLog.java
index 9f99bb8ae8..eef715f0fa 100644
--- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/upstream/CmcdLog.java
+++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/upstream/CmcdLog.java
@@ -444,8 +444,8 @@ public final class CmcdLog {
     public static final class Builder {
       @Nullable private String contentId;
       @Nullable private String sessionId;
-      @Nullable private String streamingFormat;
-      @Nullable private String streamType;
+      @Nullable private @StreamingFormat String streamingFormat;
+      @Nullable private @StreamType String streamType;
       @Nullable private String customData;
 
       /**
@@ -530,13 +530,13 @@ public final class CmcdLog {
      * (HLS), s = Smooth Streaming and o = other. If the streaming format being requested is
      * unknown, then this key MUST NOT be used.
      */
-    @Nullable public final String streamingFormat;
+    @Nullable public final @StreamingFormat String streamingFormat;
 
     /**
      * Type of stream. v = all segments are available – e.g., VOD and l = segments become available
      * over time – e.g., LIVE.
      */
-    @Nullable public final String streamType;
+    @Nullable public final @StreamType String streamType;
 
     /**
      * Custom data where the values of the keys are expected to be invariant over the life of the