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

Commit 59858797 authored by Mikhail Naganov's avatar Mikhail Naganov Committed by Automerger Merge Worker
Browse files

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

Merge "AAudio: Support front wide channels" into android13-tests-dev am: 1caa1e26 am: 7fbe6f03 am: 5532e4d0

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/3047032



Change-Id: Icf245a218e9f8f232b976ecf9dfa7212f9817514
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b019b6d0 5532e4d0

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;