diff --git a/compatibility_matrices/compatibility_matrix.8.xml b/compatibility_matrices/compatibility_matrix.8.xml index 104a463a4f..1b0b49667b 100644 --- a/compatibility_matrices/compatibility_matrix.8.xml +++ b/compatibility_matrices/compatibility_matrix.8.xml @@ -380,15 +380,6 @@ vendor[0-9]*_software - - android.hardware.media.c2 - 1 - - IComponentStore - default[0-9]* - vendor[0-9]*_software - - android.hardware.memtrack 1 diff --git a/compatibility_matrices/exclude/fcm_exclude.cpp b/compatibility_matrices/exclude/fcm_exclude.cpp index f3374c3835..3bc17864c8 100644 --- a/compatibility_matrices/exclude/fcm_exclude.cpp +++ b/compatibility_matrices/exclude/fcm_exclude.cpp @@ -103,6 +103,10 @@ bool ShouldCheckMissingHalsInFcm(const std::string& package) { "android.hardware.thermal@1.0", "android.hardware.thermal@1.1", "android.hardware.wifi.offload@1.0", + + // Under hardware/interfaces/staging, still in development + // AIDL + "android.hardware.media.c2", }; auto package_has_prefix = [&](const std::string& prefix) { diff --git a/media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/BaseBlock.aidl b/media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/BaseBlock.aidl deleted file mode 100644 index 460ff97522..0000000000 --- a/media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/BaseBlock.aidl +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (C) 2022 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m -update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.hardware.media.c2; -@VintfStability -union BaseBlock { - android.hardware.common.NativeHandle nativeBlock; - android.hardware.media.bufferpool2.BufferStatusMessage pooledBlock; -} diff --git a/media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/Block.aidl b/media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/Block.aidl deleted file mode 100644 index 7b3005e22d..0000000000 --- a/media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/Block.aidl +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (C) 2022 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m -update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.hardware.media.c2; -@VintfStability -parcelable Block { - int index; - android.hardware.media.c2.Params meta; - android.hardware.common.NativeHandle fence; -} diff --git a/media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/Buffer.aidl b/media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/Buffer.aidl deleted file mode 100644 index b632932cec..0000000000 --- a/media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/Buffer.aidl +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (C) 2022 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m -update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.hardware.media.c2; -@VintfStability -parcelable Buffer { - android.hardware.media.c2.Params info; - android.hardware.media.c2.Block[] blocks; -} 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 deleted file mode 100644 index d0e4cbf069..0000000000 --- a/media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/FieldDescriptor.aidl +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Copyright (C) 2022 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m -update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.hardware.media.c2; -@VintfStability -parcelable FieldDescriptor { - android.hardware.media.c2.FieldId fieldId; - android.hardware.media.c2.FieldDescriptor.Type type; - int structIndex; - int extent; - String name; - android.hardware.media.c2.FieldDescriptor.NamedValue[] namedValues; - @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, - } - @VintfStability - parcelable NamedValue { - String name; - long value; - } -} diff --git a/media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/FieldId.aidl b/media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/FieldId.aidl deleted file mode 100644 index 935b85dbbf..0000000000 --- a/media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/FieldId.aidl +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (C) 2022 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m -update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.hardware.media.c2; -@VintfStability -parcelable FieldId { - int offset; - int sizeBytes; -} diff --git a/media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/FieldSupportedValues.aidl b/media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/FieldSupportedValues.aidl deleted file mode 100644 index 69060bea1d..0000000000 --- a/media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/FieldSupportedValues.aidl +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (C) 2022 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m -update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.hardware.media.c2; -@VintfStability -union FieldSupportedValues { - boolean empty; - android.hardware.media.c2.ValueRange range; - long[] values; - long[] flags; -} 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 deleted file mode 100644 index 22f7c8491b..0000000000 --- a/media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/FieldSupportedValuesQuery.aidl +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright (C) 2022 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m -update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.hardware.media.c2; -@VintfStability -parcelable FieldSupportedValuesQuery { - android.hardware.media.c2.ParamField field; - android.hardware.media.c2.FieldSupportedValuesQuery.Type type; - @Backing(type="int") @VintfStability - enum Type { - POSSIBLE = 0, - CURRENT = 1, - } -} diff --git a/media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/FieldSupportedValuesQueryResult.aidl b/media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/FieldSupportedValuesQueryResult.aidl deleted file mode 100644 index 187e3ebfeb..0000000000 --- a/media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/FieldSupportedValuesQueryResult.aidl +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (C) 2022 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m -update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.hardware.media.c2; -@VintfStability -parcelable FieldSupportedValuesQueryResult { - android.hardware.media.c2.Status status; - android.hardware.media.c2.FieldSupportedValues values; -} 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 deleted file mode 100644 index e73b05e95e..0000000000 --- a/media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/FrameData.aidl +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright (C) 2022 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m -update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.hardware.media.c2; -@VintfStability -parcelable FrameData { - int flags; - android.hardware.media.c2.WorkOrdinal ordinal; - 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; -} diff --git a/media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/IComponent.aidl b/media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/IComponent.aidl deleted file mode 100644 index 7ed09afae7..0000000000 --- a/media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/IComponent.aidl +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright (C) 2022 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m -update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.hardware.media.c2; -@VintfStability -interface IComponent { - android.hardware.common.NativeHandle configureVideoTunnel(in int avSyncHwId); - android.hardware.media.c2.IComponent.BlockPool createBlockPool(in int allocatorId); - void destroyBlockPool(in long blockPoolId); - void drain(in boolean withEos); - android.hardware.media.c2.WorkBundle flush(); - android.hardware.media.c2.IComponentInterface getInterface(); - void queue(in android.hardware.media.c2.WorkBundle workBundle); - void release(); - void reset(); - void setOutputSurface(in long blockPoolId, in android.view.Surface surface, in android.hardware.media.c2.SurfaceSyncObj syncObject); - void start(); - void stop(); - parcelable BlockPool { - long blockPoolId; - android.hardware.media.c2.IConfigurable configurable; - } -} diff --git a/media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/IComponentInterface.aidl b/media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/IComponentInterface.aidl deleted file mode 100644 index 2350daeec2..0000000000 --- a/media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/IComponentInterface.aidl +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright (C) 2022 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m -update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.hardware.media.c2; -@VintfStability -interface IComponentInterface { - android.hardware.media.c2.IConfigurable getConfigurable(); -} diff --git a/media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/IComponentListener.aidl b/media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/IComponentListener.aidl deleted file mode 100644 index f6f2a6391c..0000000000 --- a/media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/IComponentListener.aidl +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright (C) 2022 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m -update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.hardware.media.c2; -@VintfStability -interface IComponentListener { - oneway void onError(in android.hardware.media.c2.Status status, in int errorCode); - oneway void onFramesRendered(in android.hardware.media.c2.IComponentListener.RenderedFrame[] renderedFrames); - oneway void onInputBuffersReleased(in android.hardware.media.c2.IComponentListener.InputBuffer[] inputBuffers); - oneway void onTripped(in android.hardware.media.c2.SettingResult[] settingResults); - oneway void onWorkDone(in android.hardware.media.c2.WorkBundle workBundle); - @VintfStability - parcelable InputBuffer { - long frameIndex; - int arrayIndex; - } - @VintfStability - parcelable RenderedFrame { - long bufferQueueId; - int slotId; - long timestampNs; - } -} 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 deleted file mode 100644 index 35532be3a2..0000000000 --- a/media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/IComponentStore.aidl +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright (C) 2022 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m -update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.hardware.media.c2; -@VintfStability -interface IComponentStore { - void copyBuffer(in android.hardware.media.c2.Buffer src, in android.hardware.media.c2.Buffer dst); - android.hardware.media.c2.IComponent createComponent(in String name, in android.hardware.media.c2.IComponentListener listener, in android.hardware.media.bufferpool2.IClientManager pool); - android.hardware.media.c2.IComponentInterface createInterface(in String name); - android.hardware.media.c2.IConfigurable getConfigurable(); - android.hardware.media.bufferpool2.IClientManager getPoolClientManager(); - android.hardware.media.c2.StructDescriptor[] getStructDescriptors(in int[] indices); - android.hardware.media.c2.IComponentStore.ComponentTraits[] listComponents(); - @VintfStability - parcelable ComponentTraits { - String name; - android.hardware.media.c2.IComponentStore.ComponentTraits.Domain domain; - android.hardware.media.c2.IComponentStore.ComponentTraits.Kind kind; - int rank; - String mediaType; - String[] aliases; - @Backing(type="int") @VintfStability - enum Kind { - OTHER = 0, - DECODER = 1, - ENCODER = 2, - } - @Backing(type="int") @VintfStability - enum Domain { - OTHER = 0, - VIDEO = 1, - AUDIO = 2, - IMAGE = 3, - } - } -} diff --git a/media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/IConfigurable.aidl b/media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/IConfigurable.aidl deleted file mode 100644 index 32f5abdb51..0000000000 --- a/media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/IConfigurable.aidl +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright (C) 2022 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m -update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.hardware.media.c2; -@VintfStability -interface IConfigurable { - android.hardware.media.c2.IConfigurable.ConfigResult config(in android.hardware.media.c2.Params inParams, in boolean mayBlock); - int getId(); - String getName(); - android.hardware.media.c2.Params query(in int[] indices, in boolean mayBlock); - android.hardware.media.c2.ParamDescriptor[] querySupportedParams(in int start, in int count); - android.hardware.media.c2.FieldSupportedValuesQueryResult[] querySupportedValues(in android.hardware.media.c2.FieldSupportedValuesQuery[] inFields, in boolean mayBlock); - @VintfStability - parcelable ConfigResult { - android.hardware.media.c2.Params params; - android.hardware.media.c2.SettingResult[] failures; - } -} diff --git a/media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/InfoBuffer.aidl b/media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/InfoBuffer.aidl deleted file mode 100644 index 94cd77d925..0000000000 --- a/media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/InfoBuffer.aidl +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (C) 2022 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m -update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.hardware.media.c2; -@VintfStability -parcelable InfoBuffer { - int index; - android.hardware.media.c2.Buffer buffer; -} 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 deleted file mode 100644 index 04c869c066..0000000000 --- a/media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/ParamDescriptor.aidl +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright (C) 2022 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m -update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.hardware.media.c2; -@VintfStability -parcelable ParamDescriptor { - int index; - 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; -} diff --git a/media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/ParamField.aidl b/media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/ParamField.aidl deleted file mode 100644 index 13d252257e..0000000000 --- a/media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/ParamField.aidl +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (C) 2022 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m -update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.hardware.media.c2; -@VintfStability -parcelable ParamField { - int index; - android.hardware.media.c2.FieldId fieldId; -} diff --git a/media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/ParamFieldValues.aidl b/media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/ParamFieldValues.aidl deleted file mode 100644 index 5a2821cdb2..0000000000 --- a/media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/ParamFieldValues.aidl +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (C) 2022 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m -update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.hardware.media.c2; -@VintfStability -parcelable ParamFieldValues { - android.hardware.media.c2.ParamField paramOrField; - android.hardware.media.c2.FieldSupportedValues[] values; -} diff --git a/media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/Params.aidl b/media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/Params.aidl deleted file mode 100644 index 7d363c06b3..0000000000 --- a/media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/Params.aidl +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright (C) 2022 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m -update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.hardware.media.c2; -@VintfStability -parcelable Params { - byte[] params; -} 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 deleted file mode 100644 index f9e6a93b24..0000000000 --- a/media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/SettingResult.aidl +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright (C) 2022 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m -update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.hardware.media.c2; -@VintfStability -parcelable SettingResult { - android.hardware.media.c2.SettingResult.Failure failure; - android.hardware.media.c2.ParamFieldValues field; - 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, - } -} 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 deleted file mode 100644 index ad07677aca..0000000000 --- a/media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/Status.aidl +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright (C) 2022 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m -update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.hardware.media.c2; -@VintfStability -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; -} diff --git a/media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/StructDescriptor.aidl b/media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/StructDescriptor.aidl deleted file mode 100644 index 58268e0b92..0000000000 --- a/media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/StructDescriptor.aidl +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (C) 2022 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m -update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.hardware.media.c2; -@VintfStability -parcelable StructDescriptor { - int type; - android.hardware.media.c2.FieldDescriptor[] fields; -} diff --git a/media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/SurfaceSyncObj.aidl b/media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/SurfaceSyncObj.aidl deleted file mode 100644 index 1c9bf8d989..0000000000 --- a/media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/SurfaceSyncObj.aidl +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (C) 2022 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m -update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.hardware.media.c2; -@VintfStability -parcelable SurfaceSyncObj { - android.hardware.common.NativeHandle syncMemory; - long bqId; - int generationId; - long consumerUsage; -} diff --git a/media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/ValueRange.aidl b/media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/ValueRange.aidl deleted file mode 100644 index db71ce044e..0000000000 --- a/media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/ValueRange.aidl +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (C) 2022 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m -update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.hardware.media.c2; -@VintfStability -parcelable ValueRange { - long min; - long max; - long step; - long num; - long denom; -} diff --git a/media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/Work.aidl b/media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/Work.aidl deleted file mode 100644 index a5343488f5..0000000000 --- a/media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/Work.aidl +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (C) 2022 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m -update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.hardware.media.c2; -@VintfStability -parcelable Work { - byte[] chainInfo; - android.hardware.media.c2.FrameData input; - android.hardware.media.c2.Worklet[] worklets; - int workletsProcessed; - android.hardware.media.c2.Status result; -} diff --git a/media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/WorkBundle.aidl b/media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/WorkBundle.aidl deleted file mode 100644 index 84708a8556..0000000000 --- a/media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/WorkBundle.aidl +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (C) 2022 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m -update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.hardware.media.c2; -@VintfStability -parcelable WorkBundle { - android.hardware.media.c2.Work[] works; - android.hardware.media.c2.BaseBlock[] baseBlocks; -} diff --git a/media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/WorkOrdinal.aidl b/media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/WorkOrdinal.aidl deleted file mode 100644 index 2833df3a79..0000000000 --- a/media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/WorkOrdinal.aidl +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (C) 2022 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m -update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.hardware.media.c2; -@VintfStability -parcelable WorkOrdinal { - long timestampUs; - long frameIndex; - long customOrdinal; -} diff --git a/media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/Worklet.aidl b/media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/Worklet.aidl deleted file mode 100644 index a79abf202b..0000000000 --- a/media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/Worklet.aidl +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (C) 2022 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m -update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.hardware.media.c2; -@VintfStability -parcelable Worklet { - int componentId; - byte[] tunings; - android.hardware.media.c2.SettingResult[] failures; - android.hardware.media.c2.FrameData output; -} diff --git a/media/c2/aidl/Android.bp b/staging/c2/aidl/Android.bp similarity index 97% rename from media/c2/aidl/Android.bp rename to staging/c2/aidl/Android.bp index 56531db55b..b9da7adb2c 100644 --- a/media/c2/aidl/Android.bp +++ b/staging/c2/aidl/Android.bp @@ -13,6 +13,7 @@ aidl_interface { name: "android.hardware.media.c2", vendor_available: true, double_loadable: true, + unstable: true, srcs: ["android/hardware/media/c2/*.aidl"], include_dirs: [ "frameworks/native/aidl/gui", @@ -21,7 +22,6 @@ aidl_interface { "android.hardware.common-V2", "android.hardware.media.bufferpool2-V1", ], - stability: "vintf", backend: { cpp: { enabled: false, diff --git a/media/c2/aidl/android/hardware/media/c2/BaseBlock.aidl b/staging/c2/aidl/android/hardware/media/c2/BaseBlock.aidl similarity index 98% rename from media/c2/aidl/android/hardware/media/c2/BaseBlock.aidl rename to staging/c2/aidl/android/hardware/media/c2/BaseBlock.aidl index 8b8b8e0e46..16e7653736 100644 --- a/media/c2/aidl/android/hardware/media/c2/BaseBlock.aidl +++ b/staging/c2/aidl/android/hardware/media/c2/BaseBlock.aidl @@ -25,7 +25,6 @@ import android.hardware.common.NativeHandle; * decoded data, codec-specific data, and other codec-related data are all sent * in the form of BaseBlocks. */ -@VintfStability union BaseBlock { /** * #nativeBlock is the opaque representation of a buffer. diff --git a/media/c2/aidl/android/hardware/media/c2/Block.aidl b/staging/c2/aidl/android/hardware/media/c2/Block.aidl similarity index 98% rename from media/c2/aidl/android/hardware/media/c2/Block.aidl rename to staging/c2/aidl/android/hardware/media/c2/Block.aidl index 34aa7b173f..4da849098e 100644 --- a/media/c2/aidl/android/hardware/media/c2/Block.aidl +++ b/staging/c2/aidl/android/hardware/media/c2/Block.aidl @@ -26,7 +26,6 @@ import android.hardware.media.c2.Params; * attributes may differ among `Block` objects that refer to the same * `BaseBlock` in the same `WorkBundle`. */ -@VintfStability parcelable Block { /** * Identity of a `BaseBlock` within a `WorkBundle`. This is an index into diff --git a/media/c2/aidl/android/hardware/media/c2/Buffer.aidl b/staging/c2/aidl/android/hardware/media/c2/Buffer.aidl similarity index 98% rename from media/c2/aidl/android/hardware/media/c2/Buffer.aidl rename to staging/c2/aidl/android/hardware/media/c2/Buffer.aidl index d2dcf2dfe0..fe01b648a4 100644 --- a/media/c2/aidl/android/hardware/media/c2/Buffer.aidl +++ b/staging/c2/aidl/android/hardware/media/c2/Buffer.aidl @@ -24,7 +24,6 @@ import android.hardware.media.c2.Params; * * This is a part of @ref FrameData. */ -@VintfStability parcelable Buffer { /** * Metadata associated with the buffer. diff --git a/media/c2/aidl/android/hardware/media/c2/FieldDescriptor.aidl b/staging/c2/aidl/android/hardware/media/c2/FieldDescriptor.aidl similarity index 98% rename from media/c2/aidl/android/hardware/media/c2/FieldDescriptor.aidl rename to staging/c2/aidl/android/hardware/media/c2/FieldDescriptor.aidl index a2774ec72e..3dd14cd0ed 100644 --- a/media/c2/aidl/android/hardware/media/c2/FieldDescriptor.aidl +++ b/staging/c2/aidl/android/hardware/media/c2/FieldDescriptor.aidl @@ -21,12 +21,10 @@ import android.hardware.media.c2.FieldId; /** * Description of a field inside a C2Param structure. */ -@VintfStability parcelable FieldDescriptor { /** * Possible types of the field. */ - @VintfStability @Backing(type="int") enum Type { NO_INIT = 0, @@ -55,7 +53,6 @@ parcelable FieldDescriptor { * Named value type. This is used for defining an enum value for a numeric * type. */ - @VintfStability parcelable NamedValue { /** * Name of the enum value. This must be unique for each enum value in diff --git a/media/c2/aidl/android/hardware/media/c2/FieldId.aidl b/staging/c2/aidl/android/hardware/media/c2/FieldId.aidl similarity index 98% rename from media/c2/aidl/android/hardware/media/c2/FieldId.aidl rename to staging/c2/aidl/android/hardware/media/c2/FieldId.aidl index 68bf058962..c53f7a5a34 100644 --- a/media/c2/aidl/android/hardware/media/c2/FieldId.aidl +++ b/staging/c2/aidl/android/hardware/media/c2/FieldId.aidl @@ -22,7 +22,6 @@ package android.hardware.media.c2; * Within a given C2Param structure, each field is uniquely identified by @ref * FieldId. */ -@VintfStability parcelable FieldId { /** * Offset of the field in bytes. diff --git a/media/c2/aidl/android/hardware/media/c2/FieldSupportedValues.aidl b/staging/c2/aidl/android/hardware/media/c2/FieldSupportedValues.aidl similarity index 99% rename from media/c2/aidl/android/hardware/media/c2/FieldSupportedValues.aidl rename to staging/c2/aidl/android/hardware/media/c2/FieldSupportedValues.aidl index 6c2033b5d8..5f4ad2a921 100644 --- a/media/c2/aidl/android/hardware/media/c2/FieldSupportedValues.aidl +++ b/staging/c2/aidl/android/hardware/media/c2/FieldSupportedValues.aidl @@ -26,7 +26,6 @@ import android.hardware.media.c2.ValueRange; * The intended type of values must be made clear in the context where * `FieldSupportedValues` is used. */ -@VintfStability union FieldSupportedValues { /** * No supported values diff --git a/media/c2/aidl/android/hardware/media/c2/FieldSupportedValuesQuery.aidl b/staging/c2/aidl/android/hardware/media/c2/FieldSupportedValuesQuery.aidl similarity index 97% rename from media/c2/aidl/android/hardware/media/c2/FieldSupportedValuesQuery.aidl rename to staging/c2/aidl/android/hardware/media/c2/FieldSupportedValuesQuery.aidl index bdaaef6b73..33a8170688 100644 --- a/media/c2/aidl/android/hardware/media/c2/FieldSupportedValuesQuery.aidl +++ b/staging/c2/aidl/android/hardware/media/c2/FieldSupportedValuesQuery.aidl @@ -22,9 +22,7 @@ import android.hardware.media.c2.ParamField; * Query information for supported values of a field. This is used as input to * IConfigurable::querySupportedValues(). */ -@VintfStability parcelable FieldSupportedValuesQuery { - @VintfStability @Backing(type="int") enum Type { /** diff --git a/media/c2/aidl/android/hardware/media/c2/FieldSupportedValuesQueryResult.aidl b/staging/c2/aidl/android/hardware/media/c2/FieldSupportedValuesQueryResult.aidl similarity index 99% rename from media/c2/aidl/android/hardware/media/c2/FieldSupportedValuesQueryResult.aidl rename to staging/c2/aidl/android/hardware/media/c2/FieldSupportedValuesQueryResult.aidl index b5c28c6d1c..133712a57e 100644 --- a/media/c2/aidl/android/hardware/media/c2/FieldSupportedValuesQueryResult.aidl +++ b/staging/c2/aidl/android/hardware/media/c2/FieldSupportedValuesQueryResult.aidl @@ -23,7 +23,6 @@ import android.hardware.media.c2.Status; * This structure is used to hold the result from * IConfigurable::querySupportedValues(). */ -@VintfStability parcelable FieldSupportedValuesQueryResult { /** * Result of the query. Possible values are diff --git a/media/c2/aidl/android/hardware/media/c2/FrameData.aidl b/staging/c2/aidl/android/hardware/media/c2/FrameData.aidl similarity index 99% rename from media/c2/aidl/android/hardware/media/c2/FrameData.aidl rename to staging/c2/aidl/android/hardware/media/c2/FrameData.aidl index 15c1b6d434..81c76be278 100644 --- a/media/c2/aidl/android/hardware/media/c2/FrameData.aidl +++ b/staging/c2/aidl/android/hardware/media/c2/FrameData.aidl @@ -31,7 +31,6 @@ import android.hardware.media.c2.WorkOrdinal; * @note `FrameData` is the HIDL counterpart of `C2FrameData` in the Codec 2.0 * standard. */ -@VintfStability parcelable FrameData { /** List of frame flags */ /** diff --git a/media/c2/aidl/android/hardware/media/c2/IComponent.aidl b/staging/c2/aidl/android/hardware/media/c2/IComponent.aidl similarity index 99% rename from media/c2/aidl/android/hardware/media/c2/IComponent.aidl rename to staging/c2/aidl/android/hardware/media/c2/IComponent.aidl index b3390c3f4d..bea4b70f88 100644 --- a/media/c2/aidl/android/hardware/media/c2/IComponent.aidl +++ b/staging/c2/aidl/android/hardware/media/c2/IComponent.aidl @@ -32,7 +32,6 @@ import android.hardware.media.c2.SurfaceSyncObj; * All methods in `IComponent` must not block. If a method call cannot be * completed in a timely manner, it must throw `Status::TIMED_OUT`. */ -@VintfStability interface IComponent { /** * The reference object from framwork to HAL C2BlockPool. diff --git a/media/c2/aidl/android/hardware/media/c2/IComponentInterface.aidl b/staging/c2/aidl/android/hardware/media/c2/IComponentInterface.aidl similarity index 98% rename from media/c2/aidl/android/hardware/media/c2/IComponentInterface.aidl rename to staging/c2/aidl/android/hardware/media/c2/IComponentInterface.aidl index 9db81e6139..4589115098 100644 --- a/media/c2/aidl/android/hardware/media/c2/IComponentInterface.aidl +++ b/staging/c2/aidl/android/hardware/media/c2/IComponentInterface.aidl @@ -26,7 +26,6 @@ import android.hardware.media.c2.IConfigurable; * * An actual component exposes this interface via IComponent::getInterface(). */ -@VintfStability interface IComponentInterface { /** * Returns the @ref IConfigurable instance associated to this component diff --git a/media/c2/aidl/android/hardware/media/c2/IComponentListener.aidl b/staging/c2/aidl/android/hardware/media/c2/IComponentListener.aidl similarity index 98% rename from media/c2/aidl/android/hardware/media/c2/IComponentListener.aidl rename to staging/c2/aidl/android/hardware/media/c2/IComponentListener.aidl index 75500b7271..786c8f1651 100644 --- a/media/c2/aidl/android/hardware/media/c2/IComponentListener.aidl +++ b/staging/c2/aidl/android/hardware/media/c2/IComponentListener.aidl @@ -23,13 +23,11 @@ import android.hardware.media.c2.WorkBundle; /** * Callback interface for handling notifications from @ref IComponent. */ -@VintfStability oneway interface IComponentListener { /** * Identifying information for an input buffer previously queued to the * component via IComponent::queue(). */ - @VintfStability parcelable InputBuffer { /** * This value comes from `Work::input.ordinal.frameIndex` in a `Work` @@ -45,7 +43,6 @@ oneway interface IComponentListener { /** * Information about rendering of a frame to a `Surface`. */ - @VintfStability parcelable RenderedFrame { /** * Id of the `BufferQueue` containing the rendered buffer. diff --git a/media/c2/aidl/android/hardware/media/c2/IComponentStore.aidl b/staging/c2/aidl/android/hardware/media/c2/IComponentStore.aidl similarity index 98% rename from media/c2/aidl/android/hardware/media/c2/IComponentStore.aidl rename to staging/c2/aidl/android/hardware/media/c2/IComponentStore.aidl index 1435a7e4bc..d332bd3a1c 100644 --- a/media/c2/aidl/android/hardware/media/c2/IComponentStore.aidl +++ b/staging/c2/aidl/android/hardware/media/c2/IComponentStore.aidl @@ -34,21 +34,17 @@ import android.hardware.media.c2.StructDescriptor; * @note This is an extension of version 1.1 of `IComponentStore`. The purpose * of the extension is to add support for blocking output buffer allocator. */ -@VintfStability interface IComponentStore { /** * Component traits. */ - @VintfStability parcelable ComponentTraits { - @VintfStability @Backing(type="int") enum Kind { OTHER = 0, DECODER, ENCODER, } - @VintfStability @Backing(type="int") enum Domain { OTHER = 0, diff --git a/media/c2/aidl/android/hardware/media/c2/IConfigurable.aidl b/staging/c2/aidl/android/hardware/media/c2/IConfigurable.aidl similarity index 99% rename from media/c2/aidl/android/hardware/media/c2/IConfigurable.aidl rename to staging/c2/aidl/android/hardware/media/c2/IConfigurable.aidl index 7fdb8259b8..9f79576ff5 100644 --- a/media/c2/aidl/android/hardware/media/c2/IConfigurable.aidl +++ b/staging/c2/aidl/android/hardware/media/c2/IConfigurable.aidl @@ -28,7 +28,6 @@ import android.hardware.media.c2.SettingResult; * This interface must be supported in all states of the owning object, and must * not change the state of the owning object. */ -@VintfStability interface IConfigurable { /** * Return parcelable for config() interface. @@ -36,7 +35,6 @@ interface IConfigurable { * This includes the successful config settings along with the failure reasons of * the specified setting. */ - @VintfStability parcelable ConfigResult { Params params; SettingResult[] failures; diff --git a/media/c2/aidl/android/hardware/media/c2/InfoBuffer.aidl b/staging/c2/aidl/android/hardware/media/c2/InfoBuffer.aidl similarity index 98% rename from media/c2/aidl/android/hardware/media/c2/InfoBuffer.aidl rename to staging/c2/aidl/android/hardware/media/c2/InfoBuffer.aidl index 207c4d0c1a..7cfabcbc42 100644 --- a/media/c2/aidl/android/hardware/media/c2/InfoBuffer.aidl +++ b/staging/c2/aidl/android/hardware/media/c2/InfoBuffer.aidl @@ -23,7 +23,6 @@ import android.hardware.media.c2.Buffer; * * This is a part of @ref FrameData. */ -@VintfStability parcelable InfoBuffer { /** * A C2Param structure index. diff --git a/media/c2/aidl/android/hardware/media/c2/ParamDescriptor.aidl b/staging/c2/aidl/android/hardware/media/c2/ParamDescriptor.aidl similarity index 99% rename from media/c2/aidl/android/hardware/media/c2/ParamDescriptor.aidl rename to staging/c2/aidl/android/hardware/media/c2/ParamDescriptor.aidl index 84c6acc7e4..716c07e6a4 100644 --- a/media/c2/aidl/android/hardware/media/c2/ParamDescriptor.aidl +++ b/staging/c2/aidl/android/hardware/media/c2/ParamDescriptor.aidl @@ -21,7 +21,6 @@ package android.hardware.media.c2; * * @ref ParamDescriptor is returned by IConfigurable::querySupportedParams(). */ -@VintfStability parcelable ParamDescriptor { /** The list of bit flags for attrib */ /** diff --git a/media/c2/aidl/android/hardware/media/c2/ParamField.aidl b/staging/c2/aidl/android/hardware/media/c2/ParamField.aidl similarity index 98% rename from media/c2/aidl/android/hardware/media/c2/ParamField.aidl rename to staging/c2/aidl/android/hardware/media/c2/ParamField.aidl index 64a46bbef5..94f737da33 100644 --- a/media/c2/aidl/android/hardware/media/c2/ParamField.aidl +++ b/staging/c2/aidl/android/hardware/media/c2/ParamField.aidl @@ -21,7 +21,6 @@ import android.hardware.media.c2.FieldId; /** * Reference to a field in a C2Param structure. */ -@VintfStability parcelable ParamField { /** * Index of the C2Param structure. diff --git a/media/c2/aidl/android/hardware/media/c2/ParamFieldValues.aidl b/staging/c2/aidl/android/hardware/media/c2/ParamFieldValues.aidl similarity index 98% rename from media/c2/aidl/android/hardware/media/c2/ParamFieldValues.aidl rename to staging/c2/aidl/android/hardware/media/c2/ParamFieldValues.aidl index 7b74c0ec34..4bb9a913a9 100644 --- a/media/c2/aidl/android/hardware/media/c2/ParamFieldValues.aidl +++ b/staging/c2/aidl/android/hardware/media/c2/ParamFieldValues.aidl @@ -26,7 +26,6 @@ import android.hardware.media.c2.ParamField; * values object. This structure is used when reporting parameter configuration * failures and conflicts. */ -@VintfStability parcelable ParamFieldValues { /** * Reference to a field or a C2Param structure. diff --git a/media/c2/aidl/android/hardware/media/c2/Params.aidl b/staging/c2/aidl/android/hardware/media/c2/Params.aidl similarity index 98% rename from media/c2/aidl/android/hardware/media/c2/Params.aidl rename to staging/c2/aidl/android/hardware/media/c2/Params.aidl index 53b512cf91..3c1a321122 100644 --- a/media/c2/aidl/android/hardware/media/c2/Params.aidl +++ b/staging/c2/aidl/android/hardware/media/c2/Params.aidl @@ -30,7 +30,6 @@ package android.hardware.media.c2; * - 4 bytes: size of the C2Param object (unsigned 4-byte integer). * - (size - 8) bytes: data of the C2Param object. */ -@VintfStability parcelable Params { byte[] params; } diff --git a/media/c2/aidl/android/hardware/media/c2/SettingResult.aidl b/staging/c2/aidl/android/hardware/media/c2/SettingResult.aidl similarity index 98% rename from media/c2/aidl/android/hardware/media/c2/SettingResult.aidl rename to staging/c2/aidl/android/hardware/media/c2/SettingResult.aidl index c2b9574457..a27014696c 100644 --- a/media/c2/aidl/android/hardware/media/c2/SettingResult.aidl +++ b/staging/c2/aidl/android/hardware/media/c2/SettingResult.aidl @@ -22,12 +22,10 @@ import android.hardware.media.c2.ParamFieldValues; * Information describing the reason the parameter settings may fail, or may be * overridden. */ -@VintfStability parcelable SettingResult { /** * Failure code */ - @VintfStability @Backing(type="int") enum Failure { /** diff --git a/media/c2/aidl/android/hardware/media/c2/Status.aidl b/staging/c2/aidl/android/hardware/media/c2/Status.aidl similarity index 99% rename from media/c2/aidl/android/hardware/media/c2/Status.aidl rename to staging/c2/aidl/android/hardware/media/c2/Status.aidl index 58a24047e7..660db57df3 100644 --- a/media/c2/aidl/android/hardware/media/c2/Status.aidl +++ b/staging/c2/aidl/android/hardware/media/c2/Status.aidl @@ -19,7 +19,6 @@ package android.hardware.media.c2; /** * Common return values for Codec2 operations. */ -@VintfStability parcelable Status { /** * Operation completed successfully. diff --git a/media/c2/aidl/android/hardware/media/c2/StructDescriptor.aidl b/staging/c2/aidl/android/hardware/media/c2/StructDescriptor.aidl similarity index 99% rename from media/c2/aidl/android/hardware/media/c2/StructDescriptor.aidl rename to staging/c2/aidl/android/hardware/media/c2/StructDescriptor.aidl index 00359041f0..5d6d2ebc42 100644 --- a/media/c2/aidl/android/hardware/media/c2/StructDescriptor.aidl +++ b/staging/c2/aidl/android/hardware/media/c2/StructDescriptor.aidl @@ -22,7 +22,6 @@ import android.hardware.media.c2.FieldDescriptor; * Description of a C2Param structure. It consists of an index and a list of * `FieldDescriptor`s. */ -@VintfStability parcelable StructDescriptor { /** * Index of the structure. diff --git a/media/c2/aidl/android/hardware/media/c2/SurfaceSyncObj.aidl b/staging/c2/aidl/android/hardware/media/c2/SurfaceSyncObj.aidl similarity index 99% rename from media/c2/aidl/android/hardware/media/c2/SurfaceSyncObj.aidl rename to staging/c2/aidl/android/hardware/media/c2/SurfaceSyncObj.aidl index d20e10273f..2e7330e90a 100644 --- a/media/c2/aidl/android/hardware/media/c2/SurfaceSyncObj.aidl +++ b/staging/c2/aidl/android/hardware/media/c2/SurfaceSyncObj.aidl @@ -22,7 +22,6 @@ import android.hardware.common.NativeHandle; * output buffers. This keeps # of dequeued buffers from Surface less than * configured max # of dequeued buffers all the time. */ -@VintfStability parcelable SurfaceSyncObj { /** * ASharedMemory for synchronization data. Layout is below diff --git a/media/c2/aidl/android/hardware/media/c2/ValueRange.aidl b/staging/c2/aidl/android/hardware/media/c2/ValueRange.aidl similarity index 99% rename from media/c2/aidl/android/hardware/media/c2/ValueRange.aidl rename to staging/c2/aidl/android/hardware/media/c2/ValueRange.aidl index 9abcb7da2b..6707a25d9f 100644 --- a/media/c2/aidl/android/hardware/media/c2/ValueRange.aidl +++ b/staging/c2/aidl/android/hardware/media/c2/ValueRange.aidl @@ -38,7 +38,6 @@ package android.hardware.media.c2; * The division in the formula may truncate the result if the data type of * these values is an integral type. */ -@VintfStability parcelable ValueRange { /** * Lower end of the range (inclusive). diff --git a/media/c2/aidl/android/hardware/media/c2/Work.aidl b/staging/c2/aidl/android/hardware/media/c2/Work.aidl similarity index 99% rename from media/c2/aidl/android/hardware/media/c2/Work.aidl rename to staging/c2/aidl/android/hardware/media/c2/Work.aidl index 4b8d696871..07324795e0 100644 --- a/media/c2/aidl/android/hardware/media/c2/Work.aidl +++ b/staging/c2/aidl/android/hardware/media/c2/Work.aidl @@ -34,7 +34,6 @@ import android.hardware.media.c2.Worklet; * * `Work` is a part of @ref WorkBundle. */ -@VintfStability parcelable Work { /** * Additional work chain info not part of this work. diff --git a/media/c2/aidl/android/hardware/media/c2/WorkBundle.aidl b/staging/c2/aidl/android/hardware/media/c2/WorkBundle.aidl similarity index 99% rename from media/c2/aidl/android/hardware/media/c2/WorkBundle.aidl rename to staging/c2/aidl/android/hardware/media/c2/WorkBundle.aidl index 2125fdab6c..79b4cdbc6a 100644 --- a/media/c2/aidl/android/hardware/media/c2/WorkBundle.aidl +++ b/staging/c2/aidl/android/hardware/media/c2/WorkBundle.aidl @@ -35,7 +35,6 @@ import android.hardware.media.c2.Work; * Codec 2.0 standard. The presence of #baseBlocks helps with minimizing the * data transferred over an IPC. */ -@VintfStability parcelable WorkBundle { /** * A list of Work items. diff --git a/media/c2/aidl/android/hardware/media/c2/WorkOrdinal.aidl b/staging/c2/aidl/android/hardware/media/c2/WorkOrdinal.aidl similarity index 99% rename from media/c2/aidl/android/hardware/media/c2/WorkOrdinal.aidl rename to staging/c2/aidl/android/hardware/media/c2/WorkOrdinal.aidl index 5708a90bc8..eb8b24427b 100644 --- a/media/c2/aidl/android/hardware/media/c2/WorkOrdinal.aidl +++ b/staging/c2/aidl/android/hardware/media/c2/WorkOrdinal.aidl @@ -31,7 +31,6 @@ package android.hardware.media.c2; * @note `WorkOrdinal` is the HIDL counterpart of `C2WorkOrdinalStruct` in the * Codec 2.0 standard. */ -@VintfStability parcelable WorkOrdinal { /** * Timestamp in microseconds. diff --git a/media/c2/aidl/android/hardware/media/c2/Worklet.aidl b/staging/c2/aidl/android/hardware/media/c2/Worklet.aidl similarity index 99% rename from media/c2/aidl/android/hardware/media/c2/Worklet.aidl rename to staging/c2/aidl/android/hardware/media/c2/Worklet.aidl index 6b3ceac5a0..04c59c1761 100644 --- a/media/c2/aidl/android/hardware/media/c2/Worklet.aidl +++ b/staging/c2/aidl/android/hardware/media/c2/Worklet.aidl @@ -28,7 +28,6 @@ import android.hardware.media.c2.SettingResult; * a @ref Work object for each expected output before calling * IComponent::queue(). */ -@VintfStability parcelable Worklet { /** * Component id. (Input)