Merge "android.hardware.media.c2: sync with internal" (9efd5025) · Commits · e / os / android_hardware_interfaces

media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/FieldDescriptor.aidl

+10 −10

Original line number	Diff line number	Diff line
		@@ -43,16 +43,16 @@ parcelable FieldDescriptor {
		@Backing(type="int") @VintfStability
		enum Type {
		NO_INIT = 0,
		INT32 = 1,
		UINT32 = 2,
		CNTR32 = 3,
		INT64 = 4,
		UINT64 = 5,
		CNTR64 = 6,
		FLOAT = 7,
		STRING = 256,
		BLOB = 257,
		STRUCT = 131072,
		INT32,
		UINT32,
		CNTR32,
		INT64,
		UINT64,
		CNTR64,
		FLOAT,
		STRING = 0x100,
		BLOB,
		STRUCT = 0x20000,
		}
		@VintfStability
		parcelable NamedValue {

+1 −1

Original line number	Diff line number	Diff line
		@@ -39,6 +39,6 @@ parcelable FieldSupportedValuesQuery {
		@Backing(type="int") @VintfStability
		enum Type {
		POSSIBLE = 0,
		CURRENT = 1,
		CURRENT,
		}
		}

+5 −5

Original line number	Diff line number	Diff line
		@@ -39,9 +39,9 @@ parcelable FrameData {
		android.hardware.media.c2.Buffer[] buffers;
		android.hardware.media.c2.Params configUpdate;
		android.hardware.media.c2.InfoBuffer[] infoBuffers;
		const int DROP_FRAME = 1;
		const int END_OF_STREAM = 2;
		const int DISCARD_FRAME = 4;
		const int FLAG_INCOMPLETE = 8;
		const int CODEC_CONFIG = -2147483648;
		const int DROP_FRAME = (1 << 0) /* 1 */;
		const int END_OF_STREAM = (1 << 1) /* 2 */;
		const int DISCARD_FRAME = (1 << 2) /* 4 */;
		const int FLAG_INCOMPLETE = (1 << 3) /* 8 */;
		const int CODEC_CONFIG = (1 << 31) /* -2147483648 */;
		}

+5 −5

Original line number	Diff line number	Diff line
		@@ -52,15 +52,15 @@ interface IComponentStore {
		@Backing(type="int") @VintfStability
		enum Kind {
		OTHER = 0,
		DECODER = 1,
		ENCODER = 2,
		DECODER,
		ENCODER,
		}
		@Backing(type="int") @VintfStability
		enum Domain {
		OTHER = 0,
		VIDEO = 1,
		AUDIO = 2,
		IMAGE = 3,
		VIDEO,
		AUDIO,
		IMAGE,
		}
		}
		}

+7 −7

Original line number	Diff line number	Diff line
		@@ -38,11 +38,11 @@ parcelable ParamDescriptor {
		int attrib;
		String name;
		int[] dependencies;
		const int ATTRIBUTE_REQUIRED = 1;
		const int ATTRIBUTE_PERSISTENT = 2;
		const int ATTRIBUTE_STRICT = 4;
		const int ATTRIBUTE_READ_ONLY = 8;
		const int ATTRIBUTE_HIDDEN = 16;
		const int ATTRIBUTE_INTERNAL = 32;
		const int ATTRIBUTE_CONST = 64;
		const int ATTRIBUTE_REQUIRED = (1 << 0) /* 1 */;
		const int ATTRIBUTE_PERSISTENT = (1 << 1) /* 2 */;
		const int ATTRIBUTE_STRICT = (1 << 2) /* 4 */;
		const int ATTRIBUTE_READ_ONLY = (1 << 3) /* 8 */;
		const int ATTRIBUTE_HIDDEN = (1 << 4) /* 16 */;
		const int ATTRIBUTE_INTERNAL = (1 << 5) /* 32 */;
		const int ATTRIBUTE_CONST = (1 << 6) /* 64 */;
		}