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

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

Add android.media.audio.common.AidlConversion class 

This class is intended to host conversion functions
between the types from AIDL android.media.audio.common
packages and SDK Java API types, as well as legacy
system/audio.h (native) types.

Move existing conversion functions from Soundtrigger's
utility functions to AidlConversion.

Bug: 188932434
Test: atest SoundHw2CompatTest
Change-Id: I3041fce921112c06fb001638e35b26abb3fd0c72
parent 1c39b433

core/java/android/hardware/soundtrigger/ConversionUtil.java

+3 −101
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package android.hardware.soundtrigger; 


import android.annotation.Nullable;

import android.media.AudioFormat;

import android.media.audio.common.AidlConversion;

import android.media.audio.common.AudioConfig;

import android.media.soundtrigger.AudioCapabilities;

import android.media.soundtrigger.ConfidenceLevel;
@@ -224,107 +225,14 @@ class ConversionUtil { 
                apiExtras);

    }



    public static AudioFormat aidl2apiAudioFormat(AudioConfig audioConfig) {

        AudioFormat.Builder apiBuilder = new AudioFormat.Builder();

        apiBuilder.setSampleRate(audioConfig.sampleRateHz);

        apiBuilder.setChannelMask(aidl2apiChannelInMask(audioConfig.channelMask));

        apiBuilder.setEncoding(aidl2apiEncoding(audioConfig.format));

        return apiBuilder.build();

    }



    // Same as above, but in case of a null input returns a non-null valid output.

    // In case of a null input returns a non-null valid output.

    public static AudioFormat aidl2apiAudioFormatWithDefault(@Nullable AudioConfig audioConfig) {

        if (audioConfig != null) {

            return aidl2apiAudioFormat(audioConfig);

            return AidlConversion.aidl2api_AudioConfig_AudioFormat(audioConfig);

        }

        return new AudioFormat.Builder().build();

    }



    public static int aidl2apiEncoding(int aidlFormat) {

        switch (aidlFormat) {

            case android.media.audio.common.AudioFormat.PCM

                    | android.media.audio.common.AudioFormat.PCM_SUB_16_BIT:

                return AudioFormat.ENCODING_PCM_16BIT;



            case android.media.audio.common.AudioFormat.PCM

                    | android.media.audio.common.AudioFormat.PCM_SUB_8_BIT:

                return AudioFormat.ENCODING_PCM_8BIT;



            case android.media.audio.common.AudioFormat.PCM

                    | android.media.audio.common.AudioFormat.PCM_SUB_FLOAT:

            case android.media.audio.common.AudioFormat.PCM

                    | android.media.audio.common.AudioFormat.PCM_SUB_8_24_BIT:

            case android.media.audio.common.AudioFormat.PCM

                    | android.media.audio.common.AudioFormat.PCM_SUB_24_BIT_PACKED:

            case android.media.audio.common.AudioFormat.PCM

                    | android.media.audio.common.AudioFormat.PCM_SUB_32_BIT:

                return AudioFormat.ENCODING_PCM_FLOAT;



            case android.media.audio.common.AudioFormat.AC3:

                return AudioFormat.ENCODING_AC3;



            case android.media.audio.common.AudioFormat.E_AC3:

                return AudioFormat.ENCODING_E_AC3;



            case android.media.audio.common.AudioFormat.DTS:

                return AudioFormat.ENCODING_DTS;



            case android.media.audio.common.AudioFormat.DTS_HD:

                return AudioFormat.ENCODING_DTS_HD;



            case android.media.audio.common.AudioFormat.MP3:

                return AudioFormat.ENCODING_MP3;



            case android.media.audio.common.AudioFormat.AAC

                    | android.media.audio.common.AudioFormat.AAC_SUB_LC:

                return AudioFormat.ENCODING_AAC_LC;



            case android.media.audio.common.AudioFormat.AAC

                    | android.media.audio.common.AudioFormat.AAC_SUB_HE_V1:

                return AudioFormat.ENCODING_AAC_HE_V1;



            case android.media.audio.common.AudioFormat.AAC

                    | android.media.audio.common.AudioFormat.AAC_SUB_HE_V2:

                return AudioFormat.ENCODING_AAC_HE_V2;



            case android.media.audio.common.AudioFormat.IEC61937:

                return AudioFormat.ENCODING_IEC61937;



            case android.media.audio.common.AudioFormat.DOLBY_TRUEHD:

                return AudioFormat.ENCODING_DOLBY_TRUEHD;



            case android.media.audio.common.AudioFormat.AAC

                    | android.media.audio.common.AudioFormat.AAC_SUB_ELD:

                return AudioFormat.ENCODING_AAC_ELD;



            case android.media.audio.common.AudioFormat.AAC

                    | android.media.audio.common.AudioFormat.AAC_SUB_XHE:

                return AudioFormat.ENCODING_AAC_XHE;



            case android.media.audio.common.AudioFormat.AC4:

                return AudioFormat.ENCODING_AC4;



            case android.media.audio.common.AudioFormat.E_AC3

                    | android.media.audio.common.AudioFormat.E_AC3_SUB_JOC:

                return AudioFormat.ENCODING_E_AC3_JOC;



            case android.media.audio.common.AudioFormat.MAT:

            case android.media.audio.common.AudioFormat.MAT

                    | android.media.audio.common.AudioFormat.MAT_SUB_1_0:

            case android.media.audio.common.AudioFormat.MAT

                    | android.media.audio.common.AudioFormat.MAT_SUB_2_0:

            case android.media.audio.common.AudioFormat.MAT

                    | android.media.audio.common.AudioFormat.MAT_SUB_2_1:

                return AudioFormat.ENCODING_DOLBY_MAT;



            case android.media.audio.common.AudioFormat.DEFAULT:

                return AudioFormat.ENCODING_DEFAULT;



            default:

                return AudioFormat.ENCODING_INVALID;

        }

    }



    public static int api2aidlModelParameter(int apiParam) {

        switch (apiParam) {

            case ModelParams.THRESHOLD_FACTOR:
@@ -334,12 +242,6 @@ class ConversionUtil { 
        }

    }



    public static int aidl2apiChannelInMask(int aidlMask) {

        // We're assuming AudioFormat.CHANNEL_IN_* constants are kept in sync with

        // android.media.audio.common.AudioChannelMask.

        return aidlMask;

    }



    public static SoundTrigger.ModelParamRange aidl2apiModelParameterRange(

            @Nullable ModelParameterRange aidlRange) {

        if (aidlRange == null) {

media/java/android/media/audio/common/AidlConversion.java

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

 * Copyright (C) 2021 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.audio.common;



import android.annotation.NonNull;

import android.media.AudioFormat;



/**

 * This class provides utility functions for converting between

 * the AIDL types defined in 'android.media.audio.common' and:

 *  - SDK (Java API) types from 'android.media';

 *  - legacy native (system/audio.h) types.

 *

 * Methods that convert between AIDL and SDK types are called

 * using the following pattern:

 *

 *  aidl2api_AIDL-type-name_SDK-type-name

 *  api2aidl_SDK-type-name_AIDL-type-name

 *

 * Methods that convert between AIDL and legacy types are called

 * using the following pattern:

 *

 *  aidl2legacy_AIDL-type-name_native-type-name

 *  legacy2aidl_native-type-name_AIDL-type-name

 *

 * @hide

 */

public class AidlConversion {

    /** Convert from legacy audio_channel_mask_t to AIDL AudioChannelMask. */

    public static int legacy2aidl_audio_channel_mask_t_AudioChannelMask(

            int /*audio_channel_mask_t*/ legacy) {

        // Relies on the fact that AudioChannelMask was converted from

        // the HIDL definition which uses the same constant values as system/audio.h

        return legacy;

    }



    /** Convert from legacy audio_format_t to AIDL AudioFormat. */

    public static int legacy2aidl_audio_format_t_AudioFormat(int /*audio_format_t*/ legacy) {

        // Relies on the fact that AudioFormat was converted from

        // the HIDL definition which uses the same constant values as system/audio.h

        return legacy;

    }



    /** Convert from legacy audio_stream_type_t to AIDL AudioStreamType. */

    public static int legacy2aidl_audio_stream_type_t_AudioStreamType(

            int /*audio_stream_type_t*/ legacy) {

        // Relies on the fact that AudioStreamType was converted from

        // the HIDL definition which uses the same constant values as system/audio.h

        return legacy;

    }



    /** Convert from legacy audio_usage_t to AIDL AudioUsage. */

    public static int legacy2aidl_audio_usage_t_AudioUsage(int /*audio_usage_t*/ legacy) {

        // Relies on the fact that AudioUsage was converted from

        // the HIDL definition which uses the same constant values as system/audio.h

        return legacy;

    }



    /** Convert from AIDL AudioChannelMask to SDK AudioFormat.CHANNEL_IN_*. */

    public static int aidl2api_AudioChannelMask_AudioFormatChannelInMask(int aidlMask) {

        // We're assuming AudioFormat.CHANNEL_IN_* constants are kept in sync with

        // android.media.audio.common.AudioChannelMask.

        return aidlMask;

    }



    /** Convert from AIDL AudioConfig to SDK AudioFormat. */

    public static @NonNull AudioFormat aidl2api_AudioConfig_AudioFormat(

            @NonNull AudioConfig audioConfig) {

        AudioFormat.Builder apiBuilder = new AudioFormat.Builder();

        apiBuilder.setSampleRate(audioConfig.sampleRateHz);

        apiBuilder.setChannelMask(aidl2api_AudioChannelMask_AudioFormatChannelInMask(

                        audioConfig.channelMask));

        apiBuilder.setEncoding(aidl2api_AudioFormat_AudioFormatEncoding(audioConfig.format));

        return apiBuilder.build();

    }



    /** Convert from AIDL AudioFormat to SDK AudioFormat.ENCODING_*. */

    public static int aidl2api_AudioFormat_AudioFormatEncoding(int aidlFormat) {

        switch (aidlFormat) {

            case android.media.audio.common.AudioFormat.PCM

                    | android.media.audio.common.AudioFormat.PCM_SUB_16_BIT:

                return AudioFormat.ENCODING_PCM_16BIT;



            case android.media.audio.common.AudioFormat.PCM

                    | android.media.audio.common.AudioFormat.PCM_SUB_8_BIT:

                return AudioFormat.ENCODING_PCM_8BIT;



            case android.media.audio.common.AudioFormat.PCM

                    | android.media.audio.common.AudioFormat.PCM_SUB_FLOAT:

            case android.media.audio.common.AudioFormat.PCM

                    | android.media.audio.common.AudioFormat.PCM_SUB_8_24_BIT:

            case android.media.audio.common.AudioFormat.PCM

                    | android.media.audio.common.AudioFormat.PCM_SUB_24_BIT_PACKED:

            case android.media.audio.common.AudioFormat.PCM

                    | android.media.audio.common.AudioFormat.PCM_SUB_32_BIT:

                return AudioFormat.ENCODING_PCM_FLOAT;



            case android.media.audio.common.AudioFormat.AC3:

                return AudioFormat.ENCODING_AC3;



            case android.media.audio.common.AudioFormat.E_AC3:

                return AudioFormat.ENCODING_E_AC3;



            case android.media.audio.common.AudioFormat.DTS:

                return AudioFormat.ENCODING_DTS;



            case android.media.audio.common.AudioFormat.DTS_HD:

                return AudioFormat.ENCODING_DTS_HD;



            case android.media.audio.common.AudioFormat.MP3:

                return AudioFormat.ENCODING_MP3;



            case android.media.audio.common.AudioFormat.AAC

                    | android.media.audio.common.AudioFormat.AAC_SUB_LC:

                return AudioFormat.ENCODING_AAC_LC;



            case android.media.audio.common.AudioFormat.AAC

                    | android.media.audio.common.AudioFormat.AAC_SUB_HE_V1:

                return AudioFormat.ENCODING_AAC_HE_V1;



            case android.media.audio.common.AudioFormat.AAC

                    | android.media.audio.common.AudioFormat.AAC_SUB_HE_V2:

                return AudioFormat.ENCODING_AAC_HE_V2;



            case android.media.audio.common.AudioFormat.IEC61937:

                return AudioFormat.ENCODING_IEC61937;



            case android.media.audio.common.AudioFormat.DOLBY_TRUEHD:

                return AudioFormat.ENCODING_DOLBY_TRUEHD;



            case android.media.audio.common.AudioFormat.AAC

                    | android.media.audio.common.AudioFormat.AAC_SUB_ELD:

                return AudioFormat.ENCODING_AAC_ELD;



            case android.media.audio.common.AudioFormat.AAC

                    | android.media.audio.common.AudioFormat.AAC_SUB_XHE:

                return AudioFormat.ENCODING_AAC_XHE;



            case android.media.audio.common.AudioFormat.AC4:

                return AudioFormat.ENCODING_AC4;



            case android.media.audio.common.AudioFormat.E_AC3

                    | android.media.audio.common.AudioFormat.E_AC3_SUB_JOC:

                return AudioFormat.ENCODING_E_AC3_JOC;



            case android.media.audio.common.AudioFormat.MAT:

            case android.media.audio.common.AudioFormat.MAT

                    | android.media.audio.common.AudioFormat.MAT_SUB_1_0:

            case android.media.audio.common.AudioFormat.MAT

                    | android.media.audio.common.AudioFormat.MAT_SUB_2_0:

            case android.media.audio.common.AudioFormat.MAT

                    | android.media.audio.common.AudioFormat.MAT_SUB_2_1:

                return AudioFormat.ENCODING_DOLBY_MAT;



            case android.media.audio.common.AudioFormat.DEFAULT:

                return AudioFormat.ENCODING_DEFAULT;



            default:

                return AudioFormat.ENCODING_INVALID;

        }

    }

}

services/core/java/com/android/server/soundtrigger_middleware/ConversionUtil.java

+13 −12
Original line number Diff line number Diff line
@@ -21,6 +21,9 @@ import android.annotation.Nullable; 
import android.hardware.audio.common.V2_0.Uuid;

import android.hardware.soundtrigger.V2_1.ISoundTriggerHwCallback;

import android.hardware.soundtrigger.V2_3.ISoundTriggerHw;

import android.media.audio.common.AidlConversion;

import android.media.audio.common.AudioConfig;

import android.media.audio.common.AudioOffloadInfo;

import android.media.soundtrigger.AudioCapabilities;

import android.media.soundtrigger.ConfidenceLevel;

import android.media.soundtrigger.ModelParameter;
@@ -36,8 +39,6 @@ import android.media.soundtrigger.RecognitionMode; 
import android.media.soundtrigger.RecognitionStatus;

import android.media.soundtrigger.SoundModel;

import android.media.soundtrigger.SoundModelType;

import android.media.audio.common.AudioConfig;

import android.media.audio.common.AudioOffloadInfo;

import android.os.HidlMemory;

import android.os.HidlMemoryUtil;

import android.os.ParcelFileDescriptor;
@@ -350,11 +351,11 @@ class ConversionUtil { 
    AudioConfig hidl2aidlAudioConfig(

            @NonNull android.hardware.audio.common.V2_0.AudioConfig hidlConfig) {

        AudioConfig aidlConfig = new AudioConfig();

        // TODO(ytai): channelMask and format might need a more careful conversion to make sure the

        //  constants match.

        aidlConfig.sampleRateHz = hidlConfig.sampleRateHz;

        aidlConfig.channelMask = hidlConfig.channelMask;

        aidlConfig.format = hidlConfig.format;

        aidlConfig.channelMask = AidlConversion.legacy2aidl_audio_channel_mask_t_AudioChannelMask(

                hidlConfig.channelMask);

        aidlConfig.format = AidlConversion.legacy2aidl_audio_format_t_AudioFormat(

                hidlConfig.format);

        aidlConfig.offloadInfo = hidl2aidlOffloadInfo(hidlConfig.offloadInfo);

        aidlConfig.frameCount = hidlConfig.frameCount;

        return aidlConfig;
@@ -364,19 +365,19 @@ class ConversionUtil { 
    AudioOffloadInfo hidl2aidlOffloadInfo(

            @NonNull android.hardware.audio.common.V2_0.AudioOffloadInfo hidlInfo) {

        AudioOffloadInfo aidlInfo = new AudioOffloadInfo();

        // TODO(ytai): channelMask, format, streamType and usage might need a more careful

        //  conversion to make sure the constants match.

        aidlInfo.sampleRateHz = hidlInfo.sampleRateHz;

        aidlInfo.channelMask = hidlInfo.channelMask;

        aidlInfo.format = hidlInfo.format;

        aidlInfo.streamType = hidlInfo.streamType;

        aidlInfo.channelMask = AidlConversion.legacy2aidl_audio_channel_mask_t_AudioChannelMask(

                hidlInfo.channelMask);

        aidlInfo.format = AidlConversion.legacy2aidl_audio_format_t_AudioFormat(hidlInfo.format);

        aidlInfo.streamType = AidlConversion.legacy2aidl_audio_stream_type_t_AudioStreamType(

                hidlInfo.streamType);

        aidlInfo.bitRatePerSecond = hidlInfo.bitRatePerSecond;

        aidlInfo.durationMicroseconds = hidlInfo.durationMicroseconds;

        aidlInfo.hasVideo = hidlInfo.hasVideo;

        aidlInfo.isStreaming = hidlInfo.isStreaming;

        aidlInfo.bitWidth = hidlInfo.bitWidth;

        aidlInfo.bufferSize = hidlInfo.bufferSize;

        aidlInfo.usage = hidlInfo.usage;

        aidlInfo.usage = AidlConversion.legacy2aidl_audio_usage_t_AudioUsage(hidlInfo.usage);

        return aidlInfo;

    }