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

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

Remove AudioMixLatencyClass enum from AIDL interfaces 

The enum was only used for the 'AudioPortMixExt.latencyClass'
field, which is "write only" on the framework side, and isn't
used on the HAL side.

Bug: 198812639
Test: m
Change-Id: Ibf245027696e4df1df6f434b9553012461f90b7b
parent 9255d4da

media/libaudioclient/AidlConversion.cpp

+1 −29
Original line number Diff line number Diff line
@@ -2559,30 +2559,6 @@ legacy2aidl_AudioEncapsulationMetadataType_mask(uint32_t legacy) { 
            enumToMask_index<int32_t, AudioEncapsulationMetadataType>);

}



ConversionResult<audio_mix_latency_class_t>

aidl2legacy_AudioMixLatencyClass_audio_mix_latency_class_t(

        media::AudioMixLatencyClass aidl) {

    switch (aidl) {

        case media::AudioMixLatencyClass::LOW:

            return AUDIO_LATENCY_LOW;

        case media::AudioMixLatencyClass::NORMAL:

            return AUDIO_LATENCY_NORMAL;

    }

    return unexpected(BAD_VALUE);

}



ConversionResult<media::AudioMixLatencyClass>

legacy2aidl_audio_mix_latency_class_t_AudioMixLatencyClass(

        audio_mix_latency_class_t legacy) {

    switch (legacy) {

        case AUDIO_LATENCY_LOW:

            return media::AudioMixLatencyClass::LOW;

        case AUDIO_LATENCY_NORMAL:

            return media::AudioMixLatencyClass::NORMAL;

    }

    return unexpected(BAD_VALUE);

}



ConversionResult<audio_port_device_ext>

aidl2legacy_AudioPortDeviceExt_audio_port_device_ext(const media::AudioPortDeviceExt& aidl) {

    audio_port_device_ext legacy;
@@ -2611,11 +2587,9 @@ legacy2aidl_audio_port_device_ext_AudioPortDeviceExt(const audio_port_device_ext 


ConversionResult<audio_port_mix_ext>

aidl2legacy_AudioPortMixExt_audio_port_mix_ext(const media::AudioPortMixExt& aidl) {

    audio_port_mix_ext legacy;

    audio_port_mix_ext legacy{};

    legacy.hw_module = VALUE_OR_RETURN(aidl2legacy_int32_t_audio_module_handle_t(aidl.hwModule));

    legacy.handle = VALUE_OR_RETURN(aidl2legacy_int32_t_audio_io_handle_t(aidl.handle));

    legacy.latency_class = VALUE_OR_RETURN(

            aidl2legacy_AudioMixLatencyClass_audio_mix_latency_class_t(aidl.latencyClass));

    return legacy;

}
@@ -2624,8 +2598,6 @@ legacy2aidl_audio_port_mix_ext_AudioPortMixExt(const audio_port_mix_ext& legacy) 
    media::AudioPortMixExt aidl;

    aidl.hwModule = VALUE_OR_RETURN(legacy2aidl_audio_module_handle_t_int32_t(legacy.hw_module));

    aidl.handle = VALUE_OR_RETURN(legacy2aidl_audio_io_handle_t_int32_t(legacy.handle));

    aidl.latencyClass = VALUE_OR_RETURN(

            legacy2aidl_audio_mix_latency_class_t_AudioMixLatencyClass(legacy.latency_class));

    return aidl;

}

media/libaudioclient/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -319,7 +319,6 @@ aidl_interface { 
        "aidl/android/media/AudioIoConfigEvent.aidl",

        "aidl/android/media/AudioIoDescriptor.aidl",

        "aidl/android/media/AudioIoFlags.aidl",

        "aidl/android/media/AudioMixLatencyClass.aidl",

        "aidl/android/media/AudioOutputFlags.aidl",

        "aidl/android/media/AudioPatch.aidl",

        "aidl/android/media/AudioPlaybackRate.aidl",

media/libaudioclient/aidl/android/media/AudioMixLatencyClass.aidl

deleted100644 → 0
+0 −25
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2020 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.

 */

package android.media;



/**

 * {@hide}

 */

@Backing(type="int")

enum AudioMixLatencyClass {

    LOW = 0,

    NORMAL = 1,

}

media/libaudioclient/aidl/android/media/AudioPortMixExt.aidl

+0 −4
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ 


package android.media;



import android.media.AudioMixLatencyClass;



/**

 * {@hide}

 */
@@ -26,6 +24,4 @@ parcelable AudioPortMixExt { 
    int hwModule;

    /** I/O handle of the input/output stream. Interpreted as audio_io_handle_t. */

    int handle;

    /** Latency class */

    AudioMixLatencyClass latencyClass;

}

media/libaudioclient/include/media/AidlConversion.h

+0 −8
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ 
#include <android/media/AudioInputFlags.h>

#include <android/media/AudioIoConfigEvent.h>

#include <android/media/AudioIoDescriptor.h>

#include <android/media/AudioMixLatencyClass.h>

#include <android/media/AudioOutputFlags.h>

#include <android/media/AudioPlaybackRate.h>

#include <android/media/AudioPort.h>
@@ -342,13 +341,6 @@ aidl2legacy_AudioEncapsulationMetadataType_mask(int32_t aidl); 
ConversionResult<int32_t>

legacy2aidl_AudioEncapsulationMetadataType_mask(uint32_t legacy);



ConversionResult<audio_mix_latency_class_t>

aidl2legacy_AudioMixLatencyClass_audio_mix_latency_class_t(

        media::AudioMixLatencyClass aidl);

ConversionResult<media::AudioMixLatencyClass>

legacy2aidl_audio_mix_latency_class_t_AudioMixLatencyClass(

        audio_mix_latency_class_t legacy);



ConversionResult<audio_port_device_ext>

aidl2legacy_AudioPortDeviceExt_audio_port_device_ext(const media::AudioPortDeviceExt& aidl);

ConversionResult<media::AudioPortDeviceExt>