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

Commit e9f10fc9 authored by Mikhail Naganov's avatar Mikhail Naganov
Browse files

audio: Provide operations common to input and output streams 

Introduce IStreamCommon which contains methods that apply
both to input and output streams. Move the 'close' method
to it. Add 'IStreamIn/Out.getStreamCommon' method to retrieve
the common interface.

Add methods for dealing with HW AV Sync and vendor parameters.

Bug: 205884982
Test: atest VtsHalAudioCoreTargetTest
Change-Id: Ie1a7b32e28425f5398afc95192fcbc5403b5c332
parent df5feba1

audio/aidl/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -115,6 +115,7 @@ aidl_interface { 
        "android/hardware/audio/core/IModule.aidl",

        "android/hardware/audio/core/ISoundDose.aidl",

        "android/hardware/audio/core/IStreamCallback.aidl",

        "android/hardware/audio/core/IStreamCommon.aidl",

        "android/hardware/audio/core/IStreamIn.aidl",

        "android/hardware/audio/core/IStreamOut.aidl",

        "android/hardware/audio/core/ITelephony.aidl",
@@ -124,6 +125,7 @@ aidl_interface { 
        "android/hardware/audio/core/ModuleDebug.aidl",

        "android/hardware/audio/core/StreamDescriptor.aidl",

        "android/hardware/audio/core/SurroundSoundConfig.aidl",

        "android/hardware/audio/core/VendorParameter.aidl",

    ],

    imports: [

        "android.hardware.common-V2",

audio/aidl/aidl_api/android.hardware.audio.core/current/android/hardware/audio/core/IModule.aidl

+3 −0
Original line number Diff line number Diff line
@@ -61,6 +61,9 @@ interface IModule { 
  void updateScreenRotation(android.hardware.audio.core.IModule.ScreenRotation rotation);

  void updateScreenState(boolean isTurnedOn);

  @nullable android.hardware.audio.core.ISoundDose getSoundDose();

  int generateHwAvSyncId();

  android.hardware.audio.core.VendorParameter[] getVendorParameters(in @utf8InCpp String[] ids);

  void setVendorParameters(in android.hardware.audio.core.VendorParameter[] parameters, boolean async);

  @VintfStability

  parcelable OpenInputStreamArguments {

    int portConfigId;

audio/aidl/aidl_api/android.hardware.audio.core/current/android/hardware/audio/core/IStreamCommon.aidl

0 → 100644
+41 −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.audio.core;

@VintfStability

interface IStreamCommon {

  void close();

  void updateHwAvSyncId(int hwAvSyncId);

  android.hardware.audio.core.VendorParameter[] getVendorParameters(in @utf8InCpp String[] ids);

  void setVendorParameters(in android.hardware.audio.core.VendorParameter[] parameters, boolean async);

}

audio/aidl/aidl_api/android.hardware.audio.core/current/android/hardware/audio/core/IStreamIn.aidl

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
package android.hardware.audio.core;

@VintfStability

interface IStreamIn {

  void close();

  android.hardware.audio.core.IStreamCommon getStreamCommon();

  android.hardware.audio.core.MicrophoneDynamicInfo[] getActiveMicrophones();

  android.hardware.audio.core.IStreamIn.MicrophoneDirection getMicrophoneDirection();

  void setMicrophoneDirection(android.hardware.audio.core.IStreamIn.MicrophoneDirection direction);

audio/aidl/aidl_api/android.hardware.audio.core/current/android/hardware/audio/core/IStreamOut.aidl

+1 −1
Original line number Diff line number Diff line
@@ -34,6 +34,6 @@ 
package android.hardware.audio.core;

@VintfStability

interface IStreamOut {

  void close();

  android.hardware.audio.core.IStreamCommon getStreamCommon();

  void updateMetadata(in android.hardware.audio.common.SourceMetadata sourceMetadata);

}