From 212e138bcf1730cdc77614c336770208ee8f6816 Mon Sep 17 00:00:00 2001
From: microkatz <michaelkatz@google.com>
Date: Thu, 7 Sep 2023 11:56:42 +0000
Subject: [PATCH] Removed deprecated ColorInfo constructor call and fixed
 formatting

---
 .../common/util/MediaFormatUtilTest.java      | 11 +++++-----
 .../media3/exoplayer/rtsp/RtspMediaTrack.java | 22 ++++++++++---------
 .../extractor/mkv/MatroskaExtractor.java      | 17 +++++++-------
 3 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/libraries/common/src/test/java/androidx/media3/common/util/MediaFormatUtilTest.java b/libraries/common/src/test/java/androidx/media3/common/util/MediaFormatUtilTest.java
index c6440562bf..f11607d569 100644
--- a/libraries/common/src/test/java/androidx/media3/common/util/MediaFormatUtilTest.java
+++ b/libraries/common/src/test/java/androidx/media3/common/util/MediaFormatUtilTest.java
@@ -150,11 +150,12 @@ public class MediaFormatUtilTest {
             .setAverageBitrate(1)
             .setChannelCount(2)
             .setColorInfo(
-                new ColorInfo(
-                    /* colorSpace= */ C.COLOR_SPACE_BT601,
-                    /* colorRange= */ C.COLOR_RANGE_FULL,
-                    /* colorTransfer= */ C.COLOR_TRANSFER_HLG,
-                    new byte[] {3}))
+                new ColorInfo.Builder()
+                    .setColorSpace(C.COLOR_SPACE_BT601)
+                    .setColorRange(C.COLOR_RANGE_FULL)
+                    .setColorTransfer(C.COLOR_TRANSFER_HLG)
+                    .setHdrStaticInfo(new byte[] {3})
+                    .build())
             .setSampleMimeType(MimeTypes.VIDEO_H264)
             .setCodecs("avc.123")
             .setFrameRate(4)
diff --git a/libraries/exoplayer_rtsp/src/main/java/androidx/media3/exoplayer/rtsp/RtspMediaTrack.java b/libraries/exoplayer_rtsp/src/main/java/androidx/media3/exoplayer/rtsp/RtspMediaTrack.java
index 6acf8178d7..11a3313ada 100644
--- a/libraries/exoplayer_rtsp/src/main/java/androidx/media3/exoplayer/rtsp/RtspMediaTrack.java
+++ b/libraries/exoplayer_rtsp/src/main/java/androidx/media3/exoplayer/rtsp/RtspMediaTrack.java
@@ -413,13 +413,14 @@ import com.google.common.collect.ImmutableMap;
     formatBuilder.setPixelWidthHeightRatio(spsData.pixelWidthHeightRatio);
     formatBuilder.setHeight(spsData.height);
     formatBuilder.setWidth(spsData.width);
-    formatBuilder.setColorInfo(new ColorInfo.Builder()
-        .setColorSpace(spsData.colorSpace)
+    formatBuilder.setColorInfo(
+        new ColorInfo.Builder()
+            .setColorSpace(spsData.colorSpace)
             .setColorRange(spsData.colorRange)
             .setColorTransfer(spsData.colorTransfer)
             .setLumaBitdepth(spsData.bitDepthLumaMinus8 + 8)
             .setChromaBitdepth(spsData.bitDepthChromaMinus8 + 8)
-        .build());
+            .build());
 
     @Nullable String profileLevel = fmtpAttributes.get(PARAMETER_PROFILE_LEVEL_ID);
     if (profileLevel != null) {
@@ -463,13 +464,14 @@ import com.google.common.collect.ImmutableMap;
             spsNalDataWithStartCode, NAL_START_CODE.length, spsNalDataWithStartCode.length);
     formatBuilder.setPixelWidthHeightRatio(spsData.pixelWidthHeightRatio);
     formatBuilder.setHeight(spsData.height).setWidth(spsData.width);
-    formatBuilder.setColorInfo(new ColorInfo.Builder()
-        .setColorSpace(spsData.colorSpace)
-        .setColorRange(spsData.colorRange)
-        .setColorTransfer(spsData.colorTransfer)
-        .setLumaBitdepth(spsData.bitDepthLumaMinus8 + 8)
-        .setChromaBitdepth(spsData.bitDepthChromaMinus8 + 8)
-        .build());
+    formatBuilder.setColorInfo(
+        new ColorInfo.Builder()
+            .setColorSpace(spsData.colorSpace)
+            .setColorRange(spsData.colorRange)
+            .setColorTransfer(spsData.colorTransfer)
+            .setLumaBitdepth(spsData.bitDepthLumaMinus8 + 8)
+            .setChromaBitdepth(spsData.bitDepthChromaMinus8 + 8)
+            .build());
 
     formatBuilder.setCodecs(
         CodecSpecificDataUtil.buildHevcCodecString(
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 5dad2d4d1d..8aa161c7db 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
@@ -2295,14 +2295,15 @@ public class MatroskaExtractor implements Extractor {
         @Nullable ColorInfo colorInfo = null;
         if (hasColorInfo) {
           @Nullable byte[] hdrStaticInfo = getHdrStaticInfo();
-          colorInfo = new ColorInfo.Builder()
-              .setColorSpace(colorSpace)
-              .setColorRange(colorRange)
-              .setColorTransfer(colorTransfer)
-              .setHdrStaticInfo(hdrStaticInfo)
-              .setLumaBitdepth(bitsPerChannel)
-              .setChromaBitdepth(bitsPerChannel)
-              .build();
+          colorInfo =
+              new ColorInfo.Builder()
+                  .setColorSpace(colorSpace)
+                  .setColorRange(colorRange)
+                  .setColorTransfer(colorTransfer)
+                  .setHdrStaticInfo(hdrStaticInfo)
+                  .setLumaBitdepth(bitsPerChannel)
+                  .setChromaBitdepth(bitsPerChannel)
+                  .build();
         }
         int rotationDegrees = Format.NO_VALUE;