diff --git a/libraries/extractor/src/main/java/androidx/media3/extractor/mkv/MatroskaExtractor.java b/libraries/extractor/src/main/java/androidx/media3/extractor/mkv/MatroskaExtractor.java
index e558db01d8..bae33b9569 100644
--- a/libraries/extractor/src/main/java/androidx/media3/extractor/mkv/MatroskaExtractor.java
+++ b/libraries/extractor/src/main/java/androidx/media3/extractor/mkv/MatroskaExtractor.java
@@ -1022,7 +1022,7 @@ public class MatroskaExtractor implements Extractor {
       case ID_COLOUR_BITS_PER_CHANNEL:
         assertInTrackEntry(id);
         currentTrack.hasColorInfo = true;
-        currentTrack.bitsPerChannel = (int)value;
+        currentTrack.bitsPerChannel = (int) value;
         break;
       case ID_COLOUR_RANGE:
         assertInTrackEntry(id);
@@ -2308,7 +2308,14 @@ public class MatroskaExtractor implements Extractor {
         @Nullable ColorInfo colorInfo = null;
         if (hasColorInfo) {
           @Nullable byte[] hdrStaticInfo = getHdrStaticInfo();
-          colorInfo = new ColorInfo(colorSpace, colorRange, colorTransfer, hdrStaticInfo, bitsPerChannel, bitsPerChannel);
+          colorInfo =
+              new ColorInfo(
+                  colorSpace,
+                  colorRange,
+                  colorTransfer,
+                  hdrStaticInfo,
+                  bitsPerChannel,
+                  bitsPerChannel);
         }
         int rotationDegrees = Format.NO_VALUE;
 
diff --git a/libraries/extractor/src/main/java/androidx/media3/extractor/mp4/AtomParsers.java b/libraries/extractor/src/main/java/androidx/media3/extractor/mp4/AtomParsers.java
index 680e647014..b602349f7e 100644
--- a/libraries/extractor/src/main/java/androidx/media3/extractor/mp4/AtomParsers.java
+++ b/libraries/extractor/src/main/java/androidx/media3/extractor/mp4/AtomParsers.java
@@ -1224,7 +1224,8 @@ import java.util.List;
         ExtractorUtil.checkContainerInput(mimeType == null, /* message= */ null);
         mimeType = MimeTypes.VIDEO_AV1;
         parent.setPosition(childStartPosition + Atom.HEADER_SIZE);
-        parent.skipBytes(1); ;  // marker(1), version(7)
+        parent.skipBytes(1);
+        ; // marker(1), version(7)
         int byte2 = parent.readUnsignedByte();
         int seqProfile = byte2 >> 5;
         int byte3 = parent.readUnsignedByte();
@@ -1367,13 +1368,13 @@ import java.util.List;
             // Note that if either mdcv or clli are missing, we leave the corresponding HDR static
             // metadata bytes with value zero. See [Internal ref: b/194535665].
             .setColorInfo(
-              new ColorInfo(
-                  colorSpace,
-                  colorRange,
-                  colorTransfer,
-                  hdrStaticInfo != null ? hdrStaticInfo.array() : null,
-                  bitdepthLuma,
-                  bitdepthChroma));
+                new ColorInfo(
+                    colorSpace,
+                    colorRange,
+                    colorTransfer,
+                    hdrStaticInfo != null ? hdrStaticInfo.array() : null,
+                    bitdepthLuma,
+                    bitdepthChroma));
 
     if (esdsData != null) {
       formatBuilder