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

Commit 3a46b975 authored by Narayan Kamath's avatar Narayan Kamath Committed by Android Git Automerger
Browse files

am a9b82160: Merge "LP64 fixes for media/libeffects" 

* commit 'a9b82160':
  LP64 fixes for media/libeffects
parents 31a98ad0 a9b82160

media/libeffects/downmix/EffectDownmix.c

+3 −3
Original line number Diff line number Diff line
@@ -699,7 +699,7 @@ int Downmix_Reset(downmix_object_t *pDownmixer, bool init) { 
 *

 *----------------------------------------------------------------------------

 */

int Downmix_setParameter(downmix_object_t *pDownmixer, int32_t param, size_t size, void *pValue) {

int Downmix_setParameter(downmix_object_t *pDownmixer, int32_t param, uint32_t size, void *pValue) {



    int16_t value16;

    ALOGV("Downmix_setParameter, context %p, param %d, value16 %d, value32 %d",
@@ -709,7 +709,7 @@ int Downmix_setParameter(downmix_object_t *pDownmixer, int32_t param, size_t siz 


      case DOWNMIX_PARAM_TYPE:

        if (size != sizeof(downmix_type_t)) {

            ALOGE("Downmix_setParameter(DOWNMIX_PARAM_TYPE) invalid size %zu, should be %zu",

            ALOGE("Downmix_setParameter(DOWNMIX_PARAM_TYPE) invalid size %u, should be %zu",

                    size, sizeof(downmix_type_t));

            return -EINVAL;

        }
@@ -755,7 +755,7 @@ int Downmix_setParameter(downmix_object_t *pDownmixer, int32_t param, size_t siz 
 *

 *----------------------------------------------------------------------------

 */

int Downmix_getParameter(downmix_object_t *pDownmixer, int32_t param, size_t *pSize, void *pValue) {

int Downmix_getParameter(downmix_object_t *pDownmixer, int32_t param, uint32_t *pSize, void *pValue) {

    int16_t *pValue16;



    switch (param) {

media/libeffects/downmix/EffectDownmix.h

+2 −2
Original line number Diff line number Diff line
@@ -93,8 +93,8 @@ static int Downmix_GetDescriptor(effect_handle_t self, 
int Downmix_Init(downmix_module_t *pDwmModule);

int Downmix_Configure(downmix_module_t *pDwmModule, effect_config_t *pConfig, bool init);

int Downmix_Reset(downmix_object_t *pDownmixer, bool init);

int Downmix_setParameter(downmix_object_t *pDownmixer, int32_t param, size_t size, void *pValue);

int Downmix_getParameter(downmix_object_t *pDownmixer, int32_t param, size_t *pSize, void *pValue);

int Downmix_setParameter(downmix_object_t *pDownmixer, int32_t param, uint32_t size, void *pValue);

int Downmix_getParameter(downmix_object_t *pDownmixer, int32_t param, uint32_t *pSize, void *pValue);



void Downmix_foldFromQuad(int16_t *pSrc, int16_t*pDst, size_t numFrames, bool accumulate);

void Downmix_foldFromSurround(int16_t *pSrc, int16_t*pDst, size_t numFrames, bool accumulate);

media/libeffects/lvm/lib/Bass/src/LVDBE_Init.c

+1 −1
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ LVDBE_ReturnStatus_en LVDBE_Init(LVDBE_Handle_t *phInstance, 
            {

                return(LVDBE_NULLADDRESS);

            }

            if (((LVM_UINT32)pMemoryTable->Region[i].pBaseAddress % pMemoryTable->Region[i].Alignment)!=0){

            if (((uintptr_t)pMemoryTable->Region[i].pBaseAddress % pMemoryTable->Region[i].Alignment)!=0){

                return(LVDBE_ALIGNMENTERROR);

            }

        }

media/libeffects/lvm/lib/Bundle/src/LVM_Process.c

+1 −1
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ LVM_ReturnStatus_en LVM_Process(LVM_Handle_t hInstance, 
        /*

         * Check the buffer alignment

         */

        if((((LVM_UINT32)pInData % 4) != 0) || (((LVM_UINT32)pOutData % 4) != 0))

        if((((uintptr_t)pInData % 4) != 0) || (((uintptr_t)pOutData % 4) != 0))

        {

            return(LVM_ALIGNMENTERROR);

        }

media/libeffects/lvm/lib/Common/lib/InstAlloc.h

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ extern "C" { 
typedef struct

{

    LVM_UINT32              TotalSize;      /*  Accumulative total memory size                      */

    LVM_UINT32              pNextMember;    /*  Pointer to the next instance member to be allocated */

    uintptr_t               pNextMember;    /*  Pointer to the next instance member to be allocated */

}   INST_ALLOC;