diff options
| author | Narayan Kamath <narayan@google.com> | 2014-03-07 16:11:25 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-07 16:11:25 +0000 |
| commit | 3a46b975070b503bc71b53b70f9a8f5bd03bba1c (patch) | |
| tree | df5efe6ed422f30289f0f101e3671d17e348f977 /media/libeffects/preprocessing/PreProcessing.cpp | |
| parent | 31a98ad0da98227f3c76469e7a8a267c9539b6e8 (diff) | |
| parent | a9b82160a6682438d43709ba5e7a29022ad1af58 (diff) | |
| download | frameworks_av-3a46b975070b503bc71b53b70f9a8f5bd03bba1c.zip frameworks_av-3a46b975070b503bc71b53b70f9a8f5bd03bba1c.tar.gz frameworks_av-3a46b975070b503bc71b53b70f9a8f5bd03bba1c.tar.bz2 | |
am a9b82160: Merge "LP64 fixes for media/libeffects"
* commit 'a9b82160a6682438d43709ba5e7a29022ad1af58':
LP64 fixes for media/libeffects
Diffstat (limited to 'media/libeffects/preprocessing/PreProcessing.cpp')
| -rw-r--r-- | media/libeffects/preprocessing/PreProcessing.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/media/libeffects/preprocessing/PreProcessing.cpp b/media/libeffects/preprocessing/PreProcessing.cpp index c56ff72..a96a703 100644 --- a/media/libeffects/preprocessing/PreProcessing.cpp +++ b/media/libeffects/preprocessing/PreProcessing.cpp @@ -77,7 +77,7 @@ struct preproc_ops_s { void (* enable)(preproc_effect_t *fx); void (* disable)(preproc_effect_t *fx); int (* set_parameter)(preproc_effect_t *fx, void *param, void *value); - int (* get_parameter)(preproc_effect_t *fx, void *param, size_t *size, void *value); + int (* get_parameter)(preproc_effect_t *fx, void *param, uint32_t *size, void *value); int (* set_device)(preproc_effect_t *fx, uint32_t device); }; @@ -291,7 +291,7 @@ int AgcCreate(preproc_effect_t *effect) int AgcGetParameter(preproc_effect_t *effect, void *pParam, - size_t *pValueSize, + uint32_t *pValueSize, void *pValue) { int status = 0; @@ -452,9 +452,9 @@ int AecCreate(preproc_effect_t *effect) return 0; } -int AecGetParameter(preproc_effect_t *effect, +int AecGetParameter(preproc_effect_t *effect, void *pParam, - size_t *pValueSize, + uint32_t *pValueSize, void *pValue) { int status = 0; @@ -575,9 +575,9 @@ int NsCreate(preproc_effect_t *effect) return 0; } -int NsGetParameter(preproc_effect_t *effect, +int NsGetParameter(preproc_effect_t *effect, void *pParam, - size_t *pValueSize, + uint32_t *pValueSize, void *pValue) { int status = 0; @@ -1453,7 +1453,7 @@ int PreProcessingFx_Command(effect_handle_t self, if (effect->ops->get_parameter) { p->status = effect->ops->get_parameter(effect, p->data, - (size_t *)&p->vsize, + &p->vsize, p->data + voffset); *replySize = sizeof(effect_param_t) + voffset + p->vsize; } |