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

Commit a84a2905 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

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

Merge "Merge "AAudio: Support front wide channels" into android13-tests-dev am: 1caa1e26" into android14-tests-dev am: 38316ecc

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



Change-Id: I841f69f45505c26b34d1628994c97bb2619e87ab
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5493746a 38316ecc

media/libaaudio/src/utility/AAudioUtilities.cpp

+8 −10
Original line number Diff line number Diff line
@@ -383,11 +383,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;
@@ -465,11 +464,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;