Merge "Add P010 constant for HardwareBuffer" into tm-dev (c80e1dab) · Commits · e / os / android_frameworks_base

core/api/current.txt

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -16870,6 +16870,7 @@ package android.hardware {
	field public static final long USAGE_SENSOR_DIRECT_DATA = 8388608L; // 0x800000L		field public static final long USAGE_SENSOR_DIRECT_DATA = 8388608L; // 0x800000L
	field public static final long USAGE_VIDEO_ENCODE = 65536L; // 0x10000L		field public static final long USAGE_VIDEO_ENCODE = 65536L; // 0x10000L
	field public static final int YCBCR_420_888 = 35; // 0x23		field public static final int YCBCR_420_888 = 35; // 0x23
			field public static final int YCBCR_P010 = 54; // 0x36
	}		}

	public final class Sensor {		public final class Sensor {

+10 −0

Original line number	Original line	Diff line number	Diff line
	@@ -63,6 +63,7 @@ public final class HardwareBuffer implements Parcelable, AutoCloseable {
	D_FP32,		D_FP32,
	DS_FP32UI8,		DS_FP32UI8,
	S_UI8,		S_UI8,
			YCBCR_P010,
	})		})
	public @interface Format {		public @interface Format {
	}		}
	@@ -96,6 +97,14 @@ public final class HardwareBuffer implements Parcelable, AutoCloseable {
	public static final int DS_FP32UI8 = 0x34;		public static final int DS_FP32UI8 = 0x34;
	/** Format: 8 bits stencil */		/** Format: 8 bits stencil */
	public static final int S_UI8 = 0x35;		public static final int S_UI8 = 0x35;
			/**
			* <p>Android YUV P010 format.</p>
			*
			* P010 is a 4:2:0 YCbCr semiplanar format comprised of a WxH Y plane
			* followed by a Wx(H/2) CbCr plane. Each sample is represented by a 16-bit
			* little-endian value, with the lower 6 bits set to zero.
			*/
			public static final int YCBCR_P010 = 0x36;

	// Note: do not rename, this field is used by native code		// Note: do not rename, this field is used by native code
	@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
	@@ -422,6 +431,7 @@ public final class HardwareBuffer implements Parcelable, AutoCloseable {
	case D_FP32:		case D_FP32:
	case DS_FP32UI8:		case DS_FP32UI8:
	case S_UI8:		case S_UI8:
			case YCBCR_P010:
	return true;		return true;
	}		}
	return false;		return false;

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -428,7 +428,7 @@ public class ImageFormat {

	/**		/**
	* <p>Private raw camera sensor image format, a single channel image with		* <p>Private raw camera sensor image format, a single channel image with
	* implementation depedent pixel layout.</p>		* implementation dependent pixel layout.</p>
	*		*
	* <p>RAW_PRIVATE is a format for unprocessed raw image buffers coming from an		* <p>RAW_PRIVATE is a format for unprocessed raw image buffers coming from an
	* image sensor. The actual structure of buffers of this format is		* image sensor. The actual structure of buffers of this format is