diff options
| author | Eric Laurent <elaurent@google.com> | 2014-02-03 18:02:48 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-02-03 18:02:48 +0000 |
| commit | 8a8492147174c8b24a352787eb2d8282ef2860e8 (patch) | |
| tree | 1c199ca2e843a6ac3701e61c3b1c995f3334454f /include | |
| parent | ec57560eae4d063894e56f8d41399055a6e0cd1d (diff) | |
| parent | af1aa00e5e6fa3dcd5b7d9145ac6f7659f98bb68 (diff) | |
| download | frameworks_av-8a8492147174c8b24a352787eb2d8282ef2860e8.zip frameworks_av-8a8492147174c8b24a352787eb2d8282ef2860e8.tar.gz frameworks_av-8a8492147174c8b24a352787eb2d8282ef2860e8.tar.bz2 | |
am af1aa00e: am c4eef29a: Merge "fix deadlock issues that arise when there are simultaneous effect control interface calls to proxy and to non sub-effect wrappers(eg., bundlewrapper) from audioflinger Also, return NO_ERROR when CMD_OFFLOAD succeeds"
* commit 'af1aa00e5e6fa3dcd5b7d9145ac6f7659f98bb68':
fix deadlock issues that arise when there are simultaneous effect control interface calls to proxy and to non sub-effect wrappers(eg., bundlewrapper) from audioflinger Also, return NO_ERROR when CMD_OFFLOAD succeeds
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/EffectsFactoryApi.h | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/include/media/EffectsFactoryApi.h b/include/media/EffectsFactoryApi.h index b1143b9..b1ed7b0 100644 --- a/include/media/EffectsFactoryApi.h +++ b/include/media/EffectsFactoryApi.h @@ -171,30 +171,6 @@ int EffectGetDescriptor(const effect_uuid_t *pEffectUuid, effect_descriptor_t *p //////////////////////////////////////////////////////////////////////////////// int EffectIsNullUuid(const effect_uuid_t *pEffectUuid); -//////////////////////////////////////////////////////////////////////////////// -// -// Function: EffectGetSubEffects -// -// Description: Returns the descriptors of the sub effects of the effect -// whose uuid is pointed to by first argument. -// -// Input: -// pEffectUuid: pointer to the effect uuid. -// size: size of the buffer pointed by pDescriptor. -// -// Input/Output: -// pDescriptor: address where to return the sub effect descriptors. -// -// Output: -// returned value: 0 successful operation. -// -ENODEV factory failed to initialize -// -EINVAL invalid pEffectUuid or pDescriptor -// -ENOENT no effect with this uuid found -// *pDescriptor: updated with the sub effect descriptors. -// -//////////////////////////////////////////////////////////////////////////////// -int EffectGetSubEffects(const effect_uuid_t *pEffectUuid, effect_descriptor_t *pDescriptors, size_t size); - #if __cplusplus } // extern "C" #endif |