summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorjpadmana <jayashree.r.padmanaban@intel.com>2014-03-05 01:24:11 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-05 01:24:11 +0000
commit6b2604259c12ee28b49f26ab2adac96eefe30934 (patch)
tree1515124f74fdbc0d3544034568a784155690e185 /include
parentfc04776adc5572fcc323b1dca66dee27a537c619 (diff)
parent85b3013e06e8fe7802fe6259ecac80261e834332 (diff)
downloadframeworks_av-6b2604259c12ee28b49f26ab2adac96eefe30934.zip
frameworks_av-6b2604259c12ee28b49f26ab2adac96eefe30934.tar.gz
frameworks_av-6b2604259c12ee28b49f26ab2adac96eefe30934.tar.bz2
am 85b3013e: 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 '85b3013e06e8fe7802fe6259ecac80261e834332': 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.h24
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