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

Commit 39ca98f5 authored by Andy Hung's avatar Andy Hung Committed by android-build-merger
Browse files

Effect: Use local cached data for Effect commit am: dd79ccda am: 82c8c765... 

Effect: Use local cached data for Effect commit am: dd79ccda am: 82c8c765 am: 9851dee7 am: 42429500 am: a661c828
am: b45c8562

Change-Id: I6cb0c8e2dbaa2ebe3d4fd4f283a2028ac099f3c3
parents 72729c44 b45c8562

services/audioflinger/Effects.cpp

+38 −19
Original line number Original line Diff line number Diff line
@@ -1277,36 +1277,54 @@ status_t AudioFlinger::EffectHandle::command(uint32_t cmdCode, 
        // particular client process:  no risk to block the whole media server process or mixer

        // particular client process:  no risk to block the whole media server process or mixer

        // threads if we are stuck here

        // threads if we are stuck here

        Mutex::Autolock _l(mCblk->lock);

        Mutex::Autolock _l(mCblk->lock);

        if (mCblk->clientIndex > EFFECT_PARAM_BUFFER_SIZE ||



            mCblk->serverIndex > EFFECT_PARAM_BUFFER_SIZE) {

        // keep local copy of index in case of client corruption b/32220769

        const uint32_t clientIndex = mCblk->clientIndex;

        const uint32_t serverIndex = mCblk->serverIndex;

        if (clientIndex > EFFECT_PARAM_BUFFER_SIZE ||

            serverIndex > EFFECT_PARAM_BUFFER_SIZE) {

            mCblk->serverIndex = 0;

            mCblk->serverIndex = 0;

            mCblk->clientIndex = 0;

            mCblk->clientIndex = 0;

            return BAD_VALUE;

            return BAD_VALUE;

        }

        }

        status_t status = NO_ERROR;

        status_t status = NO_ERROR;

        while (mCblk->serverIndex < mCblk->clientIndex) {

        effect_param_t *param = NULL;

            int reply;

        for (uint32_t index = serverIndex; index < clientIndex;) {

            uint32_t rsize = sizeof(int);

            int *p = (int *)(mBuffer + index);

            int *p = (int *)(mBuffer + mCblk->serverIndex);

            const int size = *p++;

            int size = *p++;

            if (size < 0

            if (((uint8_t *)p + size) > mBuffer + mCblk->clientIndex) {

                    || size > EFFECT_PARAM_BUFFER_SIZE

                    || ((uint8_t *)p + size) > mBuffer + clientIndex) {

                ALOGW("command(): invalid parameter block size");

                ALOGW("command(): invalid parameter block size");

                status = BAD_VALUE;

                break;

                break;

            }

            }

            effect_param_t *param = (effect_param_t *)p;



            if (param->psize == 0 || param->vsize == 0) {

            // copy to local memory in case of client corruption b/32220769

                ALOGW("command(): null parameter or value size");

            param = (effect_param_t *)realloc(param, size);

                mCblk->serverIndex += size;

            if (param == NULL) {

                continue;

                ALOGW("command(): out of memory");

                status = NO_MEMORY;

                break;

            }

            }

            uint32_t psize = sizeof(effect_param_t) +

            memcpy(param, p, size);

                             ((param->psize - 1) / sizeof(int) + 1) * sizeof(int) +



                             param->vsize;

            int reply = 0;

            uint32_t rsize = sizeof(reply);

            status_t ret = mEffect->command(EFFECT_CMD_SET_PARAM,

            status_t ret = mEffect->command(EFFECT_CMD_SET_PARAM,

                                            psize,

                                            size,

                                            p,

                                            param,

                                            &rsize,

                                            &rsize,

                                            &reply);

                                            &reply);



            // verify shared memory: server index shouldn't change; client index can't go back.

            if (serverIndex != mCblk->serverIndex

                    || clientIndex > mCblk->clientIndex) {

                android_errorWriteLog(0x534e4554, "32220769");

                status = BAD_VALUE;

                break;

            }



            // stop at first error encountered

            // stop at first error encountered

            if (ret != NO_ERROR) {

            if (ret != NO_ERROR) {

                status = ret;

                status = ret;
@@ -1316,8 +1334,9 @@ status_t AudioFlinger::EffectHandle::command(uint32_t cmdCode, 
                *(int *)pReplyData = reply;

                *(int *)pReplyData = reply;

                break;

                break;

            }

            }

            mCblk->serverIndex += size;

            index += size;

        }

        }

        free(param);

        mCblk->serverIndex = 0;

        mCblk->serverIndex = 0;

        mCblk->clientIndex = 0;

        mCblk->clientIndex = 0;

        return status;

        return status;