android.hardware.media.c2: sync with internal
Bug: 254050314
Test: m
Merged-In: Ia85af4e013529e104c84bc48f84a5daa89a5d9bf
Change-Id: Ia85af4e013529e104c84bc48f84a5daa89a5d9bf
diff --git a/media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/FieldDescriptor.aidl b/media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/FieldDescriptor.aidl
index d0e4cbf..909476c 100644
--- a/media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/FieldDescriptor.aidl
+++ b/media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/FieldDescriptor.aidl
@@ -43,16 +43,16 @@
@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 {
diff --git a/media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/FieldSupportedValuesQuery.aidl b/media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/FieldSupportedValuesQuery.aidl
index 22f7c84..6a5fbe2 100644
--- a/media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/FieldSupportedValuesQuery.aidl
+++ b/media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/FieldSupportedValuesQuery.aidl
@@ -39,6 +39,6 @@
@Backing(type="int") @VintfStability
enum Type {
POSSIBLE = 0,
- CURRENT = 1,
+ CURRENT,
}
}
diff --git a/media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/FrameData.aidl b/media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/FrameData.aidl
index e73b05e..07bfb72 100644
--- a/media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/FrameData.aidl
+++ b/media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/FrameData.aidl
@@ -39,9 +39,9 @@
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 */;
}
diff --git a/media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/IComponentStore.aidl b/media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/IComponentStore.aidl
index 35532be..d1b5915 100644
--- a/media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/IComponentStore.aidl
+++ b/media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/IComponentStore.aidl
@@ -52,15 +52,15 @@
@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,
}
}
}
diff --git a/media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/ParamDescriptor.aidl b/media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/ParamDescriptor.aidl
index 04c869c..6f0ac50 100644
--- a/media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/ParamDescriptor.aidl
+++ b/media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/ParamDescriptor.aidl
@@ -38,11 +38,11 @@
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 */;
}
diff --git a/media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/SettingResult.aidl b/media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/SettingResult.aidl
index f9e6a93..07fc1f3 100644
--- a/media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/SettingResult.aidl
+++ b/media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/SettingResult.aidl
@@ -39,15 +39,15 @@
android.hardware.media.c2.ParamFieldValues[] conflicts;
@Backing(type="int") @VintfStability
enum Failure {
- BAD_TYPE = 0,
- BAD_PORT = 1,
- BAD_INDEX = 2,
- READ_ONLY = 3,
- MISMATCH = 4,
- BAD_VALUE = 5,
- CONFLICT = 6,
- UNSUPPORTED = 7,
- INFO_BAD_VALUE = 8,
- INFO_CONFLICT = 9,
+ BAD_TYPE,
+ BAD_PORT,
+ BAD_INDEX,
+ READ_ONLY,
+ MISMATCH,
+ BAD_VALUE,
+ CONFLICT,
+ UNSUPPORTED,
+ INFO_BAD_VALUE,
+ INFO_CONFLICT,
}
}
diff --git a/media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/Status.aidl b/media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/Status.aidl
index ad07677..8b430d2 100644
--- a/media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/Status.aidl
+++ b/media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/Status.aidl
@@ -36,17 +36,17 @@
parcelable Status {
int status;
const int OK = 0;
- const int BAD_VALUE = -22;
- const int BAD_INDEX = -75;
- const int CANNOT_DO = -2147483646;
- const int DUPLICATE = -17;
- const int NOT_FOUND = -2;
- const int BAD_STATE = -38;
- const int BLOCKING = -9930;
- const int NO_MEMORY = -12;
- const int REFUSED = -1;
- const int TIMED_OUT = -110;
- const int OMITTED = -74;
- const int CORRUPTED = -2147483648;
- const int NO_INIT = -19;
+ const int BAD_VALUE = (-22) /* -22 */;
+ const int BAD_INDEX = (-75) /* -75 */;
+ const int CANNOT_DO = (-2147483646) /* -2147483646 */;
+ const int DUPLICATE = (-17) /* -17 */;
+ const int NOT_FOUND = (-2) /* -2 */;
+ const int BAD_STATE = (-38) /* -38 */;
+ const int BLOCKING = (-9930) /* -9930 */;
+ const int NO_MEMORY = (-12) /* -12 */;
+ const int REFUSED = (-1) /* -1 */;
+ const int TIMED_OUT = (-110) /* -110 */;
+ const int OMITTED = (-74) /* -74 */;
+ const int CORRUPTED = (-2147483648) /* -2147483648 */;
+ const int NO_INIT = (-19) /* -19 */;
}