Merge "Add annotation for all dataspace enums." (6a7f4a50) · Commits · e / os / android_frameworks_base

core/java/android/hardware/DataSpace.java

+29 −20

Original line number	Diff line number	Diff line
		@@ -385,14 +385,6 @@ public final class DataSpace {
		*/
		public static final int RANGE_EXTENDED = 3 << 27;

		/** @hide */
		@Retention(RetentionPolicy.SOURCE)
		@IntDef(flag = true, value = {
		DATASPACE_DEPTH,
		DATASPACE_DYNAMIC_DEPTH,
		})
		public @interface DataSpaceDepth {};

		/**
		* Depth.
		*
		@@ -407,13 +399,6 @@ public final class DataSpace {
		*/
		public static final int DATASPACE_DYNAMIC_DEPTH = 4098;

		/** @hide */
		@Retention(RetentionPolicy.SOURCE)
		@IntDef(flag = true, value = {
		DATASPACE_HEIF,
		})
		public @interface DataSpaceFileFormat {};

		/**
		* High Efficiency Image File Format (HEIF).
		*
		@@ -442,7 +427,7 @@ public final class DataSpace {
		DATASPACE_DCI_P3,
		DATASPACE_SRGB_LINEAR
		})
		public @interface NamedDataSpace {};
		public @interface ColorDataSpace {};

		/**
		* Default-assumption data space, when not explicitly specified.
		@@ -635,6 +620,30 @@ public final class DataSpace {
		*/
		public static final int DATASPACE_SRGB_LINEAR = 138477568;

		/** @hide */
		@Retention(RetentionPolicy.SOURCE)
		@IntDef(flag = true, value = {
		DATASPACE_DEPTH,
		DATASPACE_DYNAMIC_DEPTH,
		DATASPACE_HEIF,
		DATASPACE_UNKNOWN,
		DATASPACE_SCRGB_LINEAR,
		DATASPACE_SRGB,
		DATASPACE_SCRGB,
		DATASPACE_DISPLAY_P3,
		DATASPACE_BT2020_HLG,
		DATASPACE_BT2020_PQ,
		DATASPACE_ADOBE_RGB,
		DATASPACE_JFIF,
		DATASPACE_BT601_625,
		DATASPACE_BT601_525,
		DATASPACE_BT2020,
		DATASPACE_BT709,
		DATASPACE_DCI_P3,
		DATASPACE_SRGB_LINEAR
		})
		public @interface NamedDataSpace {};

		private DataSpace() {}

		/**
		@@ -647,7 +656,7 @@ public final class DataSpace {
		*
		* @return The int dataspace packed by standard, transfer and range value
		*/
		public static @NamedDataSpace int pack(@DataSpaceStandard int standard,
		public static @ColorDataSpace int pack(@DataSpaceStandard int standard,
		@DataSpaceTransfer int transfer,
		@DataSpaceRange int range) {
		if ((standard & STANDARD_MASK) != standard) {
		@@ -669,7 +678,7 @@ public final class DataSpace {
		*
		* @return The standard aspect
		*/
		public static @DataSpaceStandard int getStandard(@NamedDataSpace int dataSpace) {
		public static @DataSpaceStandard int getStandard(@ColorDataSpace int dataSpace) {
		@DataSpaceStandard int standard = dataSpace & STANDARD_MASK;
		return standard;
		}
		@@ -681,7 +690,7 @@ public final class DataSpace {
		*
		* @return The transfer aspect
		*/
		public static @DataSpaceTransfer int getTransfer(@NamedDataSpace int dataSpace) {
		public static @DataSpaceTransfer int getTransfer(@ColorDataSpace int dataSpace) {
		@DataSpaceTransfer int transfer = dataSpace & TRANSFER_MASK;
		return transfer;
		}
		@@ -693,7 +702,7 @@ public final class DataSpace {
		*
		* @return The range aspect
		*/
		public static @DataSpaceRange int getRange(@NamedDataSpace int dataSpace) {
		public static @DataSpaceRange int getRange(@ColorDataSpace int dataSpace) {
		@DataSpaceRange int range = dataSpace & RANGE_MASK;
		return range;
		}

graphics/java/android/graphics/ColorSpace.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -24,7 +24,7 @@ import android.annotation.Size;
		import android.annotation.SuppressAutoDoc;
		import android.annotation.SuppressLint;
		import android.hardware.DataSpace;
		import android.hardware.DataSpace.NamedDataSpace;
		import android.hardware.DataSpace.ColorDataSpace;
		import android.util.SparseIntArray;

		import libcore.util.NativeAllocationRegistry;
		@@ -1406,7 +1406,7 @@ public abstract class ColorSpace {
		*/
		@SuppressLint("MethodNameUnits")
		@Nullable
		public static ColorSpace getFromDataSpace(@NamedDataSpace int dataSpace) {
		public static ColorSpace getFromDataSpace(@ColorDataSpace int dataSpace) {
		int index = sDataToColorSpaces.get(dataSpace, -1);
		if (index != -1) {
		return ColorSpace.get(index);
		@@ -1425,7 +1425,7 @@ public abstract class ColorSpace {
		* @return the dataspace value.
		*/
		@SuppressLint("MethodNameUnits")
		public @NamedDataSpace int getDataSpace() {
		public @ColorDataSpace int getDataSpace() {
		int index = sDataToColorSpaces.indexOfValue(getId());
		if (index != -1) {
		return sDataToColorSpaces.keyAt(index);