From a189a6883ee55cf62da1d7bf5bf5a8ab501938a4 Mon Sep 17 00:00:00 2001 From: Glenn Kasten Date: Mon, 20 Feb 2012 12:16:30 -0800 Subject: Use struct assignment instead of explicit memcpy for POD structs effect_descriptor_t and effect_config_t Change-Id: Ib2fc47f85fb65ed91b0abb1f87217c49b5eb571d --- media/libeffects/factory/EffectsFactory.c | 4 ++-- media/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp | 16 ++++++++-------- media/libeffects/lvm/wrapper/Reverb/EffectReverb.cpp | 10 +++++----- media/libeffects/preprocessing/PreProcessing.cpp | 6 +++--- media/libeffects/testlibs/EffectEqualizer.cpp | 10 +++++----- media/libeffects/testlibs/EffectReverb.c | 8 ++++---- media/libeffects/visualizer/EffectVisualizer.cpp | 10 +++++----- 7 files changed, 32 insertions(+), 32 deletions(-) (limited to 'media/libeffects') diff --git a/media/libeffects/factory/EffectsFactory.c b/media/libeffects/factory/EffectsFactory.c index 59cd9e3..f158929 100644 --- a/media/libeffects/factory/EffectsFactory.c +++ b/media/libeffects/factory/EffectsFactory.c @@ -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; diff --git a/media/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp b/media/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp index 40dffd4..1a45e35 100644 --- a/media/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp +++ b/media/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp @@ -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 */ diff --git a/media/libeffects/lvm/wrapper/Reverb/EffectReverb.cpp b/media/libeffects/lvm/wrapper/Reverb/EffectReverb.cpp index 9599dcc..941d651 100755 --- a/media/libeffects/lvm/wrapper/Reverb/EffectReverb.cpp +++ b/media/libeffects/lvm/wrapper/Reverb/EffectReverb.cpp @@ -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 */ diff --git a/media/libeffects/preprocessing/PreProcessing.cpp b/media/libeffects/preprocessing/PreProcessing.cpp index cfa7f51..5709837 100755 --- a/media/libeffects/preprocessing/PreProcessing.cpp +++ b/media/libeffects/preprocessing/PreProcessing.cpp @@ -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; } diff --git a/media/libeffects/testlibs/EffectEqualizer.cpp b/media/libeffects/testlibs/EffectEqualizer.cpp index 35a4a61..90ebe1f 100644 --- a/media/libeffects/testlibs/EffectEqualizer.cpp +++ b/media/libeffects/testlibs/EffectEqualizer.cpp @@ -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; } diff --git a/media/libeffects/testlibs/EffectReverb.c b/media/libeffects/testlibs/EffectReverb.c index 8351712..a87a834 100644 --- a/media/libeffects/testlibs/EffectReverb.c +++ b/media/libeffects/testlibs/EffectReverb.c @@ -194,7 +194,7 @@ 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; @@ -440,7 +440,7 @@ int Reverb_GetDescriptor(effect_handle_t self, } } - memcpy(pDescriptor, desc, sizeof(effect_descriptor_t)); + *pDescriptor = *desc; return 0; } /* end Reverb_getDescriptor */ @@ -546,7 +546,7 @@ int Reverb_setConfig(reverb_module_t *pRvbModule, effect_config_t *pConfig, return -EINVAL; } - memcpy(&pRvbModule->config, pConfig, sizeof(effect_config_t)); + pRvbModule->config = *pConfig; pReverb->m_nSamplingRate = pRvbModule->config.outputCfg.samplingRate; @@ -644,7 +644,7 @@ int Reverb_setConfig(reverb_module_t *pRvbModule, effect_config_t *pConfig, void Reverb_getConfig(reverb_module_t *pRvbModule, effect_config_t *pConfig) { - memcpy(pConfig, &pRvbModule->config, sizeof(effect_config_t)); + *pConfig = pRvbModule->config; } /*---------------------------------------------------------------------------- diff --git a/media/libeffects/visualizer/EffectVisualizer.cpp b/media/libeffects/visualizer/EffectVisualizer.cpp index d3c69f4..44baf93 100644 --- a/media/libeffects/visualizer/EffectVisualizer.cpp +++ b/media/libeffects/visualizer/EffectVisualizer.cpp @@ -106,7 +106,7 @@ int Visualizer_setConfig(VisualizerContext *pContext, effect_config_t *pConfig) pConfig->outputCfg.accessMode != EFFECT_BUFFER_ACCESS_ACCUMULATE) return -EINVAL; if (pConfig->inputCfg.format != AUDIO_FORMAT_PCM_16_BIT) return -EINVAL; - memcpy(&pContext->mConfig, pConfig, sizeof(effect_config_t)); + pContext->mConfig = *pConfig; Visualizer_reset(pContext); @@ -130,7 +130,7 @@ int Visualizer_setConfig(VisualizerContext *pContext, effect_config_t *pConfig) void Visualizer_getConfig(VisualizerContext *pContext, effect_config_t *pConfig) { - memcpy(pConfig, &pContext->mConfig, sizeof(effect_config_t)); + *pConfig = pContext->mConfig; } @@ -190,7 +190,7 @@ int VisualizerLib_QueryEffect(uint32_t index, if (index > 0) { return -EINVAL; } - memcpy(pDescriptor, &gVisualizerDescriptor, sizeof(effect_descriptor_t)); + *pDescriptor = gVisualizerDescriptor; return 0; } @@ -253,7 +253,7 @@ int VisualizerLib_GetDescriptor(const effect_uuid_t *uuid, } if (memcmp(uuid, &gVisualizerDescriptor.uuid, sizeof(effect_uuid_t)) == 0) { - memcpy(pDescriptor, &gVisualizerDescriptor, sizeof(effect_descriptor_t)); + *pDescriptor = gVisualizerDescriptor; return 0; } @@ -561,7 +561,7 @@ int Visualizer_getDescriptor(effect_handle_t self, return -EINVAL; } - memcpy(pDescriptor, &gVisualizerDescriptor, sizeof(effect_descriptor_t)); + *pDescriptor = gVisualizerDescriptor; return 0; } /* end Visualizer_getDescriptor */ -- cgit v1.1