summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge tag 'android-6.0.1_r22' of ↵staging/cm-13.0+r22Steve Kondik2016-03-102-0/+41
|\ | | | | | | | | | | https://android.googlesource.com/platform/external/sonivox into cm-13.0 Android 6.0.1 release 22
| * Sonivox: add SafetyNet log. am: 24d7c408c5 am: f3f1da3028Wei Jia2016-01-132-0/+9
| |\ | | | | | | | | | | | | | | | | | | am: 95a4f1d4af * commit '95a4f1d4af0118e9f7cdd8852b7445fb837aba57': Sonivox: add SafetyNet log.
| | * Sonivox: add SafetyNet log. am: 24d7c408c5Wei Jia2016-01-132-0/+9
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | am: f3f1da3028 * commit 'f3f1da3028f61b7026c80a150cc40db52885ab8e': Sonivox: add SafetyNet log.
| | | * Sonivox: add SafetyNet log.Wei Jia2016-01-132-0/+9
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 24d7c408c5 * commit '24d7c408c52143bce7b49de82f3913fd8d1219cf': Sonivox: add SafetyNet log.
| | | | * Sonivox: add SafetyNet log.Wei Jia2016-01-122-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 26366256 Change-Id: Ief72e01b7cc6d87a015105af847a99d3d9b03cb0
| * | | | Sonivox: sanity check numSamples. am: 3ac044334c am: 7ddf08ce3bWei Jia2016-01-062-0/+32
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 68ea08e38a * commit '68ea08e38ae022a548cde64b6c71a8cb608c799f': Sonivox: sanity check numSamples.
| | * | | Sonivox: sanity check numSamples. am: 3ac044334cWei Jia2016-01-062-0/+32
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 7ddf08ce3b * commit '7ddf08ce3b31d4eff8a05c5001c9af084baad533': Sonivox: sanity check numSamples.
| | | * | Sonivox: sanity check numSamples.Wei Jia2016-01-062-0/+32
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 3ac044334c * commit '3ac044334c3ff6a61cb4238ff3ddaf17c7efcf49': Sonivox: sanity check numSamples.
| | | | * Sonivox: sanity check numSamples.Wei Jia2016-01-062-0/+32
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 26366256 Change-Id: I066888c25035ea4c60c88f316db4508dc4dab6bc
* | | | | Merge tag 'android-6.0.1_r3' of ↵Steve Kondik2015-12-070-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://android.googlesource.com/platform/external/sonivox into HEAD Android 6.0.1 release 3
| * | | | am 23eb37d0: am 515e28dd: am a12313fe: Fix S_SMF_DATA.numStreams being ↵Wonsik Kim2015-09-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | non-zero while streams is uninitialized * commit '23eb37d08f13fe570632bd26b4f2a830f16c1983': Fix S_SMF_DATA.numStreams being non-zero while streams is uninitialized
| | * | | am 515e28dd: am a12313fe: Fix S_SMF_DATA.numStreams being non-zero while ↵Wonsik Kim2015-09-031-7/+13
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | streams is uninitialized * commit '515e28ddbaed3b24ba9a76d2ff1ba1ad48a590a6': Fix S_SMF_DATA.numStreams being non-zero while streams is uninitialized
| | | * | am a12313fe: Fix S_SMF_DATA.numStreams being non-zero while streams is ↵Wonsik Kim2015-09-031-7/+13
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | uninitialized * commit 'a12313fe89f99a51e8d166209833ac89045ebf70': Fix S_SMF_DATA.numStreams being non-zero while streams is uninitialized
| | | | * Fix S_SMF_DATA.numStreams being non-zero while streams is uninitializedWonsik Kim2015-09-021-7/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Let S_SMF_DATA.numStreams set after S_SMF_DATA.streams is initialized. Bug: 23528803 Change-Id: Ie45156a03ec6700a9b0971626eb08cb5c9cdab6e
* | | | | Merge tag 'android-6.0.0_r26' into cm-13.0Ricardo Cerqueira2015-11-051-7/+13
|\| | | | | | | | | | | | | | | | | | | Android 6.0.0 release 26
| * | | | Fix S_SMF_DATA.numStreams being non-zero while streams is uninitializedWonsik Kim2015-08-311-7/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Let S_SMF_DATA.numStreams set after S_SMF_DATA.streams is initialized. Bug: 23528803 Change-Id: Ie45156a03ec6700a9b0971626eb08cb5c9cdab6e
| * | | | am ca243752: am 5f9b2131: am f333a822: Sonivox: check loopStart/loopLength ↵Wei Jia2015-08-240-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | against one specific wave, not whole wave pool. * commit 'ca243752c451ef65444511efc63b302ad9ff0853': Sonivox: check loopStart/loopLength against one specific wave, not whole wave pool.
| | * | | am 5f9b2131: am f333a822: Sonivox: check loopStart/loopLength against one ↵Wei Jia2015-08-241-6/+17
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | specific wave, not whole wave pool. * commit '5f9b21319a071e3bb0a5218db675acbe9cb017ef': Sonivox: check loopStart/loopLength against one specific wave, not whole wave pool.
| | | * | am f333a822: Sonivox: check loopStart/loopLength against one specific wave, ↵Wei Jia2015-08-231-6/+17
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | not whole wave pool. * commit 'f333a822c38c3d92f40e8f1686348e6a62c2912c': Sonivox: check loopStart/loopLength against one specific wave, not whole wave pool.
| | | | * Sonivox: check loopStart/loopLength against one specific wave, not whole ↵Wei Jia2015-08-221-6/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | wave pool. Bug: 23307276 Change-Id: I4c2644feb42c8455be63e48a12ebfc62313cf4cf (cherry picked from commit 9cf7e8775823c4e136a9841d41dcdb5fe4f98173)
* | | | | audio: Miscellaneous fixes in external/sonivoxAmit Shekhar2015-10-062-6/+12
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support for mxmf file playback -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 midi decoder lib state is not updated on midiplayer stop - 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
* | | | Sonivox: check loopStart/loopLength against one specific wave, not whole ↵Wei Jia2015-08-211-6/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | wave pool. Bug: 23307276 Change-Id: I4c2644feb42c8455be63e48a12ebfc62313cf4cf
* | | | am 70942a97: am 37ede8b5: am 5d2e7de3: Sonivox: fix overflow in Parse_data ↵Wei Jia2015-08-210-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | in eas_mdls.c * commit '70942a9711aa8afb0d9770ffde42c2e784cb21e3': Sonivox: fix overflow in Parse_data in eas_mdls.c
| * | | am 37ede8b5: am 5d2e7de3: Sonivox: fix overflow in Parse_data in eas_mdls.cWei Jia2015-08-211-0/+24
| |\| | | | | | | | | | | | | | | | | | * commit '37ede8b5404f89e496638be92c83fec51d2b60e9': Sonivox: fix overflow in Parse_data in eas_mdls.c
| | * | am 5d2e7de3: Sonivox: fix overflow in Parse_data in eas_mdls.cWei Jia2015-08-211-0/+24
| | |\| | | | | | | | | | | | | | | | | * commit '5d2e7de37d4a28cf25cc5d0c64b3a29c1824dc0a': Sonivox: fix overflow in Parse_data in eas_mdls.c
| | | * Sonivox: fix overflow in Parse_data in eas_mdls.cWei Jia2015-08-211-0/+24
| | | | | | | | | | | | | | | | | | | | Bug: 23307276 Change-Id: Iea56eae9a1855b41840f8d814717fe6379c5bb4d
* | | | Merge "Sonivox: fix overflow in Parse_data in eas_mdls.c" into mnc-devAbhishek Arya2015-08-211-0/+24
|\ \ \ \
| * | | | Sonivox: fix overflow in Parse_data in eas_mdls.cWei Jia2015-08-201-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 23307276 Change-Id: Iea56eae9a1855b41840f8d814717fe6379c5bb4d
* | | | | am 892c138a: am ed1104cf: am 8cbef48b: Sonivox: make sure waveIndex is valid ↵Wei Jia2015-08-210-0/+0
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | in Parse_rgn() in eas_mdls.c. * commit '892c138acd55a3080cf2c9cdd2b9aa8c51e58e54': Sonivox: make sure waveIndex is valid in Parse_rgn() in eas_mdls.c.
| * | | | am ed1104cf: am 8cbef48b: Sonivox: make sure waveIndex is valid in ↵Wei Jia2015-08-211-0/+4
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | Parse_rgn() in eas_mdls.c. * commit 'ed1104cffb20d4b88a73c4fc348dcbdb8b48a105': Sonivox: make sure waveIndex is valid in Parse_rgn() in eas_mdls.c.
| | * | | am 8cbef48b: Sonivox: make sure waveIndex is valid in Parse_rgn() in eas_mdls.c.Wei Jia2015-08-211-0/+4
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | * commit '8cbef48ba6e3d3f844b895f8ca1a1aee74414fff': Sonivox: make sure waveIndex is valid in Parse_rgn() in eas_mdls.c.
| | | * | Sonivox: make sure waveIndex is valid in Parse_rgn() in eas_mdls.c.Wei Jia2015-08-201-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 23335715 Change-Id: I4a5522c46dcda9285db1f830337aa2642ddc4fd1 (cherry picked from commit 99e0e2e2c1fd0f895b6d4bdf0a85798cf044218e)
* | | | | Merge "Sonivox: make sure waveIndex is valid in Parse_rgn() in eas_mdls.c." ↵Wei Jia2015-08-201-0/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | into mnc-dev
| * | | | | Sonivox: make sure waveIndex is valid in Parse_rgn() in eas_mdls.c.Wei Jia2015-08-201-0/+4
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | Bug: 23335715 Change-Id: I4a5522c46dcda9285db1f830337aa2642ddc4fd1
* | | | | am 0a3e23a6: am 5f5c79bd: am 8a9f53ee: Check segments and libsMarco Nelissen2015-08-201-0/+6
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | | | | * commit '0a3e23a696b985a02d8f896f12a989e72c9b1cfe': Check segments and libs
| * | | am 5f5c79bd: am 8a9f53ee: Check segments and libsMarco Nelissen2015-08-201-0/+6
| |\| | | | | | | | | | | | | | | | | | * commit '5f5c79bd8f6af0145c732e5b57a12e6f8ea8159a': Check segments and libs
| | * | am 8a9f53ee: Check segments and libsMarco Nelissen2015-08-201-0/+6
| | |\| | | | | | | | | | | | | | | | | * commit '8a9f53ee2c661e8b5b94d6e9fbb8af3baa34310d': Check segments and libs
| | | * Check segments and libsMarco Nelissen2015-08-191-0/+6
| | | | | | | | | | | | | | | | | | | | Bug: 23286323 Change-Id: I95ee385d0fb1503a4ce5a96e30d034ac8b81170e
* | | | 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