summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge tag 'android-5.1.1_r37' into HEADJessica Wagantall2016-04-042-0/+41
|\ | | | | | | | | Ticket: CYNGNOS-2213 Android 5.1.1 release 37
| * Sonivox: add SafetyNet log.Wei Jia2016-02-262-0/+9
| | | | | | | | | | Bug: 26366256 Change-Id: Ief72e01b7cc6d87a015105af847a99d3d9b03cb0
| * Sonivox: sanity check numSamples.Wei Jia2016-02-262-0/+32
| | | | | | | | | | Bug: 26366256 Change-Id: I066888c25035ea4c60c88f316db4508dc4dab6bc
| * Sonivox: check loopStart/loopLength against one specific wave, not whole ↵Wei Jia2015-09-011-6/+17
| | | | | | | | | | | | | | | | wave pool. Bug: 23307276 Change-Id: I4c2644feb42c8455be63e48a12ebfc62313cf4cf (cherry picked from commit 9cf7e8775823c4e136a9841d41dcdb5fe4f98173)
| * Sonivox: fix overflow in Parse_data in eas_mdls.cWei Jia2015-09-011-0/+24
| | | | | | | | | | Bug: 23307276 Change-Id: Iea56eae9a1855b41840f8d814717fe6379c5bb4d
| * Sonivox: make sure waveIndex is valid in Parse_rgn() in eas_mdls.c.Wei Jia2015-09-011-0/+4
| | | | | | | | | | | | Bug: 23335715 Change-Id: I4a5522c46dcda9285db1f830337aa2642ddc4fd1 (cherry picked from commit 99e0e2e2c1fd0f895b6d4bdf0a85798cf044218e)
| * Check segments and libsMarco Nelissen2015-09-011-0/+6
| | | | | | | | | | Bug: 23286323 Change-Id: I95ee385d0fb1503a4ce5a96e30d034ac8b81170e
| * DLS parser: fix wave pool size check.Eric Laurent2015-07-091-1/+1
| | | | | | | | | | | | Bug: 21132860. Change-Id: I8ae872ea2cc2e8fec5fa0b7815f0b6b31ce744ff (cherry picked from commit 2d7f8e1be2241e48458f5d3cab5e90be2b07c699)
* | Sonivox: check loopStart/loopLength against one specific wave, not whole ↵Wei Jia2015-10-051-6/+17
| | | | | | | | | | | | | | | | | | wave pool. Bug: 23307276 Change-Id: I4c2644feb42c8455be63e48a12ebfc62313cf4cf (cherry picked from commit 9cf7e8775823c4e136a9841d41dcdb5fe4f98173) Ticket: CYNGNOS-985
* | Sonivox: fix overflow in Parse_data in eas_mdls.cWei Jia2015-10-051-0/+24
| | | | | | | | | | | | Bug: 23307276 Change-Id: Iea56eae9a1855b41840f8d814717fe6379c5bb4d Ticket: CYNGNOS-985
* | Sonivox: make sure waveIndex is valid in Parse_rgn() in eas_mdls.c.Wei Jia2015-10-051-0/+4
| | | | | | | | | | | | | | Bug: 23335715 Change-Id: I4a5522c46dcda9285db1f830337aa2642ddc4fd1 (cherry picked from commit 99e0e2e2c1fd0f895b6d4bdf0a85798cf044218e) Ticket: CYNGNOS-985
* | Check segments and libsMarco Nelissen2015-10-051-0/+6
| | | | | | | | | | | | Bug: 23286323 Change-Id: I95ee385d0fb1503a4ce5a96e30d034ac8b81170e Ticket: CYNGNOS-985
* | DLS parser: fix wave pool size check.Eric Laurent2015-08-121-1/+1
| | | | | | | | | | | | | | | | CYNGNOS-446 Bug: 21132860. Change-Id: I8ae872ea2cc2e8fec5fa0b7815f0b6b31ce744ff (cherry picked from commit 2d7f8e1be2241e48458f5d3cab5e90be2b07c699) (cherry picked from commit 8e8b6f0eb30960a9ecb22d3fcd054497c8f4d598)
* | audio : midi decoder lib state is not updated on midiplayer stopstaging/cm-12.1staging/cm-12.0-cafstable/cm-12.1-YOG3Cstable/cm-12.0-YNG3Cstable/cm-12.0-YNG1TAstable/cm-12.0-YNG1Tstable/cm-12.0-YNG1IDivya Narayanan Poojary2014-11-041-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | - On EAS_Pause() STREAM_FLAGS_PAUSE is added to streamFlags, but EAS_State() returns SUCCESS before checking for streamFlags and updating midiplayers state. - Fix is to check for streamFlags for STREAM_FLAGS_PAUSE and update midiplayers state before returning SUCCESS. CRs-Fixed: 633774 Change-Id: Ie8845633f27f05c4917045dcf7cc2b3219c13ef6
* | audio: Support for mxmf file playbackAmit Shekhar2014-11-041-2/+8
|/ | | | | | | | | -mxmf files couldn't be played. -Added a condition check, in DLSParser(), to warn user if artCount is 0 and to use default articulations. CRs-Fixed: 465437 Change-Id: I42b1634c65e3779ee7924913cc17020bde9cc38d
* 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-20 01:35:56 +0000