diff --git a/libraries/container/src/main/java/androidx/media3/container/Mp4LocationData.java b/libraries/container/src/main/java/androidx/media3/container/Mp4LocationData.java
index 7665e41838..915b0e3b86 100644
--- a/libraries/container/src/main/java/androidx/media3/container/Mp4LocationData.java
+++ b/libraries/container/src/main/java/androidx/media3/container/Mp4LocationData.java
@@ -23,10 +23,19 @@ import androidx.media3.common.Metadata;
 import androidx.media3.common.util.UnstableApi;
 import com.google.common.primitives.Floats;
 
-/** Stores MP4 location data. */
+/**
+ * Stores MP4 location data.
+ *
+ * <p>The location data is typically read/written in the "udta" box (user data box, defined in
+ * ISO/IEC 14496-12).
+ */
 @UnstableApi
 public final class Mp4LocationData implements Metadata.Entry {
+
+  /** The latitude, in degrees. */
   public final float latitude;
+
+  /** The longitude, in degrees. */
   public final float longitude;
 
   /**
diff --git a/libraries/container/src/main/java/androidx/media3/container/Mp4OrientationData.java b/libraries/container/src/main/java/androidx/media3/container/Mp4OrientationData.java
index f67a6cbd69..98c0eeb46d 100644
--- a/libraries/container/src/main/java/androidx/media3/container/Mp4OrientationData.java
+++ b/libraries/container/src/main/java/androidx/media3/container/Mp4OrientationData.java
@@ -21,9 +21,16 @@ import androidx.annotation.Nullable;
 import androidx.media3.common.Metadata;
 import androidx.media3.common.util.UnstableApi;
 
-/** Stores the orientation hint for the video playback. */
+/**
+ * Stores the orientation hint for the video playback.
+ *
+ * <p>The orientation hint is typically read/written in the "tkhd" box (track header box, defined in
+ * ISO/IEC 14496-12).
+ */
 @UnstableApi
 public final class Mp4OrientationData implements Metadata.Entry {
+
+  /** The orientation, in degrees. */
   public final int orientation;
 
   /**