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

Commit 1caa1e26 authored by Mikhail Naganov's avatar Mikhail Naganov Committed by Gerrit Code Review
Browse files

Merge "AAudio: Support front wide channels" into android13-tests-dev

parents 0ca052b7 db4ea93d

media/libaaudio/src/utility/AAudioUtilities.cpp

+8 −10
Original line number Diff line number Diff line
@@ -352,11 +352,10 @@ audio_channel_mask_t AAudioConvert_aaudioToAndroidChannelLayoutMask( 
                return AUDIO_CHANNEL_OUT_7POINT1POINT2;

            case AAUDIO_CHANNEL_7POINT1POINT4:

                return AUDIO_CHANNEL_OUT_7POINT1POINT4;

            // TODO: add 9point1point4 and 9point1point6 when they are added in audio-hal-enums.h

            // case AAUDIO_CHANNEL_9POINT1POINT4:

            //     return AUDIO_CHANNEL_OUT_9POINT1POINT4;

            // case AAUDIO_CHANNEL_9POINT1POINT6:

            //     return AUDIO_CHANNEL_OUT_9POINT1POINT6;

            case AAUDIO_CHANNEL_9POINT1POINT4:

                return AUDIO_CHANNEL_OUT_9POINT1POINT4;

            case AAUDIO_CHANNEL_9POINT1POINT6:

                return AUDIO_CHANNEL_OUT_9POINT1POINT6;

            default:

                ALOGE("%s() %#x unrecognized", __func__, channelMask);

                return AUDIO_CHANNEL_INVALID;
@@ -434,11 +433,10 @@ aaudio_channel_mask_t AAudioConvert_androidToAAudioChannelLayoutMask( 
                return AAUDIO_CHANNEL_7POINT1POINT2;

            case AUDIO_CHANNEL_OUT_7POINT1POINT4:

                return AAUDIO_CHANNEL_7POINT1POINT4;

            // TODO: add 9point1point4 and 9point1point6 when they are added in audio-hal-enums.h

            // case AUDIO_CHANNEL_OUT_9POINT1POINT4:

            //     return AAUDIO_CHANNEL_9POINT1POINT4;

            // case AUDIO_CHANNEL_OUT_9POINT1POINT6:

            //     return AAUDIO_CHANNEL_9POINT1POINT6;

            case AUDIO_CHANNEL_OUT_9POINT1POINT4:

                return AAUDIO_CHANNEL_9POINT1POINT4;

            case AUDIO_CHANNEL_OUT_9POINT1POINT6:

                return AAUDIO_CHANNEL_9POINT1POINT6;

            default:

                ALOGE("%s() %#x unrecognized", __func__, channelMask);

                return AAUDIO_CHANNEL_INVALID;