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

Commit e2ba47fa authored by Hayden Gomes's avatar Hayden Gomes
Browse files

Updating AudioFormat to handle CHANNEL_IN_DEFAULT 

Adding support for CHANNEL_IN_DEFAULT mapping to and from native for
channel mask.

Bug: 155646578
Test: atest
com.google.android.car.ats.CarAudioManagerSystemTest#createAudioPatch_returnsPatchHandle

Change-Id: If76c0142263aa4b8649414cd49b0810156144d09
parent 06174db5

core/jni/android_media_AudioFormat.h

+13 −2
Original line number Original line Diff line number Diff line
@@ -47,6 +47,7 @@ 




#define CHANNEL_INVALID 0

#define CHANNEL_INVALID 0

#define CHANNEL_OUT_DEFAULT 1

#define CHANNEL_OUT_DEFAULT 1

#define CHANNEL_IN_DEFAULT 1





static inline audio_format_t audioFormatToNative(int audioFormat)

static inline audio_format_t audioFormatToNative(int audioFormat)

{

{
@@ -196,12 +197,22 @@ static inline int outChannelMaskFromNative(audio_channel_mask_t nativeMask) 




static inline audio_channel_mask_t inChannelMaskToNative(int channelMask)

static inline audio_channel_mask_t inChannelMaskToNative(int channelMask)

{

{

    switch (channelMask) {

        case CHANNEL_IN_DEFAULT:

            return AUDIO_CHANNEL_NONE;

        default:

            return (audio_channel_mask_t)channelMask;

            return (audio_channel_mask_t)channelMask;

    }

    }

}





static inline int inChannelMaskFromNative(audio_channel_mask_t nativeMask)

static inline int inChannelMaskFromNative(audio_channel_mask_t nativeMask)

{

{

    switch (nativeMask) {

        case AUDIO_CHANNEL_NONE:

            return CHANNEL_IN_DEFAULT;

        default:

            return (int)nativeMask;

            return (int)nativeMask;

    }

    }

}





#endif // ANDROID_MEDIA_AUDIOFORMAT_H
 
#endif // ANDROID_MEDIA_AUDIOFORMAT_H