summaryrefslogtreecommitdiffstats
path: root/media/libeffects
Commit message (Collapse)AuthorAgeFilesLines
* fix possible overflow in effect wrappers. am: 9e29523b95 am: baebc739b0 am: ↵Eric Laurent2016-01-122-2/+8
|\ | | | | | | | | | | | | | | | | 3a9d4f4a83 am: 5b7c20dd1e am: df81fc3f3c am: 68e43cf141 am: b1338d3cfc * commit 'b1338d3cfcb47d0fc5f21e2b939d66316b307fe3': fix possible overflow in effect wrappers.
| * fix possible overflow in effect wrappers. am: 9e29523b95 am: baebc739b0 am: ↵Eric Laurent2016-01-122-2/+8
| |\ | | | | | | | | | | | | | | | | | | | | | | | | 3a9d4f4a83 am: 5b7c20dd1e am: df81fc3f3c am: 68e43cf141 * commit '68e43cf141a5851c242bce776dff93f7136cbea6': fix possible overflow in effect wrappers.
| | * fix possible overflow in effect wrappers. am: 9e29523b95 am: baebc739b0 am: ↵Eric Laurent2016-01-122-2/+8
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3a9d4f4a83 am: 5b7c20dd1e * commit '5b7c20dd1ee9eff7f96676cec68d4b74e33440e7': fix possible overflow in effect wrappers.
| | | * fix possible overflow in effect wrappers. am: 9e29523b95Eric Laurent2016-01-122-2/+8
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: baebc739b0 * commit 'baebc739b0fe7257b26bfe105b67409559171c82': fix possible overflow in effect wrappers.
| | | | * fix possible overflow in effect wrappers.Eric Laurent2016-01-122-2/+8
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 9e29523b95 * commit '9e29523b9537983b4c4b205ff868d0b3bca0383b': fix possible overflow in effect wrappers.
| | | | | * fix possible overflow in effect wrappers.Eric Laurent2016-01-112-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add checks on parameter size field in effect command handlers to avoid overflow leading to invalid comparison with min allowed size for command and reply buffers. Bug: 26347509. Change-Id: I20e6a9b6de8e5172b957caa1ac9410b9752efa4d (cherry picked from commit ad1bd92a49d78df6bc6e75bee68c517c1326f3cf)
| | | | * | am 29b83cbb: DO NOT MERGE - audio effects: fix heap overflowEric Laurent2015-06-236-154/+103
| | | | |\ \ | | | | | |/ | | | | | | | | | | | | | | | | | | * commit '29b83cbb9018e53a18cf6e0fb34893f9774dcb96': DO NOT MERGE - audio effects: fix heap overflow
| | | | | * DO NOT MERGE - audio effects: fix heap overflowEric Laurent2015-06-236-154/+103
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check consistency of effect command reply sizes before copying to reply address. Also add null pointer check on reply size. Also remove unused parameter warning. Bug: 21953516. Change-Id: I4cf00c12eaed696af28f3b7613f7e36f47a160c4
| | | | * | am 85b3013e: fix deadlock issues that arise when there are simultaneous ↵jpadmana2014-03-055-31/+88
| | | | |\ \ | | | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | | * fix deadlock issues that arise when there are simultaneousjpadmana2014-03-045-31/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. Change-Id: If4b259da5776f151c1e81a78a0239d342046d923 Signed-off-by: jpadmana <jayashree.r.padmanaban@intel.com> Bug: 12424044
| * | | | | am 020c15b7: am 867e38cc: am ffdc54b6: am 3f0b4976: am 4c855d20: am ↵Eric Laurent2015-06-236-149/+96
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6368e6d2: audio effects: fix heap overflow * commit '020c15b763345e237c0df79e638d94dc0b6f9de8': audio effects: fix heap overflow
| | * | | | am 4c855d20: am 6368e6d2: audio effects: fix heap overflowEric Laurent2015-06-236-149/+96
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | * commit '4c855d207edaaeb8c61109977a5297418295658c': audio effects: fix heap overflow
| | | * | | audio effects: fix heap overflowEric Laurent2015-06-206-149/+96
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check consistency of effect command reply sizes before copying to reply address. Also add null pointer check on reply size. Also remove unused parameter warning. Bug: 21953516. Change-Id: I4cf00c12eaed696af28f3b7613f7e36f47a160c4 (cherry picked from commit 0f714a464d2425afe00d6450535e763131b40844)
* | | | | | Merge "Add property to ignore audio effects on the platform" into mnc-devJean-Michel Trivi2015-06-222-4/+13
|\ \ \ \ \ \
| * | | | | | Add property to ignore audio effects on the platformJean-Michel Trivi2015-06-222-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use boolean property ro.audio.ignore_effects to load or ignore the audio effects. Bug 21906334 Change-Id: I778f8b10a1caf25f7679705b1c83775223df011d
* | | | | | | audio effects: fix heap overflowEric Laurent2015-06-196-149/+96
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check consistency of effect command reply sizes before copying to reply address. Also add null pointer check on reply size. Also remove unused parameter warning. Bug: 21953516. Change-Id: I4cf00c12eaed696af28f3b7613f7e36f47a160c4
* | | | | | Level adjustment for Bundled Effect FixRicardo Garcia2015-05-222-12/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed automatic level compensation for bundled effects. Fixed algorithm now works even in corner cases previously reported. Cross band coefficients and cross interaction of BassBoost fixed. bug: 18769691 Change-Id: I51570836bdbff37e7c4b26f2b4282e4ded7fa56d
* | | | | | am d11d1be1: am 7ebc1670: am 8975220e: Merge "Fix for Bundled Effects level ↵Ricardo Garcia2014-12-162-104/+144
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | compensation" into lmp-mr1-dev * commit 'd11d1be13a6391290fb1dbc572292973dae59909': Fix for Bundled Effects level compensation
| * | | | | am 7ebc1670: am 8975220e: Merge "Fix for Bundled Effects level compensation" ↵Ricardo Garcia2014-12-162-104/+144
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev * commit '7ebc167072be27f42b7c58bd7f9378c8311533ab': Fix for Bundled Effects level compensation
| | * | | | Fix for Bundled Effects level compensationRicardo Garcia2014-12-092-104/+144
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From the bundled effects, only the EQ had some sort of level compensation based on the settings of the effect. This patch takes into account all the status and levels of EQ, BassBoost and Virtualizer bundled effects and makes an informed decision on the overall level compensation. bug: 18213779 Change-Id: I23c7b94fe7da5482f0bbef0cbe715ea464631420
* | | | | | am e10615e7: am 6b3e1a6d: am ac90a24d: Merge "Remove obsolete ↵Elliott Hughes2014-12-121-24/+11
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TARGET_SIMULATOR checks" * commit 'e10615e7f8749de887c8d25579398ad9e4094077': Remove obsolete TARGET_SIMULATOR checks
| * | | | | am 6b3e1a6d: am ac90a24d: Merge "Remove obsolete TARGET_SIMULATOR checks"Elliott Hughes2014-12-121-24/+11
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6b3e1a6d59b304a2dde7f03ba184feac0dec4ee7': Remove obsolete TARGET_SIMULATOR checks
| | * | | | | Remove obsolete TARGET_SIMULATOR checksTrevor Drake2014-12-111-24/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9d499190e49fed16aac686ae5da79ab870605ff4
* | | | | | | am 59ca7038: am 4df79c2c: am d6e7f1e1: Merge "Fix for AOSP force ↵Ricardo Garcia2014-12-091-4/+6
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | virtualization mode" into lmp-mr1-dev * commit '59ca7038364cd6fa3e7e1b52e0e90fa0960af038': Fix for AOSP force virtualization mode
| * | | | | | am 4df79c2c: am d6e7f1e1: Merge "Fix for AOSP force virtualization mode" ↵Ricardo Garcia2014-12-081-4/+6
| |\ \ \ \ \ \ | | |/ / / / / | |/| / / / / | | |/ / / / | | | | | | | | | | | | | | | | | | into lmp-mr1-dev * commit '4df79c2c13f6163f7d99360a7fb34bf3bd2a5115': Fix for AOSP force virtualization mode
| | * | | | Fix for AOSP force virtualization modeRicardo Garcia2014-12-041-4/+6
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Forcing virtualization mode with AOSP code might erroneously return a failed code, whilst it was correct. Fixing the condition for Automatic mode. bug: 18538537 Change-Id: I5837ff40cfed04c99889813cd56ebe3d90793e74
* | | | | am 575174d6: am bb0cf4d0: am d0264109: Merge "Move libldnhncr to libc++."Dan Albert2014-11-161-1/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '575174d62b665900203d70a4d410329b8918c2af': Move libldnhncr to libc++.
| * | | | Move libldnhncr to libc++.Dan Albert2014-11-151-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 15193147 Change-Id: If59c4a53a497f501881d26d58b80b11371906527
* | | | | Check for duplicate uuids when parsing audio_effects.confMarco Nelissen2014-10-081-24/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | uuids need to be unique, and things don't work properly when they're not. Also fix/enhance/extend the dumpEffectDescriptor() method, and include a list of effects in audioflinger dumpsys. Change-Id: I3dfbc5ed0f7272c7809e337f2929212ece047ee4
* | | | | am fed1594d: am 9916dcb6: am 0d64fcb4: Merge "Clean up some makefiles."Dan Albert2014-09-122-6/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'fed1594d707b4623015e538b2f69faf76bc38d5b': Clean up some makefiles.
| * | | | am 9916dcb6: am 0d64fcb4: Merge "Clean up some makefiles."Dan Albert2014-09-122-6/+1
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | * commit '9916dcb6ef041752fda5f13192ee6a36e51e73a5': Clean up some makefiles.
| | * | | Clean up some makefiles.Dan Albert2014-09-112-6/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The build system takes care of these things for you. Change-Id: Ife9605f15786e11d6a3578f56ed83dd9ae7fd799
| * | | | DO NOT MERGE LVM virtualizer: add support for virtualizer capability queryJean-Michel Trivi2014-07-152-36/+257
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I88106ba25f9b3f8fd7616307ab6b7fbe7afb6e91 (cherry picked from commit bfd3b9764841971be2d2f04a3fdbd41a2144beea)
* | | | | Enable loading of 64 bit effect librariesEric Laurent2014-08-081-4/+20
| | | | | | | | | | | | | | | | | | | | Change-Id: I19252ea8d7dd8b9eee2532059c5a3a98d53c3b28
* | | | | LVM virtualizer: add support for virtualizer capability queryJean-Michel Trivi2014-07-152-36/+257
|/ / / / | | | | | | | | | | | | Change-Id: I88106ba25f9b3f8fd7616307ab6b7fbe7afb6e91
* | | | Cleanup unused parameters or variable in EffectBundleJean-Michel Trivi2014-07-081-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | No unused parameter warning in EffectBundle. Remove unused variable declaration in Virtualizer_getParameter Change-Id: Ibe1c051bc21ac53a6c770b4aa28e31ac5d559d9b
* | | | libeffects: 64-bit compile warningsMark Salyzyn2014-06-202-26/+32
| | | | | | | | | | | | | | | | Change-Id: I210129f5742b046f7ceef48194f039352eff596d
* | | | Use new channel count functions for audio masksAndy Hung2014-05-163-7/+9
| | | | | | | | | | | | | | | | | | | | Change-Id: Ia658ab4b6320d19fdb50f123c930918724ff0ef3 Signed-off-by: Andy Hung <hunga@google.com>
* | | | resolved conflicts for merge of cf79c7a5 to masterYing Wang2014-05-082-11/+0
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: Ic4e75541193f733f477cfa4a2a87cce4c9e64f45
* | | | Define CHANNEL_MASK_* in terms of AUDIO_CHANNEL_OUT_*Glenn Kasten2014-04-301-18/+7
| | | | | | | | | | | | | | | | | | | | | | | | and use same suffixes Change-Id: I90b74ede171ba2550db4a220cfd1ad2e3caefe2d
* | | | Remove AUDIO_CHANNEL_OUT_SURROUNDGlenn Kasten2014-04-302-64/+0
| | | | | | | | | | | | | | | | | | | | | | | | and corresponding downmix effect Change-Id: I1576aa373ca7acbb84d7742bacbd9c2da04a7a4c
* | | | am e1ff1051: am e0f20cea: Merge "libeffects: 64 bit compile issues"Mark Salyzyn2014-04-182-39/+41
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'e1ff1051ffee8fb650741ad133f0f28b73eb7a73': libeffects: 64 bit compile issues
| * | | libeffects: 64 bit compile issuesMark Salyzyn2014-04-182-39/+41
| | | | | | | | | | | | | | | | Change-Id: I32dd13d307572fee91150f8e113df78924ca0067
* | | | am 3a46b975: am a9b82160: Merge "LP64 fixes for media/libeffects"Narayan Kamath2014-03-0714-61/+62
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '3a46b975070b503bc71b53b70f9a8f5bd03bba1c': LP64 fixes for media/libeffects
| * | | Merge "LP64 fixes for media/libeffects"Narayan Kamath2014-03-0714-61/+62
| |\ \ \
| | * | | LP64 fixes for media/libeffectsAshok Bhat2014-02-2014-61/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes include: [x] In get parameter series of functions, replaced size_t* formal parameter type with uint32_t* where actual parameter passed was uint32_t*. [x] In set parameter series of functions, changed size_t formal parameter to uint32_t where actual parameter was uint32_t. [x] Changed the definition of LVM_UINT32 from unsigned long to uint32_t as unsigned long is 64-bit in LP64. [x] Used other stdint.h types for other LVM_types for consistency. [x] Use of uintptr_t for the pNextMember of the INST_ALLOC structure, rather than LVM_UINT32, for portablility. [x] Use of uintptr_t where pointers are used in arithmetic. [x] Replaced the use of 0xFFFFFFFC with ~3 in places where it was used to clear last two bits. [x] Removed int casts where cmdSize and *replySize, both uint32_t, were being compared with sizeof(). Change-Id: Ibec0b4d8e9b855f44b1cd853be6df84d13cf4186 Signed-off-by: Marcus Oakland <marcus.oakland@arm.com> Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
* | | | | am e276aef8: am 0cf16339: Merge "Fix preventing from heap overwrite in ↵Glenn Kasten2014-02-281-34/+35
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | capture command" * commit 'e276aef8779a7763b318ebd3e8c09f35ff37a95c': Fix preventing from heap overwrite in capture command
| * | | | Merge "Fix preventing from heap overwrite in capture command"Glenn Kasten2014-02-281-34/+35
| |\ \ \ \
| | * | | | Fix preventing from heap overwrite in capture commandRyszard Grzesica2014-02-201-34/+35
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was heap usage error in case of stop of audio framework while capturePoint was negative. Pointer to reply data was moved but final silence write was done using original buffer size. Now silence set is done at the beginning under the condition that framework has stopped. Change-Id: I7dab1e922f1813e5fbfd4a64c8b0d15d9465520c
* | | | | Fix includes to no longer pull in Skia includes directories.Derek Sollenberger2014-02-271-1/+0
|/ / / / | | | | | | | | | | | | | | | | bug:13225538 Change-Id: I4fccc414923f7e62cd46d691c67cb44b9692c225