summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* audio: Miscellaneous fixes in external/sonivoxstaging/cm-14.0Amit Shekhar2016-08-242-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
* Merge "sonivox: -Wno-unused-parameter." am: 825ad522d5Elliott Hughes2016-01-221-1/+2
|\ | | | | | | | | | | | | am: d3bd739763 * commit 'd3bd739763e90807ca36b264972a6fafeecc6ef3': sonivox: -Wno-unused-parameter.
| * Merge "sonivox: -Wno-unused-parameter."Elliott Hughes2016-01-221-1/+2
| |\ | | | | | | | | | | | | | | | | | | am: 825ad522d5 * commit '825ad522d5616aa13db2eca36fc2e4d27dcbcd4e': sonivox: -Wno-unused-parameter.
| | * Merge "sonivox: -Wno-unused-parameter."Elliott Hughes2016-01-221-1/+2
| | |\
| | | * sonivox: -Wno-unused-parameter.Elliott Hughes2016-01-211-1/+2
| | |/ | | | | | | | | | Change-Id: If0e8c1ec60e30f7b2c998f35ad864ceec661ce29
* | | Sonivox: add SafetyNet log. am: 24d7c408c5 am: f3f1da3028 am: 95a4f1d4af am: ↵Wei Jia2016-01-132-0/+9
|\| | | | | | | | | | | | | | | | | | | | | | | | | | 629255407a am: 13c48e13f9 * commit '13c48e13f9118cedefd36fcdef870daac68ad415': Sonivox: add SafetyNet log.
| * | Sonivox: add SafetyNet log. am: 24d7c408c5 am: f3f1da3028 am: 95a4f1d4afWei Jia2016-01-132-0/+9
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | am: 629255407a * commit '629255407ab28bef5e73f86113b3b76ffaa72c69': Sonivox: add SafetyNet log.
| | * \ 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
* | | | | | | Merge "Android.mk: make 32bit binary use arm assembly code on 64bit ↵Ying Wang2016-01-081-9/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | platform" am: 6d1efdcbf8 am: b5f42fe90e * commit 'b5f42fe90edc7e7a5c5f13fdbdf76c7cff155227': Android.mk: make 32bit binary use arm assembly code on 64bit platform
| * | | | | | Merge "Android.mk: make 32bit binary use arm assembly code on 64bit platform"Ying Wang2016-01-081-9/+5
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 6d1efdcbf8 * commit '6d1efdcbf8f9f0448eadf5b343e0dd284bc40208': Android.mk: make 32bit binary use arm assembly code on 64bit platform
| | * | | | | Merge "Android.mk: make 32bit binary use arm assembly code on 64bit platform"Ying Wang2016-01-081-9/+5
| | |\ \ \ \ \
| | | * | | | | Android.mk: make 32bit binary use arm assembly code on 64bit platformYongqin Liu2016-01-081-9/+5
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | change to use LOCAL_SRC_FILES_arm and LOCAL_CFLAGS_arm instead of ifeq ($(TARGET_ARCH),arm) check Change-Id: Iec452e85982ac206ddd9953b0558888aa00d29ea Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
* | | | | | | Sonivox: sanity check numSamples. am: 3ac044334c am: 7ddf08ce3b am: ↵Wei Jia2016-01-062-0/+32
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 68ea08e38a am: fdfca54d38 am: 501db4bb22 * commit '501db4bb22666a1b5e8043d73270e20bbf59c9f0': Sonivox: sanity check numSamples.
| * | | | | | Sonivox: sanity check numSamples. am: 3ac044334c am: 7ddf08ce3b am: 68ea08e38aWei Jia2016-01-062-0/+32
| |\ \ \ \ \ \ | | |/ / / / / | |/| / / / / | | |/ / / / | | | | | | | | | | | | | | | | | | am: fdfca54d38 * commit 'fdfca54d389ba8bed3585379bcd6f55e788d0029': Sonivox: sanity check numSamples.
| | * | | | 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
* | | | | | am 2773ffb0: am c9e27eec: am 23eb37d0: am 515e28dd: am a12313fe: Fix ↵Wonsik Kim2015-09-030-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | S_SMF_DATA.numStreams being non-zero while streams is uninitialized * commit '2773ffb05268f69b260fe93c6d12dd092e39084b': Fix S_SMF_DATA.numStreams being non-zero while streams is uninitialized
| * | | | | am c9e27eec: am 23eb37d0: am 515e28dd: am a12313fe: Fix ↵Wonsik Kim2015-09-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | S_SMF_DATA.numStreams being non-zero while streams is uninitialized * commit 'c9e27eecfec1220b1aaf1b93e031bc08e2456f22': Fix S_SMF_DATA.numStreams being non-zero while streams is uninitialized
| | * | | | 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
* | | | | | am 093cddee: am 153b3609: Fix S_SMF_DATA.numStreams being non-zero while ↵Wonsik Kim2015-09-031-7/+13
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | streams is uninitialized * commit '093cddeeaa954ae94c9381bb3f9573c35a5bf224': Fix S_SMF_DATA.numStreams being non-zero while streams is uninitialized
| * | | | | am 153b3609: Fix S_SMF_DATA.numStreams being non-zero while streams is ↵Wonsik Kim2015-09-031-7/+13
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | uninitialized * commit '153b3609bfd6f65c0a4ae0e7704495bfa3cfc347': 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-08-311-7/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Let S_SMF_DATA.numStreams set after S_SMF_DATA.streams is initialized. Bug: 23528803 Change-Id: Ie45156a03ec6700a9b0971626eb08cb5c9cdab6e
* | | | | | am 0038e13d: am d02b62ee: (-s ours) am 621fbe1d: Merge "Remove unused fm and ↵Marco Nelissen2015-08-270-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | hybrid midi synths" * commit '0038e13de68a36f42db3778cb52d883768a5b917':
| * | | | | am d02b62ee: (-s ours) am 621fbe1d: Merge "Remove unused fm and hybrid midi ↵Marco Nelissen2015-08-270-0/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | synths" * commit 'd02b62ee8ac4ead91648cf994e5f97b03e4164c2':
| | * \ \ \ \ am 621fbe1d: Merge "Remove unused fm and hybrid midi synths"Marco Nelissen2015-08-25169-69257/+0
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '621fbe1ddeef9b13662f58aa7bf1e7dd29ce383c': Remove unused fm and hybrid midi synths
* | | | | | | | am fb1d8c80: am 0ffbc96c: (-s ours) am 0d434d06: am ca243752: am 5f9b2131: ↵Wei Jia2015-08-270-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am f333a822: Sonivox: check loopStart/loopLength against one specific wave, not whole wave pool. * commit 'fb1d8c80b8099596dc682f84f3392297ebbfb0fb':
| * | | | | | | am 0ffbc96c: (-s ours) am 0d434d06: am ca243752: am 5f9b2131: am f333a822: ↵Wei Jia2015-08-270-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sonivox: check loopStart/loopLength against one specific wave, not whole wave pool. * commit '0ffbc96cdd259e1f9defebb8ffc360b60cefc532':
| | * | | | | | am 0d434d06: am ca243752: am 5f9b2131: am f333a822: Sonivox: check ↵Wei Jia2015-08-240-0/+0
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | loopStart/loopLength against one specific wave, not whole wave pool. * commit '0d434d064d9299aa458f7bfbbbb448aa1f34673c': Sonivox: check loopStart/loopLength against one specific wave, not whole wave pool.
* | | | | | | | am 49c6d3d6: am 384a8969: (-s ours) am 9cf7e877: Sonivox: check ↵Wei Jia2015-08-270-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | loopStart/loopLength against one specific wave, not whole wave pool. * commit '49c6d3d69041fa2448e7023ccee247adc7882ad8':
| * | | | | | | am 384a8969: (-s ours) am 9cf7e877: Sonivox: check loopStart/loopLength ↵Wei Jia2015-08-270-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | against one specific wave, not whole wave pool. * commit '384a8969308aac26a2ad39a5f0fe498238dd0da8':
| | * | | | | | am 9cf7e877: Sonivox: check loopStart/loopLength against one specific wave, ↵Wei Jia2015-08-221-6/+17
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | not whole wave pool. * commit '9cf7e8775823c4e136a9841d41dcdb5fe4f98173': Sonivox: check loopStart/loopLength against one specific wave, not whole wave pool.
* | | | | | | | | am 97ec43be: am a2f01211: (-s ours) am f5d9815f: Merge "Enable llvm ↵Chih-hung Hsieh2015-08-270-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | integrated assembler except arm and arm64 targets." * commit '97ec43bebd24713aae0c324f0e2d1bceaabd6ad3':
| * | | | | | | | am a2f01211: (-s ours) am f5d9815f: Merge "Enable llvm integrated assembler ↵Chih-hung Hsieh2015-08-270-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | except arm and arm64 targets." * commit 'a2f012116df5455cb853abf3d7d7feb786906ab7':
| | * | | | | | | am f5d9815f: Merge "Enable llvm integrated assembler except arm and arm64 ↵Chih-hung Hsieh2015-08-211-1/+2
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | targets." * commit 'f5d9815f438fa0213bf9facacc4c4ec6ae8336f4': Enable llvm integrated assembler except arm and arm64 targets.
* | | | | | | | | | Sonivox: adjust numSamples correctly.Wei Jia2015-08-261-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 23343619 Change-Id: I30ed40494dc43818b617583f848a38a55429c2a8
* | | | | | | | | | Sonivox: fix eas_samples size.Wei Jia2015-08-261-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 23306483 Change-Id: Ibfb3a366fcc29ce0239c33ba0d83e1a1787b18d2
* | | | | | | | | | Sonivox: sanity check headerLength in XMF_ReadNode.Wei Jia2015-08-261-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 23342881 Change-Id: I025338c5f0b39cac89ad786afc69cf085e830568
* | | | | | | | | | am 5df8f251: am 621fbe1d: Merge "Remove unused fm and hybrid midi synths"Marco Nelissen2015-08-25169-69257/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5df8f251a1e6a08412fd641406d58fb8f50fb5b7': Remove unused fm and hybrid midi synths
| * | | | | | | | | am 621fbe1d: Merge "Remove unused fm and hybrid midi synths"Marco Nelissen2015-08-25169-69257/+0
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '621fbe1ddeef9b13662f58aa7bf1e7dd29ce383c': Remove unused fm and hybrid midi synths
| | * | | | | | | | Merge "Remove unused fm and hybrid midi synths"Marco Nelissen2015-08-25169-69257/+0
| | |\ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | |
| | | * | | | | | | Remove unused fm and hybrid midi synthsMarco Nelissen2015-08-25169-69257/+0
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3778dcfa9b033ee136ee986057b19a677e8345cd
* | | | | | | | | Sonivox: fix currentPool in VMUpdateMIPTable().Wei Jia2015-08-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 23333998 Change-Id: I1b6f3f0ccc50f54b1091c3c6816bdead5fb0c6df