summaryrefslogtreecommitdiffstats
path: root/media/libeffects
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | Merge "Avoid a building error"Glenn Kasten2014-02-251-1/+3
|\ \ | |/ |/|
| * Avoid a building errorChih-Wei Huang2013-01-101-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | &pDwmModule->config may equal to pConfig that triggers a building error using gcc 4.7: In file included from bionic/libc/include/signal.h:33:0, from bionic/libc/include/sys/select.h:34, from bionic/libc/include/unistd.h:34, from system/core/include/cutils/log.h:34, from frameworks/av/media/libeffects/downmix/EffectDownmix.c:19: In function 'memcpy', inlined from 'Downmix_Configure' at frameworks/av/media/libeffects/downmix/EffectDownmix.c:651:11, inlined from 'Downmix_Init' at frameworks/av/media/libeffects/downmix/EffectDownmix.c:605:9, inlined from 'DownmixLib_Create' at frameworks/av/media/libeffects/downmix/EffectDownmix.c:233:9: bionic/libc/include/string.h:114:31: error: call to '__memcpy_overlap_error' declared with attribute error: memcpy called with overlapping regions Change-Id: Ia6c4aab72e38d00d8d526f3b56fc03b6530b4e44
| * Fix valgrind issuesMarco Nelissen2012-10-173-2/+8
| | | | | | | | | | | | | | We were reading some uninitialized memory when creating bass boost and EQ effects, and using memcpy() with identical source and destination. Change-Id: I15ea1b2c52ae05cbf54aef04351e89805e0ebf8e
| * Fix THD with max user EQ preset volume againEric Laurent2012-09-172-93/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | There was a problem with previous fix in 1b6c677c where the THD was good for max volume but bad for intermediate high volume values. This fix does not limit the band gains but apply a correction to the effect bundle volume to take into account not only the maximum band gain but also the average band gains weighted by the proximity of each band to the max gain band. Change-Id: Ibedd8da7fce1e163117f29b3da332da0e4fe8889
| * Merge "Limit maximum equalizer gain." into jb-mr1-devEric Laurent2012-09-112-40/+68
| |\
| | * Limit maximum equalizer gain.Eric Laurent2012-09-102-40/+68
| | | | | | | | | | | | | | | | | | | | | | | | Limit maximum gain in all EQ bands according to current volume so that total gain (current volume + band gain) does not exceed a certain limit. The gain difference between bands is preserved. Change-Id: Ice5a9705a0b3353e8778b4c539a29ca9cdf60390
| * | audio effects: no audio preprocessing by defaultEric Laurent2012-09-101-15/+24
| |/ | | | | | | | | | | | | | | | | | | | | The audio preprocessings are not included in the default audio_effect.conf file anymore as the audio HAL has to provide support for them. Each product implementing one or more audio pre processing must provide a specific audio_effects.conf file. Change-Id: I3b2f636f7a8748829798d4b9057d269db9424d62
| * Merge "Fix headroom management in equalizer" into jb-mr1-devEric Laurent2012-09-071-3/+8
| |\
| | * Fix headroom management in equalizerEric Laurent2012-09-071-3/+8
| | | | | | | | | | | | | | | | | | | | | Fix a bug resetting the headroom parameters when calling the bundle process function for the first time. Change-Id: Ie05f97606f415954340ff2a4e48cd7b0a97a063b
| * | audioflinger: changes for new audio devices enumsEric Laurent2012-09-071-0/+4
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | The ThreadBase class now has a separate member for input and output devices (mInDevice, mOutDevice). Only query get_supported_devices() from audio HAL if the function is exposed and if the audio policy manager did not specify the audio module to open. Also fixed bug in AEC preprocessing that would reset to default output device when an input device was given. Change-Id: I19d4d06aeb920b068e3ef31e6e6be6345ce5d67a
| * audio effects: fix bug in sample rate control.Eric Laurent2012-08-301-0/+2
| | | | | | | | | | | | | | Fix a bug in LVM bundle wrapper preventing audio framework sample rate from being sent to the effect bundle instance. Change-Id: I912027f866d3beac91b977bba869ff96a92d2a62
* | libeffects: don't set module pathColin Cross2014-02-131-1/+0
| | | | | | | | | | | | | | | | Setting the module path breaks multilib builds where there may be two different module paths for 32-bit and 64-bit, and there is no need to set it to the default. Change-Id: I95d62b5573a0bb0ab6c97649041dfc4309cbc8b9
* | Make frameworks/av 64-bit compatibleKévin PETIT2014-02-114-20/+21
| | | | | | | | | | | | | | | | | | | | | | | | Contains the necessary changes to make frameworks/av build and work on a 64-bit machine. Signed-off-by: Craig Barber <craig.barber@arm.com> Signed-off-by: Kévin PETIT <kevin.petit@arm.com> Signed-off-by: Ashok Bhat <ashok.bhat@arm.com> Signed-off-by: Marcus Oakland <marcus.oakland@arm.com> Change-Id: I725feaae50ed8eee25ca2c947cf15aee1f395c43
* | fix deadlock issues that arise when there are simultaneousjpadmana2014-01-315-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. Signed-off-by: jpadmana <jayashree.r.padmanaban@intel.com> Bug: 12424044 Change-Id: I16852222f1d0e94e433a19177729323a4bb1c090
* | frameworks/av: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATHColin Cross2014-01-277-9/+9
| | | | | | | | | | | | | | LOCAL_MODULE_PATH doesn't work for multiarch builds, replace it with LOCAL_MODULE_RELATIVE_PATH. Change-Id: I4e4ceec61d026bbe74ba604554c06104bde42e5e
* | libeffects: do not use GNU old-style field designatorssynergy dev2013-12-172-14/+14
| | | | | | | | | | | | Avoiding the use of GCC extensions improves code portability Change-Id: I9edbedc5c8ad4aa46ca54bc2e28280441431a530
* | Merge commit 'b2059ff384eee8ffb70a7ec8fc5570405201c734' into HEADThe Android Open Source Project2013-11-2227-23/+2768
|\ \