Update `colr` box values to be overridden by bitstream boxes

#minor-release

PiperOrigin-RevId: 523983688
(cherry picked from commit ded12062)

library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/AtomParsers.java

@@ -1164,15 +1164,9 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
           pixelWidthHeightRatio = hevcConfig.pixelWidthHeightRatio;
         }
         codecs = hevcConfig.codecs;
-        // Modify these values only if they have not already been set. If 'Atom.TYPE_colr' atom is
-        // present, these values may be overridden.
-        if (colorSpace == Format.NO_VALUE
-            && colorRange == Format.NO_VALUE
-            && colorTransfer == Format.NO_VALUE) {
-          colorSpace = hevcConfig.colorSpace;
-          colorRange = hevcConfig.colorRange;
-          colorTransfer = hevcConfig.colorTransfer;
-        }
+        colorSpace = hevcConfig.colorSpace;
+        colorRange = hevcConfig.colorRange;
+        colorTransfer = hevcConfig.colorTransfer;
       } else if (childAtomType == Atom.TYPE_dvcC || childAtomType == Atom.TYPE_dvvC) {
         @Nullable DolbyVisionConfig dolbyVisionConfig = DolbyVisionConfig.parse(parent);
         if (dolbyVisionConfig != null) {
@@ -1188,16 +1182,10 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
         boolean fullRangeFlag = (parent.readUnsignedByte() & 1) != 0;
         int colorPrimaries = parent.readUnsignedByte();
         int transferCharacteristics = parent.readUnsignedByte();
-        // Modify these values only if they have not already been set. If 'Atom.TYPE_colr' atom is
-        // present, these values may be overridden.
-        if (colorSpace == Format.NO_VALUE
-            && colorRange == Format.NO_VALUE
-            && colorTransfer == Format.NO_VALUE) {
-          colorSpace = ColorInfo.isoColorPrimariesToColorSpace(colorPrimaries);
-          colorRange = fullRangeFlag ? C.COLOR_RANGE_FULL : C.COLOR_RANGE_LIMITED;
-          colorTransfer =
-              ColorInfo.isoTransferCharacteristicsToColorTransfer(transferCharacteristics);
-        }
+        colorSpace = ColorInfo.isoColorPrimariesToColorSpace(colorPrimaries);
+        colorRange = fullRangeFlag ? C.COLOR_RANGE_FULL : C.COLOR_RANGE_LIMITED;
+        colorTransfer =
+            ColorInfo.isoTransferCharacteristicsToColorTransfer(transferCharacteristics);
       } else if (childAtomType == Atom.TYPE_av1C) {
         ExtractorUtil.checkContainerInput(mimeType == null, /* message= */ null);
         mimeType = MimeTypes.VIDEO_AV1;
@@ -1277,26 +1265,33 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
           }
         }
       } else if (childAtomType == Atom.TYPE_colr) {
-        int colorType = parent.readInt();
-        if (colorType == TYPE_nclx || colorType == TYPE_nclc) {
-          // For more info on syntax, see Section 8.5.2.2 in ISO/IEC 14496-12:2012(E) and
-          // https://developer.apple.com/library/archive/documentation/QuickTime/QTFF/QTFFChap3/qtff3.html.
-          int colorPrimaries = parent.readUnsignedShort();
-          int transferCharacteristics = parent.readUnsignedShort();
-          parent.skipBytes(2); // matrix_coefficients.
-
-          // Only try and read full_range_flag if the box is long enough. It should be present in
-          // all colr boxes with type=nclx (Section 8.5.2.2 in ISO/IEC 14496-12:2012(E)) but some
-          // device cameras record videos with type=nclx without this final flag (and therefore
-          // size=18): https://github.com/google/ExoPlayer/issues/9332
-          boolean fullRangeFlag =
-              childAtomSize == 19 && (parent.readUnsignedByte() & 0b10000000) != 0;
-          colorSpace = ColorInfo.isoColorPrimariesToColorSpace(colorPrimaries);
-          colorRange = fullRangeFlag ? C.COLOR_RANGE_FULL : C.COLOR_RANGE_LIMITED;
-          colorTransfer =
-              ColorInfo.isoTransferCharacteristicsToColorTransfer(transferCharacteristics);
-        } else {
-          Log.w(TAG, "Unsupported color type: " + Atom.getAtomTypeString(colorType));
+        // Only modify these values if they have not been previously established by the bitstream.
+        // If 'Atom.TYPE_hvcC' atom or 'Atom.TYPE_vpcC' is available, they will take precedence and
+        // overwrite any existing values.
+        if (colorSpace == Format.NO_VALUE
+            && colorRange == Format.NO_VALUE
+            && colorTransfer == Format.NO_VALUE) {
+          int colorType = parent.readInt();
+          if (colorType == TYPE_nclx || colorType == TYPE_nclc) {
+            // For more info on syntax, see Section 8.5.2.2 in ISO/IEC 14496-12:2012(E) and
+            // https://developer.apple.com/library/archive/documentation/QuickTime/QTFF/QTFFChap3/qtff3.html.
+            int colorPrimaries = parent.readUnsignedShort();
+            int transferCharacteristics = parent.readUnsignedShort();
+            parent.skipBytes(2); // matrix_coefficients.
+
+            // Only try and read full_range_flag if the box is long enough. It should be present in
+            // all colr boxes with type=nclx (Section 8.5.2.2 in ISO/IEC 14496-12:2012(E)) but some
+            // device cameras record videos with type=nclx without this final flag (and therefore
+            // size=18): https://github.com/google/ExoPlayer/issues/9332
+            boolean fullRangeFlag =
+                childAtomSize == 19 && (parent.readUnsignedByte() & 0b10000000) != 0;
+            colorSpace = ColorInfo.isoColorPrimariesToColorSpace(colorPrimaries);
+            colorRange = fullRangeFlag ? C.COLOR_RANGE_FULL : C.COLOR_RANGE_LIMITED;
+            colorTransfer =
+                ColorInfo.isoTransferCharacteristicsToColorTransfer(transferCharacteristics);
+          } else {
+            Log.w(TAG, "Unsupported color type: " + Atom.getAtomTypeString(colorType));
+          }
         }
       }
       childPosition += childAtomSize;