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

Commit d211ce08 authored by Andy Hung's avatar Andy Hung
Browse files

AudioSystem: Modernize containers 

Remove usage of android::DefaultKeyedVector and
android::Vector.

Test: atest CtsMediaAudioTestCases
Bug: 326504627
Change-Id: Id044bfc55633eb0a10321ecfc2b25d3b77a488f4
parent 264fa4ce

media/libaudioclient/AudioSystem.cpp

+24 −59
Original line number Original line Diff line number Diff line
@@ -594,13 +594,10 @@ Status AudioSystem::AudioFlingerClient::ioConfigChanged( 
            case AUDIO_OUTPUT_REGISTERED:

            case AUDIO_OUTPUT_REGISTERED:

            case AUDIO_INPUT_OPENED:

            case AUDIO_INPUT_OPENED:

            case AUDIO_INPUT_REGISTERED: {

            case AUDIO_INPUT_REGISTERED: {

                sp<AudioIoDescriptor> oldDesc = getIoDescriptor_l(ioDesc->getIoHandle());

                if (sp<AudioIoDescriptor> oldDesc = getIoDescriptor_l(ioDesc->getIoHandle())) {

                if (oldDesc == 0) {

                    mIoDescriptors.add(ioDesc->getIoHandle(), ioDesc);

                } else {

                    deviceId = oldDesc->getDeviceId();

                    deviceId = oldDesc->getDeviceId();

                    mIoDescriptors.replaceValueFor(ioDesc->getIoHandle(), ioDesc);

                }

                }

                mIoDescriptors[ioDesc->getIoHandle()] = ioDesc;





                if (ioDesc->getDeviceId() != AUDIO_PORT_HANDLE_NONE) {

                if (ioDesc->getDeviceId() != AUDIO_PORT_HANDLE_NONE) {

                    deviceId = ioDesc->getDeviceId();

                    deviceId = ioDesc->getDeviceId();
@@ -629,7 +626,7 @@ Status AudioSystem::AudioFlingerClient::ioConfigChanged( 
                ALOGV("ioConfigChanged() %s %d closed",

                ALOGV("ioConfigChanged() %s %d closed",

                      event == AUDIO_OUTPUT_CLOSED ? "output" : "input", ioDesc->getIoHandle());

                      event == AUDIO_OUTPUT_CLOSED ? "output" : "input", ioDesc->getIoHandle());





                mIoDescriptors.removeItem(ioDesc->getIoHandle());

                mIoDescriptors.erase(ioDesc->getIoHandle());

                mAudioDeviceCallbacks.erase(ioDesc->getIoHandle());

                mAudioDeviceCallbacks.erase(ioDesc->getIoHandle());

            }

            }

                break;

                break;
@@ -645,7 +642,7 @@ Status AudioSystem::AudioFlingerClient::ioConfigChanged( 
                }

                }





                deviceId = oldDesc->getDeviceId();

                deviceId = oldDesc->getDeviceId();

                mIoDescriptors.replaceValueFor(ioDesc->getIoHandle(), ioDesc);

                mIoDescriptors[ioDesc->getIoHandle()] = ioDesc;





                if (deviceId != ioDesc->getDeviceId()) {

                if (deviceId != ioDesc->getDeviceId()) {

                    deviceId = ioDesc->getDeviceId();

                    deviceId = ioDesc->getDeviceId();
@@ -758,12 +755,11 @@ status_t AudioSystem::AudioFlingerClient::getInputBufferSize( 




sp<AudioIoDescriptor>

sp<AudioIoDescriptor>

AudioSystem::AudioFlingerClient::getIoDescriptor_l(audio_io_handle_t ioHandle) {

AudioSystem::AudioFlingerClient::getIoDescriptor_l(audio_io_handle_t ioHandle) {

    sp<AudioIoDescriptor> desc;

    if (const auto it = mIoDescriptors.find(ioHandle);

    ssize_t index = mIoDescriptors.indexOfKey(ioHandle);

        it != mIoDescriptors.end()) {

    if (index >= 0) {

        return it->second;

        desc = mIoDescriptors.valueAt(index);

    }

    }

    return desc;

    return {};

}

}





sp<AudioIoDescriptor> AudioSystem::AudioFlingerClient::getIoDescriptor(audio_io_handle_t ioHandle) {

sp<AudioIoDescriptor> AudioSystem::AudioFlingerClient::getIoDescriptor(audio_io_handle_t ioHandle) {
@@ -2748,44 +2744,27 @@ status_t AudioSystem::clearPreferredMixerAttributes(const audio_attributes_t *at 
int AudioSystem::AudioPolicyServiceClient::addAudioPortCallback(

int AudioSystem::AudioPolicyServiceClient::addAudioPortCallback(

        const sp<AudioPortCallback>& callback) {

        const sp<AudioPortCallback>& callback) {

    std::lock_guard _l(mMutex);

    std::lock_guard _l(mMutex);

    for (size_t i = 0; i < mAudioPortCallbacks.size(); i++) {

    return mAudioPortCallbacks.insert(callback).second ? mAudioPortCallbacks.size() : -1;

        if (mAudioPortCallbacks[i] == callback) {

            return -1;

        }

    }

    mAudioPortCallbacks.add(callback);

    return mAudioPortCallbacks.size();

}

}





int AudioSystem::AudioPolicyServiceClient::removeAudioPortCallback(

int AudioSystem::AudioPolicyServiceClient::removeAudioPortCallback(

        const sp<AudioPortCallback>& callback) {

        const sp<AudioPortCallback>& callback) {

    std::lock_guard _l(mMutex);

    std::lock_guard _l(mMutex);

    size_t i;

    return mAudioPortCallbacks.erase(callback) > 0 ? mAudioPortCallbacks.size() : -1;

    for (i = 0; i < mAudioPortCallbacks.size(); i++) {

        if (mAudioPortCallbacks[i] == callback) {

            break;

        }

}

}

    if (i == mAudioPortCallbacks.size()) {

        return -1;

    }

    mAudioPortCallbacks.removeAt(i);

    return mAudioPortCallbacks.size();

}







Status AudioSystem::AudioPolicyServiceClient::onAudioPortListUpdate() {

Status AudioSystem::AudioPolicyServiceClient::onAudioPortListUpdate() {

    std::lock_guard _l(mMutex);

    std::lock_guard _l(mMutex);

    for (size_t i = 0; i < mAudioPortCallbacks.size(); i++) {

    for (const auto& callback : mAudioPortCallbacks) {

        mAudioPortCallbacks[i]->onAudioPortListUpdate();

        callback->onAudioPortListUpdate();

    }

    }

    return Status::ok();

    return Status::ok();

}

}





Status AudioSystem::AudioPolicyServiceClient::onAudioPatchListUpdate() {

Status AudioSystem::AudioPolicyServiceClient::onAudioPatchListUpdate() {

    std::lock_guard _l(mMutex);

    std::lock_guard _l(mMutex);

    for (size_t i = 0; i < mAudioPortCallbacks.size(); i++) {

    for (const auto& callback : mAudioPortCallbacks) {

        mAudioPortCallbacks[i]->onAudioPatchListUpdate();

        callback->onAudioPatchListUpdate();

    }

    }

    return Status::ok();

    return Status::ok();

}

}
@@ -2794,29 +2773,15 @@ Status AudioSystem::AudioPolicyServiceClient::onAudioPatchListUpdate() { 
int AudioSystem::AudioPolicyServiceClient::addAudioVolumeGroupCallback(

int AudioSystem::AudioPolicyServiceClient::addAudioVolumeGroupCallback(

        const sp<AudioVolumeGroupCallback>& callback) {

        const sp<AudioVolumeGroupCallback>& callback) {

    std::lock_guard _l(mMutex);

    std::lock_guard _l(mMutex);

    for (size_t i = 0; i < mAudioVolumeGroupCallback.size(); i++) {

    return mAudioVolumeGroupCallbacks.insert(callback).second

        if (mAudioVolumeGroupCallback[i] == callback) {

            ? mAudioVolumeGroupCallbacks.size() : -1;

            return -1;

        }

    }

    mAudioVolumeGroupCallback.add(callback);

    return mAudioVolumeGroupCallback.size();

}

}





int AudioSystem::AudioPolicyServiceClient::removeAudioVolumeGroupCallback(

int AudioSystem::AudioPolicyServiceClient::removeAudioVolumeGroupCallback(

        const sp<AudioVolumeGroupCallback>& callback) {

        const sp<AudioVolumeGroupCallback>& callback) {

    std::lock_guard _l(mMutex);

    std::lock_guard _l(mMutex);

    size_t i;

    return mAudioVolumeGroupCallbacks.erase(callback) > 0

    for (i = 0; i < mAudioVolumeGroupCallback.size(); i++) {

            ? mAudioVolumeGroupCallbacks.size() : -1;

        if (mAudioVolumeGroupCallback[i] == callback) {

            break;

        }

    }

    if (i == mAudioVolumeGroupCallback.size()) {

        return -1;

    }

    mAudioVolumeGroupCallback.removeAt(i);

    return mAudioVolumeGroupCallback.size();

}

}





Status AudioSystem::AudioPolicyServiceClient::onAudioVolumeGroupChanged(int32_t group,

Status AudioSystem::AudioPolicyServiceClient::onAudioVolumeGroupChanged(int32_t group,
@@ -2826,8 +2791,8 @@ Status AudioSystem::AudioPolicyServiceClient::onAudioVolumeGroupChanged(int32_t 
    int flagsLegacy = VALUE_OR_RETURN_BINDER_STATUS(convertReinterpret<int>(flags));

    int flagsLegacy = VALUE_OR_RETURN_BINDER_STATUS(convertReinterpret<int>(flags));





    std::lock_guard _l(mMutex);

    std::lock_guard _l(mMutex);

    for (size_t i = 0; i < mAudioVolumeGroupCallback.size(); i++) {

    for (const auto& callback : mAudioVolumeGroupCallbacks) {

        mAudioVolumeGroupCallback[i]->onAudioVolumeGroupChanged(groupLegacy, flagsLegacy);

        callback->onAudioVolumeGroupChanged(groupLegacy, flagsLegacy);

    }

    }

    return Status::ok();

    return Status::ok();

}

}
@@ -2921,11 +2886,11 @@ Status AudioSystem::AudioPolicyServiceClient::onVolumeRangeInitRequest() { 
void AudioSystem::AudioPolicyServiceClient::binderDied(const wp<IBinder>& who __unused) {

void AudioSystem::AudioPolicyServiceClient::binderDied(const wp<IBinder>& who __unused) {

    {

    {

        std::lock_guard _l(mMutex);

        std::lock_guard _l(mMutex);

        for (size_t i = 0; i < mAudioPortCallbacks.size(); i++) {

        for (const auto& callback : mAudioPortCallbacks) {

            mAudioPortCallbacks[i]->onServiceDied();

            callback->onServiceDied();

        }

        }

        for (size_t i = 0; i < mAudioVolumeGroupCallback.size(); i++) {

        for (const auto& callback : mAudioVolumeGroupCallbacks) {

            mAudioVolumeGroupCallback[i]->onServiceDied();

            callback->onServiceDied();

        }

        }

    }

    }

    AudioSystem::clearAudioPolicyService();

    AudioSystem::clearAudioPolicyService();

media/libaudioclient/include/media/AudioSystem.h

+5 −6
Original line number Original line Diff line number Diff line
@@ -823,8 +823,7 @@ private: 




    private:

    private:

        mutable std::mutex mMutex;

        mutable std::mutex mMutex;

        DefaultKeyedVector<audio_io_handle_t, sp<AudioIoDescriptor>>

        std::map<audio_io_handle_t, sp<AudioIoDescriptor>> mIoDescriptors GUARDED_BY(mMutex);

                mIoDescriptors GUARDED_BY(mMutex);





        std::map<audio_io_handle_t, std::map<audio_port_handle_t, wp<AudioDeviceCallback>>>

        std::map<audio_io_handle_t, std::map<audio_port_handle_t, wp<AudioDeviceCallback>>>

                mAudioDeviceCallbacks GUARDED_BY(mMutex);

                mAudioDeviceCallbacks GUARDED_BY(mMutex);
@@ -852,7 +851,7 @@ private: 




        bool isAudioPortCbEnabled() const EXCLUDES(mMutex) {

        bool isAudioPortCbEnabled() const EXCLUDES(mMutex) {

            std::lock_guard _l(mMutex);

            std::lock_guard _l(mMutex);

            return (mAudioPortCallbacks.size() != 0);

            return !mAudioPortCallbacks.empty();

        }

        }





        int addAudioVolumeGroupCallback(

        int addAudioVolumeGroupCallback(
@@ -863,7 +862,7 @@ private: 




        bool isAudioVolumeGroupCbEnabled() const EXCLUDES(mMutex) {

        bool isAudioVolumeGroupCbEnabled() const EXCLUDES(mMutex) {

            std::lock_guard _l(mMutex);

            std::lock_guard _l(mMutex);

            return (mAudioVolumeGroupCallback.size() != 0);

            return !mAudioVolumeGroupCallbacks.empty();

        }

        }





        // DeathRecipient

        // DeathRecipient
@@ -889,8 +888,8 @@ private: 




    private:

    private:

        mutable std::mutex mMutex;

        mutable std::mutex mMutex;

        Vector<sp<AudioPortCallback>> mAudioPortCallbacks GUARDED_BY(mMutex);

        std::set<sp<AudioPortCallback>> mAudioPortCallbacks GUARDED_BY(mMutex);

        Vector<sp<AudioVolumeGroupCallback>> mAudioVolumeGroupCallback GUARDED_BY(mMutex);

        std::set<sp<AudioVolumeGroupCallback>> mAudioVolumeGroupCallbacks GUARDED_BY(mMutex);

    };

    };





    static audio_io_handle_t getOutput(audio_stream_type_t stream);

    static audio_io_handle_t getOutput(audio_stream_type_t stream);