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

Commit 9f7eddb7 authored by Andy Hung's avatar Andy Hung Committed by Android (Google) Code Review
Browse files

Merge changes Iba5ccd18,I97e578f3 into mnc-dev 

* changes:
  Fix channel mask dump in AudioFlinger
  Allow creation of output endpoints with channel index masks
parents 856f37a8 f98ec8d0

services/audioflinger/AudioFlinger.h

+9 −0
Original line number Diff line number Diff line
@@ -356,6 +356,15 @@ private: 
            // check that channelMask is the "canonical" one we expect for the channelCount.

            return channelMask == audio_channel_out_mask_from_count(channelCount);

            }

        case AUDIO_CHANNEL_REPRESENTATION_INDEX:

            if (kEnableExtendedChannels) {

                const uint32_t channelCount = audio_channel_count_from_out_mask(channelMask);

                if (channelCount >= FCC_2 // mono is not supported at this time

                        && channelCount <= AudioMixer::MAX_NUM_CHANNELS) {

                    return true;

                }

            }

            return false;

        default:

            return false;

        }

services/audioflinger/Threads.cpp

+56 −43
Original line number Diff line number Diff line
@@ -697,6 +697,10 @@ void AudioFlinger::ThreadBase::processConfigEvents_l() 


String8 channelMaskToString(audio_channel_mask_t mask, bool output) {

    String8 s;

    const audio_channel_representation_t representation = audio_channel_mask_get_representation(mask);



    switch (representation) {

    case AUDIO_CHANNEL_REPRESENTATION_POSITION: {

        if (output) {

            if (mask & AUDIO_CHANNEL_OUT_FRONT_LEFT) s.append("front-left, ");

            if (mask & AUDIO_CHANNEL_OUT_FRONT_RIGHT) s.append("front-right, ");
@@ -734,12 +738,21 @@ String8 channelMaskToString(audio_channel_mask_t mask, bool output) { 
            if (mask & AUDIO_CHANNEL_IN_VOICE_DNLINK) s.append("voice-dnlink, ");

            if (mask & ~AUDIO_CHANNEL_IN_ALL) s.append("unknown,  ");

        }

    int len = s.length();

    if (s.length() > 2) {

        char *str = s.lockBuffer(len);

        s.unlockBuffer(len - 2);

        const int len = s.length();

        if (len > 2) {

            char *str = s.lockBuffer(len); // needed?

            s.unlockBuffer(len - 2);       // remove trailing ", "

        }

        return s;

    }

    case AUDIO_CHANNEL_REPRESENTATION_INDEX:

        s.appendFormat("index mask, bits:%#x", audio_channel_mask_get_bits(mask));

        return s;

    default:

        s.appendFormat("unknown mask, representation:%d  bits:%#x",

                representation, audio_channel_mask_get_bits(mask));

        return s;

    }

}



void AudioFlinger::ThreadBase::dumpBase(int fd, const Vector<String16>& args __unused)