summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorjpadmana <jayashree.r.padmanaban@intel.com>2014-03-05 19:26:49 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-05 19:26:49 +0000
commit97504893a3ee96f612e0e1b47d331583a88e289b (patch)
tree521cd011b61b31841956c143fbaec0ef94856662 /include
parent4287b41411b40415b4186babf5763c3cfa0391ef (diff)
parent6b2604259c12ee28b49f26ab2adac96eefe30934 (diff)
downloadframeworks_av-97504893a3ee96f612e0e1b47d331583a88e289b.zip
frameworks_av-97504893a3ee96f612e0e1b47d331583a88e289b.tar.gz
frameworks_av-97504893a3ee96f612e0e1b47d331583a88e289b.tar.bz2
am 6b260425: 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 '6b2604259c12ee28b49f26ab2adac96eefe30934': 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