diff options
| author | jpadmana <jayashree.r.padmanaban@intel.com> | 2013-11-14 17:20:52 +0530 |
|---|---|---|
| committer | Eric Laurent <elaurent@google.com> | 2014-01-31 00:58:44 +0000 |
| commit | f90c7e0bb8d83d8b7f733bdf430d331ea3f221e8 (patch) | |
| tree | f2e5372c4876aad1901b54cc98d988cbee387549 /media/libeffects/proxy/Android.mk | |
| parent | b447379e2ea1c9ca4cd543ac183df70567d40485 (diff) | |
| download | frameworks_av-f90c7e0bb8d83d8b7f733bdf430d331ea3f221e8.zip frameworks_av-f90c7e0bb8d83d8b7f733bdf430d331ea3f221e8.tar.gz frameworks_av-f90c7e0bb8d83d8b7f733bdf430d331ea3f221e8.tar.bz2 | |
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
Whenever there are parallel calls to proxy and non sub-effects wrappers,
some of the calls are not completed. This is due to deadlock arsing out
of Proxy waiting for the subeffect call to return and subeffect waiting
for proxy to release lock.
The call flow is changed to a cleaner and simple one - Proxy gets the
aeli(effect library info) of subeffects during the EffectGetSubEffects()
call. Therby, proxy will manage the sub effects by itself rather than
going through effects factory.
Signed-off-by: jpadmana <jayashree.r.padmanaban@intel.com>
Bug: 12424044
Change-Id: I16852222f1d0e94e433a19177729323a4bb1c090
Diffstat (limited to 'media/libeffects/proxy/Android.mk')
| -rw-r--r-- | media/libeffects/proxy/Android.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/media/libeffects/proxy/Android.mk b/media/libeffects/proxy/Android.mk index d6d6c1e..b438796 100644 --- a/media/libeffects/proxy/Android.mk +++ b/media/libeffects/proxy/Android.mk @@ -28,7 +28,8 @@ LOCAL_SHARED_LIBRARIES := liblog libcutils libutils libdl libeffects LOCAL_C_INCLUDES := \ system/media/audio_effects/include \ - bionic/libc/include + bionic/libc/include \ + frameworks/av/media/libeffects/factory include $(BUILD_SHARED_LIBRARY) |