Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 94a68d04 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes from topic "c2aidl" 

* changes:
  Add Codec2 AIDL interface
  Add bufferpool AIDL definitions
parents 9dc8e53e 8602fe3a

compatibility_matrices/compatibility_matrix.current.xml

+9 −0
Original line number Diff line number Diff line
@@ -460,6 +460,15 @@ 
            <regex-instance>vendor[0-9]*_software</regex-instance>

        </interface>

    </hal>

    <hal format="aidl" optional="true">

        <name>android.hardware.media.c2</name>

        <version>1</version>

        <interface>

            <name>IComponentStore</name>

            <regex-instance>default[0-9]*</regex-instance>

            <regex-instance>vendor[0-9]*_software</regex-instance>

        </interface>

    </hal>

    <hal format="aidl" optional="true">

        <name>android.hardware.memtrack</name>

        <version>1</version>

compatibility_matrices/exclude/fcm_exclude.cpp

+1 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ bool ShouldCheckMissingHalsInFcm(const std::string& package) { 
            "android.hardware.graphics.common",

            "android.hardware.input.common",

            "android.hardware.keymaster",

            "android.hardware.media.bufferpool2",

            "android.hardware.radio",

            "android.hardware.uwb.fira_android",

media/bufferpool/aidl/Android.bp

0 → 100644
+35 −0
Original line number Diff line number Diff line 
// 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.



aidl_interface {

    name: "android.hardware.media.bufferpool2",

    vendor_available: true,

    srcs: ["android/hardware/media/bufferpool2/*.aidl"],

    imports: [

        "android.hardware.common-V2",

        "android.hardware.common.fmq-V1",

    ],

    stability: "vintf",

    backend: {

        cpp: {

            enabled: false,

        },

        java: {

            enabled: false,

        },

        ndk: {

            enabled: true,

        },

    },

}

media/bufferpool/aidl/aidl_api/android.hardware.media.bufferpool2/current/android/hardware/media/bufferpool2/Buffer.aidl

0 → 100644
+39 −0
Original line number Diff line number Diff line 
/*

 * 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 <name>-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.bufferpool2;

@VintfStability

parcelable Buffer {

  int id;

  android.hardware.common.NativeHandle buffer;

}

media/bufferpool/aidl/aidl_api/android.hardware.media.bufferpool2/current/android/hardware/media/bufferpool2/BufferInvalidationMessage.aidl

0 → 100644
+40 −0
Original line number Diff line number Diff line 
/*

 * 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 <name>-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.bufferpool2;

@FixedSize @VintfStability

parcelable BufferInvalidationMessage {

  int messageId;

  int fromBufferId;

  int toBufferId;

}