diff options
| author | Narayan Kamath <narayan@google.com> | 2014-03-07 20:15:52 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-07 20:15:52 +0000 |
| commit | 08d6608556b44f90f6e7fb7dc280f4509af79502 (patch) | |
| tree | b19240f44ee71e6dec43fb7806e1d59020c400b0 /media/libeffects/downmix/EffectDownmix.c | |
| parent | ad77a5e08282a92903f91c414b8f65797cb72dde (diff) | |
| parent | 3a46b975070b503bc71b53b70f9a8f5bd03bba1c (diff) | |
| download | frameworks_av-08d6608556b44f90f6e7fb7dc280f4509af79502.zip frameworks_av-08d6608556b44f90f6e7fb7dc280f4509af79502.tar.gz frameworks_av-08d6608556b44f90f6e7fb7dc280f4509af79502.tar.bz2 | |
am 3a46b975: am a9b82160: Merge "LP64 fixes for media/libeffects"
* commit '3a46b975070b503bc71b53b70f9a8f5bd03bba1c':
LP64 fixes for media/libeffects
Diffstat (limited to 'media/libeffects/downmix/EffectDownmix.c')
| -rw-r--r-- | media/libeffects/downmix/EffectDownmix.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/media/libeffects/downmix/EffectDownmix.c b/media/libeffects/downmix/EffectDownmix.c index d25dc9b..a39d837 100644 --- a/media/libeffects/downmix/EffectDownmix.c +++ b/media/libeffects/downmix/EffectDownmix.c @@ -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) { |