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

Commit a189a688 authored by Glenn Kasten's avatar Glenn Kasten
Browse files

Use struct assignment instead of explicit memcpy 

for POD structs effect_descriptor_t and effect_config_t

Change-Id: Ib2fc47f85fb65ed91b0abb1f87217c49b5eb571d
parent 28b76b33

media/libeffects/factory/EffectsFactory.c

+2 −2
Original line number Diff line number Diff line
@@ -214,7 +214,7 @@ int EffectQueryEffect(uint32_t index, effect_descriptor_t *pDescriptor) 
    while (gCurLib) {

        if (gCurEffect) {

            if (index == gCurEffectIdx) {

                memcpy(pDescriptor, gCurEffect->object, sizeof(effect_descriptor_t));

                *pDescriptor = *(effect_descriptor_t *)gCurEffect->object;

                ret = 0;

                break;

            } else {
@@ -251,7 +251,7 @@ int EffectGetDescriptor(const effect_uuid_t *uuid, effect_descriptor_t *pDescrip 
    pthread_mutex_lock(&gLibLock);

    ret = findEffect(NULL, uuid, &l, &d);

    if (ret == 0) {

        memcpy(pDescriptor, d, sizeof(effect_descriptor_t));

        *pDescriptor = *d;

    }

    pthread_mutex_unlock(&gLibLock);

    return ret;

media/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp

+8 −8
Original line number Diff line number Diff line
@@ -180,16 +180,16 @@ extern "C" int EffectQueryEffect(uint32_t index, effect_descriptor_t *pDescripto 
    }

    if(index == LVM_BASS_BOOST){

        ALOGV("\tEffectQueryEffect processing LVM_BASS_BOOST");

        memcpy(pDescriptor, &gBassBoostDescriptor,   sizeof(effect_descriptor_t));

        *pDescriptor = gBassBoostDescriptor;

    }else if(index == LVM_VIRTUALIZER){

        ALOGV("\tEffectQueryEffect processing LVM_VIRTUALIZER");

        memcpy(pDescriptor, &gVirtualizerDescriptor, sizeof(effect_descriptor_t));

        *pDescriptor = gVirtualizerDescriptor;

    } else if(index == LVM_EQUALIZER){

        ALOGV("\tEffectQueryEffect processing LVM_EQUALIZER");

        memcpy(pDescriptor, &gEqualizerDescriptor,   sizeof(effect_descriptor_t));

        *pDescriptor = gEqualizerDescriptor;

    } else if(index == LVM_VOLUME){

        ALOGV("\tEffectQueryEffect processing LVM_VOLUME");

        memcpy(pDescriptor, &gVolumeDescriptor, sizeof(effect_descriptor_t));

        *pDescriptor = gVolumeDescriptor;

    }

    ALOGV("\tEffectQueryEffect end\n");

    return 0;
@@ -494,7 +494,7 @@ extern "C" int EffectGetDescriptor(const effect_uuid_t *uuid, 
        return  -EINVAL;

    }



    memcpy(pDescriptor, desc, sizeof(effect_descriptor_t));

    *pDescriptor = *desc;



    return 0;

} /* end EffectGetDescriptor */
@@ -965,7 +965,7 @@ int Effect_setConfig(EffectContext *pContext, effect_config_t *pConfig){ 
              || pConfig->outputCfg.accessMode == EFFECT_BUFFER_ACCESS_ACCUMULATE);

    CHECK_ARG(pConfig->inputCfg.format == AUDIO_FORMAT_PCM_16_BIT);



    memcpy(&pContext->config, pConfig, sizeof(effect_config_t));

    pContext->config = *pConfig;



    switch (pConfig->inputCfg.samplingRate) {

    case 8000:
@@ -1041,7 +1041,7 @@ int Effect_setConfig(EffectContext *pContext, effect_config_t *pConfig){ 


void Effect_getConfig(EffectContext *pContext, effect_config_t *pConfig)

{

    memcpy(pConfig, &pContext->config, sizeof(effect_config_t));

    *pConfig = pContext->config;

}   /* end Effect_getConfig */



//----------------------------------------------------------------------------
@@ -3272,7 +3272,7 @@ int Effect_getDescriptor(effect_handle_t self, 
            return -EINVAL;

    }



    memcpy(pDescriptor, desc, sizeof(effect_descriptor_t));

    *pDescriptor = *desc;



    return 0;

}   /* end Effect_getDescriptor */

media/libeffects/lvm/wrapper/Reverb/EffectReverb.cpp

+5 −5
Original line number Diff line number Diff line
@@ -206,7 +206,7 @@ extern "C" int EffectQueryEffect(uint32_t index, 
        ALOGV("\tLVM_ERROR : EffectQueryEffect index out of range %d", index);

        return -ENOENT;

    }

    memcpy(pDescriptor, gDescriptors[index], sizeof(effect_descriptor_t));

    *pDescriptor = *gDescriptors[index];

    ALOGV("\tEffectQueryEffect end\n");

    return 0;

}     /* end EffectQueryEffect */
@@ -330,7 +330,7 @@ extern "C" int EffectGetDescriptor(const effect_uuid_t *uuid, 


    for (i = 0; i < length; i++) {

        if (memcmp(uuid, &gDescriptors[i]->uuid, sizeof(effect_uuid_t)) == 0) {

            memcpy(pDescriptor, gDescriptors[i], sizeof(effect_descriptor_t));

            *pDescriptor = *gDescriptors[i];

            ALOGV("EffectGetDescriptor - UUID matched Reverb type %d, UUID = %x",

                 i, gDescriptors[i]->uuid.timeLow);

            return 0;
@@ -645,7 +645,7 @@ int Reverb_setConfig(ReverbContext *pContext, effect_config_t *pConfig){ 
    }



    //ALOGV("\tReverb_setConfig calling memcpy");

    memcpy(&pContext->config, pConfig, sizeof(effect_config_t));

    pContext->config = *pConfig;





    switch (pConfig->inputCfg.samplingRate) {
@@ -715,7 +715,7 @@ int Reverb_setConfig(ReverbContext *pContext, effect_config_t *pConfig){ 


void Reverb_getConfig(ReverbContext *pContext, effect_config_t *pConfig)

{

    memcpy(pConfig, &pContext->config, sizeof(effect_config_t));

    *pConfig = pContext->config;

}   /* end Reverb_getConfig */



//----------------------------------------------------------------------------
@@ -2157,7 +2157,7 @@ int Reverb_getDescriptor(effect_handle_t self, 
        }

    }



    memcpy(pDescriptor, desc, sizeof(effect_descriptor_t));

    *pDescriptor = *desc;



    return 0;

}   /* end Reverb_getDescriptor */

media/libeffects/preprocessing/PreProcessing.cpp

+3 −3
Original line number Diff line number Diff line
@@ -1700,7 +1700,7 @@ int PreProcessingFx_GetDescriptor(effect_handle_t self, 
        return -EINVAL;

    }



    memcpy(pDescriptor, sDescriptors[effect->procId], sizeof(effect_descriptor_t));

    *pDescriptor = *sDescriptors[effect->procId];



    return 0;

}
@@ -1834,7 +1834,7 @@ int PreProcessingLib_QueryEffect(uint32_t index, effect_descriptor_t *pDescripto 
    if (index >= PREPROC_NUM_EFFECTS) {

        return -EINVAL;

    }

    memcpy(pDescriptor, sDescriptors[index], sizeof(effect_descriptor_t));

    *pDescriptor = *sDescriptors[index];

    return 0;

}
@@ -1905,7 +1905,7 @@ int PreProcessingLib_GetDescriptor(const effect_uuid_t *uuid, 


    ALOGV("PreProcessingLib_GetDescriptor() got fx %s", desc->name);



    memcpy(pDescriptor, desc, sizeof(effect_descriptor_t));

    *pDescriptor = *desc;

    return 0;

}

media/libeffects/testlibs/EffectEqualizer.cpp

+5 −5
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ extern "C" int EffectQueryEffect(uint32_t index, 
    if (index > 0) {

        return -EINVAL;

    }

    memcpy(pDescriptor, &gEqualizerDescriptor, sizeof(effect_descriptor_t));

    *pDescriptor = gEqualizerDescriptor;

    return 0;

} /* end EffectQueryNext */
@@ -204,7 +204,7 @@ extern "C" int EffectGetDescriptor(const effect_uuid_t *uuid, 
    }



    if (memcmp(uuid, &gEqualizerDescriptor.uuid, sizeof(effect_uuid_t)) == 0) {

        memcpy(pDescriptor, &gEqualizerDescriptor, sizeof(effect_descriptor_t));

        *pDescriptor = gEqualizerDescriptor;

        return 0;

    }
@@ -262,7 +262,7 @@ int Equalizer_setConfig(EqualizerContext *pContext, effect_config_t *pConfig) 
    }

    CHECK_ARG(channelCount <= AudioBiquadFilter::MAX_CHANNELS);



    memcpy(&pContext->config, pConfig, sizeof(effect_config_t));

    pContext->config = *pConfig;



    pContext->pEqualizer->configure(channelCount,

                          pConfig->inputCfg.samplingRate);
@@ -290,7 +290,7 @@ int Equalizer_setConfig(EqualizerContext *pContext, effect_config_t *pConfig) 


void Equalizer_getConfig(EqualizerContext *pContext, effect_config_t *pConfig)

{

    memcpy(pConfig, &pContext->config, sizeof(effect_config_t));

    *pConfig = pContext->config;

}   // end Equalizer_getConfig
@@ -752,7 +752,7 @@ extern "C" int Equalizer_getDescriptor(effect_handle_t self, 
        return -EINVAL;

    }



    memcpy(pDescriptor, &android::gEqualizerDescriptor, sizeof(effect_descriptor_t));

    *pDescriptor = android::gEqualizerDescriptor;



    return 0;

}