summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Sonivox: fix overflow in Parse_data in eas_mdls.cWei Jia2015-08-201-0/+24
| | | | | Bug: 23307276 Change-Id: Iea56eae9a1855b41840f8d814717fe6379c5bb4d
* Fix math functions for 64-bitMarco Nelissen2015-07-301-43/+44
| | | | | | | | | | Sonivox's EAS_I32 and EAS_U32 are defined as long, so actually 64-bit when compiled in 64-bit mode. This breaks the math macros used by reverb, so make those macros use (u)int32_t instead. (changing EAS_I32 to actually be 32-bit breaks the synth itself) Bug: 22506524 Change-Id: I86216b886b3696559d27d3f25819770fb91b6f9a
* am 23df8d07: am 5588a6d6: am 11bb645d: DLS parser: fix wave pool size check.Eric Laurent2015-05-140-0/+0
|\ | | | | | | | | * commit '23df8d0790fc432f16f18f72baecb89fafc13cf4': DLS parser: fix wave pool size check.
| * am 5588a6d6: am 11bb645d: DLS parser: fix wave pool size check.Eric Laurent2015-05-141-1/+1
| |\ | | | | | | | | | | | | * commit '5588a6d6c1ce5e69fc0762fedaf24464c37585c2': DLS parser: fix wave pool size check.
| | * am 11bb645d: DLS parser: fix wave pool size check.Eric Laurent2015-05-141-1/+1
| | |\ | | | | | | | | | | | | | | | | * commit '11bb645de2de83cb48c94192d62f3828a36613b4': DLS parser: fix wave pool size check.
| | | * DLS parser: fix wave pool size check.Eric Laurent2015-05-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 21132860. Change-Id: I8ae872ea2cc2e8fec5fa0b7815f0b6b31ce744ff (cherry picked from commit 2d7f8e1be2241e48458f5d3cab5e90be2b07c699)
* | | | DLS parser: fix wave pool size check.Eric Laurent2015-05-141-1/+1
| | | | | | | | | | | | | | | | | | | | Bug: 21132860. Change-Id: I8ae872ea2cc2e8fec5fa0b7815f0b6b31ce744ff
* | | | am 88ee045a: Merge "Use callbacks for I/O"Marco Nelissen2015-01-080-0/+0
|\| | | | | | | | | | | | | | | | | | | * commit '88ee045ad1220ba0accecffd41f0afb9a33a9383': Use callbacks for I/O
| * | | Merge "Use callbacks for I/O"Marco Nelissen2015-01-083-125/+30
| |\ \ \
| | * | | Use callbacks for I/OMarco Nelissen2015-01-083-125/+30
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Instead of having the Sonivox engine directly open the file and use stdio to read from it, use caller-provided callbacks. Change-Id: Ie55129109060a4a7862fee3177f994401e00b6c1
* / / / Use callbacks for I/OMarco Nelissen2014-12-163-125/+30
|/ / / | | | | | | | | | | | | | | | | | | Instead of having the Sonivox engine directly open the file and use stdio to read from it, use caller-provided callbacks. Change-Id: Ie55129109060a4a7862fee3177f994401e00b6c1
* | | Merge "Add -no-integrated-as at local level."Chih-Hung Hsieh2014-10-091-0/+3
|\ \ \ | |/ / |/| |
| * | Add -no-integrated-as at local level.Chih-Hung Hsieh2014-10-091-0/+3
|/ / | | | | | | | | | | | | Later we will enable integrated-as as default at the global level. BUG: 17820427 Change-Id: Ie7c7be592c00f1a8ef2cb79aa1af10e38837bf1a
* | Merge "Remove unused LOCAL_LDLIBS."Ying Wang2014-05-071-2/+0
|\ \ | |/ |/|
| * Remove unused LOCAL_LDLIBS.Ying Wang2014-05-071-2/+0
|/ | | | Change-Id: I0a648d3aab329edbbd8c4417fc053f024081933d
* remove include of utils/Log.hColin Cross2013-07-231-2/+1
| | | | | | | Remove the include of utils/Log.h to avoid having to pull in liblog. Add pthread.h because it was getting it implicitly through utils/Log.h. Change-Id: Ib05b2934fe24cbb47eb4daf41cd392830caceeed
* am 4a213147: am 274d0571: Merge "Added support for parsing XMF versions 1.00 ↵Jean-Baptiste Queru2012-09-061-17/+28
|\ | | | | | | | | | | | | and 1.01 headers" * commit '4a213147dbe60416aa26ebdba0f3c631b2e2b013': Added support for parsing XMF versions 1.00 and 1.01 headers
| * am 274d0571: Merge "Added support for parsing XMF versions 1.00 and 1.01 ↵cm-10.1.3-RC2cm-10.1.3-RC1cm-10.1.3cm-10.1.2cm-10.1.1cm-10.1.0-RC5cm-10.1.0-RC4cm-10.1.0-RC3cm-10.1.0-RC2cm-10.1.0-RC1cm-10.1.0cm-10.1-M3cm-10.1-M2cm-10.1-M1mr1.1-stagingcm-10.1Jean-Baptiste Queru2012-09-061-17/+28
| |\ | | | | | | | | | | | | | | | | | | headers" * commit '274d0571979c10a8c0bfe2641ada32a310248f13': Added support for parsing XMF versions 1.00 and 1.01 headers
| | * Merge "Added support for parsing XMF versions 1.00 and 1.01 headers"Jean-Baptiste Queru2012-09-061-17/+28
| | |\
| | | * Added support for parsing XMF versions 1.00 and 1.01 headersAndreas Lillvik2012-09-061-17/+28
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | The parser will parse only parse file type and revision level when parsing XMF version 2.00 headers. XMF versions 1.00 and 1.01 doesn't support file type and revision level in the headers. Change-Id: I883c9e78179fac45db4ab3c4e3d0cbbb2df4899b
* | | am 0eb1fab7: am 09a0c670: Merge "There is fd leak in sonivox lib when try ↵Jean-Baptiste Queru2012-08-151-1/+12
|\| | | | | | | | | | | | | | | | | | | | open any media file > 2GB (MIDI parser memory leak)" * commit '0eb1fab72466cd5900470d0a4a2b191722aa9ef5': There is fd leak in sonivox lib when try open any media file > 2GB (MIDI parser memory leak)
| * | am 09a0c670: Merge "There is fd leak in sonivox lib when try open any media ↵Jean-Baptiste Queru2012-08-151-1/+12
| |\| | | | | | | | | | | | | | | | | | | file > 2GB (MIDI parser memory leak)" * commit '09a0c67023c010aec72faa71f116199da4b0f39e': There is fd leak in sonivox lib when try open any media file > 2GB (MIDI parser memory leak)
| | * Merge "There is fd leak in sonivox lib when try open any media file > 2GB ↵Jean-Baptiste Queru2012-08-151-1/+12
| | |\ | | | | | | | | | | | | (MIDI parser memory leak)"
| | | * There is fd leak in sonivox lib when try open any media filegbhakteX2012-08-141-1/+12
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | > 2GB (MIDI parser memory leak) Midi Parser support only 32 bit file operations and thus files of size less than 2 GB. When file open is called on the Midi parser, for files more than 2GB, internal seek operation fails resulting in the non-closure of the opened file. This resulted in the memory leak of the opened file descriptor. This is fixed by closing the opened file descriptor on failed cases. Change-Id: Ie9f53275206e2b4616d1cfc41c12b90544895548 Author: Muthukumar Kandasamy <muthukumar.kandasamy@intel.com> Signed-off-by: Muthukumar Kandasamy <muthukumar.kandasamy@intel.com> Signed-off-by: Gurudatta Bhakte <gurudattax.bhakte@intel.com> Singed-off-by: Shuo Gao <shuo.gao@intel.com> Signed-off-by: Bruce Beare <bruce.j.beare@intel.com> Signed-off-by: Jack Ren <jack.ren@intel.com> Author-tracking-BZ: 39292
* | / Split out LOCAL_ASFLAGSYing Wang2012-08-101-2/+5
|/ / | | | | | | | | Bug: 6967574 Change-Id: If114d72b49e1c5aca24c1d92caded7cf8630671d
* / Remove obsolete ThirdPartyProject.prop file.Elliott Hughes2012-05-151-9/+0
|/ | | | Change-Id: I9252bc176a7ac4300d2c1b9e0394638aa773783d
* Fix crash when scanning corrupt midi file.jellybean-stablejellybeanMarco Nelissen2011-12-161-0/+5
| | | | | | b/5453816 Change-Id: Ic2104fc0b86ef0b5ec3af7a009b193f85690d291
* am d868ec62: Reconcile gingerbread-plus-aosp and honeycombThe Android Open Source Project2011-01-300-0/+0
|\ | | | | | | * commit 'd868ec62e3db6f843d5857b2294d2b695b49ed59':
| * Reconcile gingerbread-plus-aosp and honeycombThe Android Open Source Project2011-01-300-0/+0
| |\ | | | | | | | | | Change-Id: I6f6c22bca861de934a539e680a256f4374dece63
| | * Mass merge from gingerbread - do not mergeThe Android Open Source Project2011-01-300-0/+0
| | |\ | | | | | | | | | | | | Change-Id: I38bb9cc71b7b04cb3c71aa06561ed64c3b6a2ce4
| | | * am d029b237: Remove unused file.Dan Bornstein2011-01-280-0/+0
| | |/| | | | | | | | | | | | | | | | | * commit 'd029b2378170cfd7bb34d894482065a762a54578': Remove unused file.
* | | | am fbbe5ab5: am 42196fd1: am cdffe35c: merge from gingerbreadThe Android Open Source Project2011-01-240-0/+0
|\| | | | | | | | | | | | | | | * commit 'fbbe5ab5255f68cc9f0f10f36f680719b82955b6':
| * | | am 42196fd1: am cdffe35c: merge from gingerbreadThe Android Open Source Project2011-01-240-0/+0
| |\ \ \ | | | | | | | | | | | | | | | * commit '42196fd10398c7250af364c0563893d209c8cc15':
| | * \ \ am cdffe35c: merge from gingerbreadThe Android Open Source Project2011-01-210-0/+0
| | |\ \ \ | | | | | | | | | | | | | | | | | | * commit 'cdffe35cb330587b942f7771efad385261a03c83':
| | | * \ \ merge from gingerbreadThe Android Open Source Project2011-01-211-0/+0
| | | |\ \ \ | | | | | |/ | | | | |/| | | | | | | Change-Id: I99e03b97ed48d1cc6cbd4176a55b1e06fc5ca5c1
* | | | | | am 7eaac433: am d2c550cd: am d029b237: Remove unused file.Dan Bornstein2011-01-240-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7eaac4336c6feeabdb1bfdb390865571f73e9a51': Remove unused file.
| * | | | | am d2c550cd: am d029b237: Remove unused file.Dan Bornstein2011-01-240-0/+0
| |\| | | | | | |_|_|/ | |/| | | | | | | | | | | | | * commit 'd2c550cdd59acd54e5c831bcb20cc2ffad020a65': Remove unused file.
| | * | | am d029b237: Remove unused file.Dan Bornstein2011-01-211-0/+0
| | |\ \ \ | | | |/ / | | |/| / | | | |/ | | | | * commit 'd029b2378170cfd7bb34d894482065a762a54578': Remove unused file.
| | | * Remove unused file.cm-7.1.0gingerbread-releasegingerbreadgb-release-7.2Dan Bornstein2011-01-211-0/+0
| | | | | | | | | | | | | | | | Change-Id: Ib50474510f2a95e398e279f34630bdc15b43809c
* | | | am bc636d8f: (-s ours) Remove unused file. DO NOT MERGE.Dan Bornstein2011-01-210-0/+0
|\| | | | | | | | | | | | | | | | | | | * commit 'bc636d8fd6f3f9963e90af0cc5771c249f40084c': Remove unused file. DO NOT MERGE.
| * | | Remove unused file. DO NOT MERGE.Dan Bornstein2011-01-211-0/+0
|/ / / | | | | | | | | | Change-Id: I1a5ee8e70ebfce7d289d0a71ec8af101187c1f21
* | | Fix engine state reporting.Marco Nelissen2010-12-211-2/+2
| | | | | | | | | | | | | | | | | | b/3290604 Change-Id: If1d15499575b1448c6c1c735718c2269b87fae3e
* | | Add missing NOTICE files.David Deephanphongs2010-10-191-0/+14
|/ / | | | | | | | | | | | | Copy the NOTICE file from external/sonivox to external/sonivox/arm-wt-22k, where it will be picked up by the build system. Change-Id: Ieb1c6bbb510b6cc9c375c6250b70d9413aa511a7
* | am 91f74c00: add meta-files about 3rd party projectsThe Android Open Source Project2010-07-161-0/+9
|\| | | | | | | | | | | | | Merge commit '91f74c003b47a98a9af1999fe0caeff1f9678d33' into gingerbread-plus-aosp * commit '91f74c003b47a98a9af1999fe0caeff1f9678d33': add meta-files about 3rd party projects
| * add meta-files about 3rd party projectsThe Android Open Source Project2010-07-161-0/+9
| | | | | | | | Change-Id: Iad572add7a8d4764b41128e1f1806adb89c83692
* | merge from open-source masterThe Android Open Source Project2010-07-091-1/+1
|\ \ | |/ |/| | | Change-Id: Id3bf2f86b2cac666dbb4bac69755ff5f8c270391
| * Fix missing NLBruce Beare2010-06-251-1/+1
|/ | | | | Change-Id: I00dc89c1e9f0ac7f21707937619d3cdc364ca27d Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
* Add an empty CleanSpec.mkJean-Baptiste Queru2010-03-081-0/+49
| | | | Change-Id: I9634aed52bacd702362223bbfe29f59ff8c4fc3c
* am 546b62cd: am d57f7d5f: reconcile main tree with open-source eclairThe Android Open Source Project2010-02-050-0/+0
|\ | | | | | | | | | | | | Merge commit '546b62cd4c1255bdb681c416d5c9b2ad22ff5e2e' * commit '546b62cd4c1255bdb681c416d5c9b2ad22ff5e2e': android-2.1_r1 snapshot
| * am d57f7d5f: reconcile main tree with open-source eclairThe Android Open Source Project2010-02-050-0/+0
| |\ | | | | | | | | | | | | | | | | | | Merge commit 'd57f7d5f767dcfef8e318427e34e56bdb3da6eb6' into eclair-plus-aosp * commit 'd57f7d5f767dcfef8e318427e34e56bdb3da6eb6': android-2.1_r1 snapshot